diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h index dc483b7d2b..4c02fad09e 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h @@ -7,6 +7,18 @@ #include "langdata.h" +const u8g_fntpgm_uint8_t fontpage_96_217_217[47] U8G_FONT_SECTION("fontpage_96_217_217") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD9,0xD9,0x00,0x0B,0xFF,0x00, + 0x00,0x0A,0x0C,0x18,0x0C,0x00,0xFF,0x04,0x00,0x02,0x00,0x83,0xC0,0x7E,0x00,0x0A, + 0x00,0x16,0x00,0x12,0x00,0x0E,0x00,0x02,0x00,0x02,0x00,0x04,0x00,0x08,0x00}; +const u8g_fntpgm_uint8_t fontpage_97_139_139[33] U8G_FONT_SECTION("fontpage_97_139_139") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8B,0x8B,0x00,0x09,0xFF,0x00, + 0x00,0x08,0x0A,0x0A,0x0C,0x01,0xFF,0x4E,0x34,0x08,0x10,0x3E,0x61,0x81,0x19,0x26, + 0x1C}; +const u8g_fntpgm_uint8_t fontpage_97_146_146[45] U8G_FONT_SECTION("fontpage_97_146_146") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x92,0x92,0x00,0x0A,0xFF,0x00, + 0x00,0x09,0x0B,0x16,0x0C,0x01,0xFF,0x08,0x00,0x08,0x00,0x9E,0x00,0x70,0x00,0x21, + 0x80,0x72,0x00,0x8C,0x00,0x14,0x00,0x24,0x00,0x20,0x00,0x1F,0x00}; const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00, 0x00,0x04,0x05,0x05,0x06,0x00,0x00,0xF0,0x10,0x60,0x40,0x80,0x05,0x07,0x07,0x06, @@ -97,6 +109,9 @@ const u8g_fntpgm_uint8_t fontpage_97_252_252[25] U8G_FONT_SECTION("fontpage_97_2 0x00,0x05,0x02,0x02,0x06,0x00,0x03,0x80,0x78}; static const uxg_fontinfo_t g_fontinfo_jp_kana[] PROGMEM = { + FONTDATA_ITEM(96, 217, 217, fontpage_96_217_217), // 'す' -- 'す' + FONTDATA_ITEM(97, 139, 139, fontpage_97_139_139), // 'る' -- 'る' + FONTDATA_ITEM(97, 146, 146, fontpage_97_146_146), // 'を' -- 'を' FONTDATA_ITEM(97, 161, 164, fontpage_97_161_164), // 'ァ' -- 'イ' FONTDATA_ITEM(97, 166, 166, fontpage_97_166_166), // 'ウ' -- 'ウ' FONTDATA_ITEM(97, 168, 168, fontpage_97_168_168), // 'エ' -- 'エ' diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h index 303c4c66d6..87c23f06fe 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h @@ -80,6 +80,10 @@ const u8g_fntpgm_uint8_t fontpage_61_183_183[33] U8G_FONT_SECTION("fontpage_61_1 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xB7,0xB7,0x00,0x08,0xFE,0x00, 0x00,0x05,0x0A,0x0A,0x07,0x00,0xFE,0x48,0x30,0x00,0x70,0x08,0x78,0x88,0x78,0x00, 0x20}; +const u8g_fntpgm_uint8_t fontpage_61_187_187[32] U8G_FONT_SECTION("fontpage_61_187_187") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBB,0xBB,0x00,0x09,0x00,0x00, + 0x00,0x05,0x09,0x09,0x07,0x00,0x00,0x30,0x10,0x20,0x00,0x70,0x88,0xF0,0x80,0x78 + }; const u8g_fntpgm_uint8_t fontpage_61_191_191[33] U8G_FONT_SECTION("fontpage_61_191_191") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x0A,0x00,0x00, 0x00,0x06,0x0A,0x0A,0x07,0x00,0x00,0x04,0x08,0x20,0x50,0x00,0x70,0x88,0xF0,0x80, @@ -200,6 +204,7 @@ static const uxg_fontinfo_t g_fontinfo_vi[] PROGMEM = { FONTDATA_ITEM(61, 179, 179, fontpage_61_179_179), // 'ẳ' -- 'ẳ' FONTDATA_ITEM(61, 181, 181, fontpage_61_181_181), // 'ẵ' -- 'ẵ' FONTDATA_ITEM(61, 183, 183, fontpage_61_183_183), // 'ặ' -- 'ặ' + FONTDATA_ITEM(61, 187, 187, fontpage_61_187_187), // 'ẻ' -- 'ẻ' FONTDATA_ITEM(61, 191, 191, fontpage_61_191_191), // 'ế' -- 'ế' FONTDATA_ITEM(61, 193, 193, fontpage_61_193_193), // 'ề' -- 'ề' FONTDATA_ITEM(61, 195, 195, fontpage_61_195_195), // 'ể' -- 'ể' diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h index ab2ccd024f..7bedd31384 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h @@ -675,6 +675,10 @@ const u8g_fntpgm_uint8_t fontpage_197_233_233[45] U8G_FONT_SECTION("fontpage_197 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xE9,0xE9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x2F,0xE0,0x22,0x40,0xF9,0x80,0x22,0x40,0x2C, 0x20,0x31,0x00,0x67,0xC0,0xA1,0x00,0x2F,0xE0,0x21,0x00,0xE1,0x00}; +const u8g_fntpgm_uint8_t fontpage_198_130_130[45] U8G_FONT_SECTION("fontpage_198_130_130") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x82,0x82,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x27,0xC0,0xF9,0x00,0x21,0x00,0x2F, + 0xE0,0x31,0x00,0x61,0x00,0xA7,0xC0,0x21,0x00,0x21,0x00,0xEF,0xE0}; const u8g_fntpgm_uint8_t fontpage_198_137_137[45] U8G_FONT_SECTION("fontpage_198_137_137") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x89,0x89,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x20,0x80,0xFF,0xE0,0x25,0x20,0x29, @@ -1015,6 +1019,10 @@ const u8g_fntpgm_uint8_t fontpage_237_209_209[45] U8G_FONT_SECTION("fontpage_237 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD1,0xD1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x0A,0x00,0x4A,0x00,0x4B,0xE0,0x4A,0x00,0x4C, 0x80,0x48,0x40,0x08,0x00,0x7F,0xC0,0x4A,0x40,0x4A,0x40,0xFF,0xE0}; +const u8g_fntpgm_uint8_t fontpage_237_216_216[45] U8G_FONT_SECTION("fontpage_237_216_216") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD8,0xD8,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x1F,0x80,0x14,0x80,0x12,0x80,0x7F, + 0xE0,0x14,0x80,0x22,0x80,0x3F,0xC0,0x29,0x40,0x29,0x40,0xFF,0xE0}; const u8g_fntpgm_uint8_t fontpage_237_244_244[45] U8G_FONT_SECTION("fontpage_237_244_244") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF4,0xF4,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0xFF,0xE0,0x04,0x00,0x3F,0x80,0x20, @@ -1645,6 +1653,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽' FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔' FONTDATA_ITEM(197, 233, 233, fontpage_197_233_233), // '择' -- '择' + FONTDATA_ITEM(198, 130, 130, fontpage_198_130_130), // '挂' -- '挂' FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按' FONTDATA_ITEM(198, 161, 161, fontpage_198_161_161), // '挡' -- '挡' FONTDATA_ITEM(198, 164, 164, fontpage_198_164_164), // '挤' -- '挤' @@ -1729,6 +1738,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = { FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白' FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的' FONTDATA_ITEM(237, 209, 209, fontpage_237_209_209), // '监' -- '监' + FONTDATA_ITEM(237, 216, 216, fontpage_237_216_216), // '盘' -- '盘' FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直' FONTDATA_ITEM(238, 129, 129, fontpage_238_129_129), // '省' -- '省' FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠' diff --git a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h index 65ef7bf7df..9c93ec1fe1 100644 --- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h +++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h @@ -531,6 +531,10 @@ const u8g_fntpgm_uint8_t fontpage_197_212_212[45] U8G_FONT_SECTION("fontpage_197 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD4,0xD4,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x22,0x80,0x22,0x40,0xFF,0xE0,0x22,0x00,0x2B, 0xC0,0x32,0x40,0x65,0x40,0xA4,0x80,0x28,0x80,0x29,0x40,0xE6,0x20}; +const u8g_fntpgm_uint8_t fontpage_198_130_130[45] U8G_FONT_SECTION("fontpage_198_130_130") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x82,0x82,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x27,0xC0,0xF9,0x00,0x21,0x00,0x2F, + 0xE0,0x31,0x00,0x61,0x00,0xA7,0xC0,0x21,0x00,0x21,0x00,0xEF,0xE0}; const u8g_fntpgm_uint8_t fontpage_198_137_137[45] U8G_FONT_SECTION("fontpage_198_137_137") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x89,0x89,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0x20,0x80,0xFF,0xE0,0x25,0x20,0x29, @@ -809,6 +813,10 @@ const u8g_fntpgm_uint8_t fontpage_240_141_141[45] U8G_FONT_SECTION("fontpage_240 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8D,0x8D,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x02,0x00,0xFA,0x00,0x23,0xE0,0x24,0x20,0x79, 0x40,0xC9,0x00,0x49,0x00,0x49,0x00,0x7A,0x80,0x4C,0x40,0x08,0x20}; +const u8g_fntpgm_uint8_t fontpage_241_159_159[45] U8G_FONT_SECTION("fontpage_241_159_159") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9F,0x9F,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x05,0x40,0xFF,0xE0,0x25,0x40,0x25,0xC0,0x74, + 0x00,0xD7,0xE0,0x51,0x00,0x5F,0xE0,0x75,0x80,0x59,0x40,0x11,0x20}; const u8g_fntpgm_uint8_t fontpage_241_186_186[45] U8G_FONT_SECTION("fontpage_241_186_186") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBA,0xBA,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x01,0x00,0xFF,0xE0,0x2A,0x20,0x22,0x80,0x77, @@ -1011,6 +1019,10 @@ const u8g_fntpgm_uint8_t fontpage_283_221_221[45] U8G_FONT_SECTION("fontpage_283 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xDD,0xDD,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x7B,0xE0,0x4A,0x00,0x4A,0x00,0x7B,0xE0,0x12, 0x20,0x52,0x20,0x5A,0x20,0x53,0xE0,0x52,0x00,0x5E,0x00,0xE3,0xE0}; +const u8g_fntpgm_uint8_t fontpage_285_171_171[45] U8G_FONT_SECTION("fontpage_285_171_171") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xAB,0xAB,0x00,0x0A,0xFF,0x00, + 0x00,0x0A,0x0B,0x16,0x0C,0x01,0xFF,0x08,0x00,0x3F,0x00,0x21,0x00,0x3F,0x00,0x21, + 0x40,0x3F,0x80,0x21,0x00,0xFF,0x00,0x09,0x00,0x35,0x00,0xC2,0x00}; const u8g_fntpgm_uint8_t fontpage_285_202_202[45] U8G_FONT_SECTION("fontpage_285_202_202") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xCA,0xCA,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x04,0x00,0x7F,0xC0,0x04,0x00,0x3F,0x80,0x24, @@ -1039,6 +1051,10 @@ const u8g_fntpgm_uint8_t fontpage_286_201_201[45] U8G_FONT_SECTION("fontpage_286 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xC9,0xC9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x21,0x00,0xFF,0xE0,0x25,0x40,0xFF,0xC0,0xAD, 0x40,0xFF,0xC0,0xA9,0x60,0xFF,0xE0,0x24,0x40,0xFA,0x40,0x20,0xC0}; +const u8g_fntpgm_uint8_t fontpage_286_253_253[45] U8G_FONT_SECTION("fontpage_286_253_253") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFD,0xFD,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x11,0x00,0x7D,0x40,0x11,0x20,0xFF,0xE0,0x21, + 0x00,0xFD,0x20,0x51,0x40,0x7C,0x80,0x10,0xA0,0xFD,0x60,0x12,0x20}; const u8g_fntpgm_uint8_t fontpage_287_209_209[45] U8G_FONT_SECTION("fontpage_287_209_209") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD1,0xD1,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x40,0xC0,0x27,0x00,0x24,0x00,0x07,0xE0,0xE4, @@ -1151,6 +1167,10 @@ const u8g_fntpgm_uint8_t fontpage_301_142_142[45] U8G_FONT_SECTION("fontpage_301 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8E,0x8E,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0xF8,0x80,0x98,0xA0,0xAE,0xC0,0xC8,0xA0,0xAE, 0xE0,0x92,0x00,0x97,0xC0,0xF4,0x40,0xA7,0xC0,0x84,0x40,0x87,0xC0}; +const u8g_fntpgm_uint8_t fontpage_301_168_168[45] U8G_FONT_SECTION("fontpage_301_168_168") = { + 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA8,0xA8,0x00,0x0A,0xFF,0x00, + 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0xF1,0x00,0x9B,0xE0,0xA4,0x80,0xC7,0xE0,0xA1, + 0x40,0x9D,0xC0,0x95,0x40,0xF5,0xC0,0xA5,0x40,0x8A,0x40,0x91,0xE0}; const u8g_fntpgm_uint8_t fontpage_301_217_217[45] U8G_FONT_SECTION("fontpage_301_217_217") = { 0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD9,0xD9,0x00,0x0A,0xFF,0x00, 0x00,0x0B,0x0B,0x16,0x0C,0x00,0xFF,0x2A,0x80,0x3F,0xE0,0x6A,0x80,0xBF,0xC0,0x2A, @@ -1365,6 +1385,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖' FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽' FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔' + FONTDATA_ITEM(198, 130, 130, fontpage_198_130_130), // '挂' -- '挂' FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按' FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉' FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探' @@ -1433,6 +1454,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直' FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠' FONTDATA_ITEM(240, 141, 141, fontpage_240_141_141), // '砍' -- '砍' + FONTDATA_ITEM(241, 159, 159, fontpage_241_159_159), // '碟' -- '碟' FONTDATA_ITEM(241, 186, 186, fontpage_241_186_186), // '確' -- '確' FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移' FONTDATA_ITEM(244, 205, 205, fontpage_244_205_205), // '積' -- '積' @@ -1483,6 +1505,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(279, 138, 138, fontpage_279_138_138), // '變' -- '變' FONTDATA_ITEM(281, 199, 199, fontpage_281_199_199), // '資' -- '資' FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距' + FONTDATA_ITEM(285, 171, 171, fontpage_285_171_171), // '身' -- '身' FONTDATA_ITEM(285, 202, 202, fontpage_285_202_202), // '車' -- '車' FONTDATA_ITEM(285, 223, 223, fontpage_285_223_223), // '軟' -- '軟' FONTDATA_ITEM(285, 248, 248, fontpage_285_248_248), // '軸' -- '軸' @@ -1490,6 +1513,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(286, 175, 175, fontpage_286_175_175), // '輯' -- '輯' FONTDATA_ITEM(286, 184, 184, fontpage_286_184_184), // '輸' -- '輸' FONTDATA_ITEM(286, 201, 201, fontpage_286_201_201), // '轉' -- '轉' + FONTDATA_ITEM(286, 253, 253, fontpage_286_253_253), // '载' -- '载' FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近' FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返' FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退' @@ -1518,6 +1542,7 @@ static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = { FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降' FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除' FONTDATA_ITEM(301, 142, 142, fontpage_301_142_142), // '階' -- '階' + FONTDATA_ITEM(301, 168, 168, fontpage_301_168_168), // '隨' -- '隨' FONTDATA_ITEM(301, 217, 217, fontpage_301_217_217), // '雙' -- '雙' FONTDATA_ITEM(301, 226, 226, fontpage_301_226_226), // '離' -- '離' FONTDATA_ITEM(301, 251, 251, fontpage_301_251_251), // '電' -- '電' diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index bd54a4803e..c51891f6ec 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -155,7 +155,12 @@ namespace LanguageNarrow_an { LSTR MSG_AUTORETRACT = _UxGT("Retraccion auto."); LSTR MSG_FILAMENTCHANGE = _UxGT("Cambear filamento"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Cambear filamento *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Encetan. tarcheta"); + #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_CHANGE_MEDIA = _UxGT("Cambiar tarcheta"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 7b58b263ee..3722dba3ad 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -139,7 +139,12 @@ namespace LanguageNarrow_bg { LSTR MSG_AUTORETRACT = _UxGT("Автоoткат"); LSTR MSG_FILAMENTCHANGE = _UxGT("Смяна нишка"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Смяна нишка *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Иниц. SD-Карта"); + #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_CHANGE_MEDIA = _UxGT("Смяна SD-Карта"); LSTR MSG_ZPROBE_OUT = _UxGT("Z-сондата е извадена"); LSTR MSG_ZPROBE_XOFFSET = _UxGT("X Отстояние"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 3c753de53e..da784bc342 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -145,7 +145,12 @@ namespace LanguageNarrow_ca { LSTR MSG_AUTORETRACT = _UxGT("Auto retraccio"); LSTR MSG_FILAMENTCHANGE = _UxGT("Canvia filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Canvia filament *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Inicialitza SD"); + #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_CHANGE_MEDIA = _UxGT("Canvia SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fora"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reinicia BLTouch"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 2217ee5fbd..e54a69ec83 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -359,7 +359,12 @@ namespace LanguageNarrow_cz { LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Vysunout filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunout vše"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Načíst médium"); + #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_CHANGE_MEDIA = _UxGT("Vyměnit médium"); LSTR MSG_RELEASE_MEDIA = _UxGT("Vysunout médium"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index afabace283..e469a594ca 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -493,7 +493,12 @@ namespace LanguageNarrow_de { LSTR MSG_FILAMENTUNLOAD = _UxGT("Filament entladen"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Filament entladen *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Alles entladen"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Medium initial."); // Manually initialize the SD-card via user interface + #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_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_ZPROBE_OUT = _UxGT("Z-Sonde außerhalb"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index e971af32d5..b100f31781 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -180,7 +180,12 @@ namespace LanguageNarrow_el { LSTR MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση"); LSTR MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία SD"); + #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_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης"); // SHORTEN LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πρώτα"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index e2a34765ce..caef745a0e 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -170,7 +170,12 @@ namespace LanguageNarrow_el_gr { LSTR MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση"); LSTR MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία κάρτας SD"); + #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_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός κλίνης"); LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πριν από Z"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 71a7a6869d..bab95d2b86 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -606,9 +606,12 @@ namespace LanguageNarrow_en { LSTR MSG_FILAMENTUNLOAD = _UxGT("Unload Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload * Filament"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Attach ") MEDIA_TYPE_EN; - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Attach SD Card"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Attach USB Drive"); + #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_RELEASE_MEDIA = _UxGT("Release ") MEDIA_TYPE_EN; LSTR MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 5863b63a0e..06e3c753be 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -28,6 +28,8 @@ * See also https://marlinfw.org/docs/development/lcd_language.html */ +#define MEDIA_TYPE_ES "SD/FD" + namespace LanguageNarrow_es { using namespace Language_en; // Inherit undefined strings from English @@ -39,11 +41,11 @@ namespace LanguageNarrow_es { LSTR MSG_NO = _UxGT("NO"); LSTR MSG_BACK = _UxGT("Atrás"); LSTR MSG_MEDIA_ABORTING = _UxGT("Cancelando..."); - 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_INSERTED = MEDIA_TYPE_ES _UxGT(" insertado"); + LSTR MSG_MEDIA_REMOVED = MEDIA_TYPE_ES _UxGT(" retirado"); + LSTR MSG_MEDIA_WAITING = _UxGT("Esperando al ") MEDIA_TYPE_ES; + LSTR MSG_MEDIA_INIT_FAIL = _UxGT("Fallo al iniciar ") MEDIA_TYPE_ES; + LSTR MSG_MEDIA_READ_ERROR = _UxGT("Error lectura ") MEDIA_TYPE_ES; 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"); @@ -310,7 +312,7 @@ namespace LanguageNarrow_es { LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC"); LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: EEPROM Tamaño"); LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versión EEPROM"); - LSTR MSG_MEDIA_UPDATE = _UxGT("Actualizar SD/FD"); + LSTR MSG_MEDIA_UPDATE = _UxGT("Actualizar ") MEDIA_TYPE_ES; LSTR MSG_RESET_PRINTER = _UxGT("Resetear Impresora"); LSTR MSG_REFRESH = LCD_STR_REFRESH _UxGT("Recargar"); LSTR MSG_INFO_SCREEN = _UxGT("Pantalla de Inf."); @@ -333,8 +335,8 @@ namespace LanguageNarrow_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/FD"); - LSTR MSG_NO_MEDIA = _UxGT("SD/FD no presente"); + LSTR MSG_MEDIA_MENU = _UxGT("Imprim. desde ") MEDIA_TYPE_ES; + LSTR MSG_NO_MEDIA = MEDIA_TYPE_ES _UxGT(" no presente"); LSTR MSG_DWELL = _UxGT("Reposo..."); LSTR MSG_USERWAIT = _UxGT("Pulsar para Reanudar"); LSTR MSG_PRINT_PAUSED = _UxGT("Impresión Pausada"); @@ -366,9 +368,14 @@ namespace LanguageNarrow_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/FD"); - LSTR MSG_CHANGE_MEDIA = _UxGT("Cambiar SD/FD"); - LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar SD/FD"); + #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_CHANGE_MEDIA = _UxGT("Cambiar ") MEDIA_TYPE_ES; + LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar ") MEDIA_TYPE_ES; 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 2e49cf50e9..df6e6395d1 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -219,7 +219,12 @@ namespace LanguageNarrow_eu { LSTR MSG_FILAMENTUNLOAD = _UxGT("Harizpia deskargatu"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Harizpia deskargatu *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Erabat deskargatu"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Hasieratu SD-a"); + #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_CHANGE_MEDIA = _UxGT("Aldatu txartela"); LSTR MSG_ZPROBE_OUT = _UxGT("Z zunda kanpora"); LSTR MSG_SKEW_FACTOR = _UxGT("Okertze faktorea"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 169363339e..2a65cd2671 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -392,7 +392,12 @@ namespace LanguageNarrow_fr { LSTR MSG_FILAMENTUNLOAD = _UxGT("Retrait filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Retrait filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Retirer tout"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le média"); + #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_CHANGE_MEDIA = _UxGT("Actualiser média"); LSTR MSG_RELEASE_MEDIA = _UxGT("Retirer le média"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonde Z hors lit"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index a2c5f024b9..0aad606af5 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -392,7 +392,12 @@ namespace LanguageNarrow_fr_na { LSTR MSG_FILAMENTUNLOAD = _UxGT("Retrait filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Retrait filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Retirer tout"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le media"); + #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_CHANGE_MEDIA = _UxGT("Actualiser media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Retirer le media"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonde Z hors lit"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index dc04f481ec..ada1fd2fa2 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -30,6 +30,8 @@ #define DISPLAY_CHARSET_ISO10646_1 +#define MEDIA_TYPE_GL "SD/FD" + namespace LanguageNarrow_gl { using namespace Language_en; // Inherit undefined strings from English @@ -43,8 +45,8 @@ namespace LanguageNarrow_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/FD"); - LSTR MSG_MEDIA_READ_ERROR = _UxGT("Erro lectura SD/FD"); + LSTR MSG_MEDIA_WAITING = _UxGT("Agardando ao ") MEDIA_TYPE_GL; + LSTR MSG_MEDIA_READ_ERROR = _UxGT("Erro lectura ") MEDIA_TYPE_GL; 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."); @@ -313,7 +315,7 @@ namespace LanguageNarrow_gl { LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Erro: Tamaño 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/FD"); + LSTR MSG_MEDIA_UPDATE = _UxGT("Actualizar ") MEDIA_TYPE_GL; LSTR MSG_RESET_PRINTER = _UxGT("Reiniciar Impresora"); LSTR MSG_REFRESH = LCD_STR_REFRESH _UxGT("Recargar"); LSTR MSG_INFO_SCREEN = _UxGT("Información"); @@ -381,9 +383,14 @@ namespace LanguageNarrow_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/FD"); - LSTR MSG_CHANGE_MEDIA = _UxGT("Cambiar SD/FD"); - LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar SD/FD"); + #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_CHANGE_MEDIA = _UxGT("Cambiar ") MEDIA_TYPE_GL; + LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar ") MEDIA_TYPE_GL; 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 ced6d3f25b..9f259693e7 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -117,7 +117,12 @@ namespace LanguageNarrow_hr { LSTR MSG_STOPPED = _UxGT("ZAUSTAVLJEN. "); LSTR MSG_FILAMENTCHANGE = _UxGT("Promijeni filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Promijeni filament *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD karticu"); + #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_CHANGE_MEDIA = _UxGT("Promijeni SD karticu"); LSTR MSG_ERR_HEATING_FAILED = _UxGT("Grijanje neuspješno"); LSTR MSG_HEATING = _UxGT("Grijanje..."); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index fd81dc6b18..2f744abc6f 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -431,7 +431,12 @@ 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"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Tároló"); + #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_CHANGE_MEDIA = _UxGT("Tároló csere"); LSTR MSG_RELEASE_MEDIA = _UxGT("Tároló Kiadása"); LSTR MSG_ZPROBE_OUT = _UxGT("Z szonda tálcán kivül"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 005f0b45a4..13a6f88a01 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -581,9 +581,12 @@ namespace LanguageNarrow_it { LSTR MSG_FILAMENTUNLOAD = _UxGT("Rimuovi filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Rimuovi filam. *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Rimuovi tutto"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Collega ") MEDIA_TYPE_IT; - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Collega scheda SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Collega penna USB"); + #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_CHANGE_MEDIA = _UxGT("Cambia ") MEDIA_TYPE_IT; LSTR MSG_RELEASE_MEDIA = _UxGT("Rilascia ") MEDIA_TYPE_IT; LSTR MSG_ZPROBE_OUT = _UxGT("Z probe fuori piatto"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index f7c37bad16..cbc680460a 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -168,7 +168,12 @@ 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" - LSTR MSG_ATTACH_MEDIA = _UxGT("メディアサイヨミコミ"); // "Init. SD card" + #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_CHANGE_MEDIA = _UxGT("メディアコウカン"); // "Change SD card" LSTR MSG_ZPROBE_OUT = _UxGT("Zプローブ ベッドガイ"); // "Z probe out. bed" LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch ジコシンダン"); // "BLTouch Self-Test" diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 2c542999ca..f47bc053b8 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -146,7 +146,12 @@ namespace LanguageNarrow_nl { LSTR MSG_AUTORETRACT = _UxGT("Auto-Retract"); LSTR MSG_FILAMENTCHANGE = _UxGT("Verv. Filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Verv. Filament *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD kaart"); + #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_CHANGE_MEDIA = _UxGT("Verv. SD Kaart"); LSTR MSG_ZPROBE_OUT = _UxGT("Z probe uit. bed"); LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Zelf-Test"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 64759ee841..087a26967d 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -358,7 +358,12 @@ namespace LanguageNarrow_pl { LSTR MSG_FILAMENTUNLOAD = _UxGT("Wysuń Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Wysuń Filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Wysuń wszystkie"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Inicjal. karty SD"); + #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_CHANGE_MEDIA = _UxGT("Zmiana karty SD"); LSTR MSG_RELEASE_MEDIA = _UxGT("Zwolnienie karty"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z za stołem"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 682ebba9fa..8f9745c04b 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -142,7 +142,12 @@ namespace LanguageNarrow_pt { LSTR MSG_AUTORETRACT = _UxGT(" Auto-Retract"); LSTR MSG_FILAMENTCHANGE = _UxGT("Trocar filamento"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Trocar filamento *"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Inici. cartão SD"); + #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_CHANGE_MEDIA = _UxGT("Trocar cartão SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Sensor fora/base"); LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desvio X"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index f131e06ad8..4908986bdb 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -321,7 +321,12 @@ namespace LanguageNarrow_pt_br { LSTR MSG_FILAMENTUNLOAD = _UxGT("Descarreg. Filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Descarreg. Filamento *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Descarregar Todos"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar SD"); + #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_CHANGE_MEDIA = _UxGT("Trocar SD"); LSTR MSG_RELEASE_MEDIA = _UxGT("Liberar SD"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda fora da mesa"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index e45c93e34d..15278a43e7 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -388,7 +388,12 @@ namespace LanguageNarrow_ro { LSTR MSG_FILAMENTUNLOAD = _UxGT("Scoatere Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Scoatere Filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Scoate Tot"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Atasare Media"); + #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_CHANGE_MEDIA = _UxGT("Inlocuire Media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Eliberare Media"); LSTR MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 9d6509d70d..a8d862e889 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -435,7 +435,12 @@ namespace LanguageNarrow_ru { LSTR MSG_FILAMENTLOAD_E = _UxGT("Подать филамент *"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Убрать филамент *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Выгрузить всё"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Установить SD карту"); + #if HAS_MULTI_VOLUME + LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Установить SD карту"); + LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Установить флешка"); + #else + LSTR MSG_ATTACH_MEDIA = _UxGT("Установить SD карту"); + #endif LSTR MSG_CHANGE_MEDIA = _UxGT("Сменить SD карту"); LSTR MSG_RELEASE_MEDIA = _UxGT("Освободить SD карту"); LSTR MSG_ZPROBE_OUT = _UxGT("Z-зонд вне стола"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 50729dfbd0..30a8076d39 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -533,9 +533,12 @@ namespace LanguageNarrow_sk { LSTR MSG_FILAMENTUNLOAD = _UxGT("Vysunúť filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Vysunúť filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunúť všetko"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Načítať kartu"); - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Načítať SD kartu"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Načítať USB disk"); + #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_CHANGE_MEDIA = _UxGT("Vymeniť kartu"); LSTR MSG_RELEASE_MEDIA = _UxGT("Odpojiť kartu"); LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl."); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 76cd39fcea..b7702a7985 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -417,7 +417,12 @@ namespace LanguageNarrow_sv { LSTR MSG_FILAMENTUNLOAD = _UxGT("Lossa Tråd"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Lossa *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Lossa All"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Bifoga Media"); + #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_CHANGE_MEDIA = _UxGT("Byt Media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Släpp Media"); LSTR MSG_ZPROBE_OUT = _UxGT("Z Sond Utanför Bädd"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index e22a4c75d0..2055713eeb 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -550,9 +550,12 @@ 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"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Medyayı Ekle"); - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("SD Kartı takın"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("USB Sürücüyü takın"); + #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_CHANGE_MEDIA = _UxGT("Medyayı Değiştir"); LSTR MSG_RELEASE_MEDIA = _UxGT("Medyayı Çıkart"); LSTR MSG_ZPROBE_OUT = _UxGT("Z Prob Tablayı Geçti"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 63a721fe9f..0add5acc3e 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -445,7 +445,12 @@ namespace LanguageNarrow_uk { LSTR MSG_FILAMENTUNLOAD = _UxGT("Видалити пруток"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Видалити пруток *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Видалити все"); - LSTR MSG_ATTACH_MEDIA = _UxGT("Вставити SD-картку"); + #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_CHANGE_MEDIA = _UxGT("Заміна SD-картки"); LSTR MSG_RELEASE_MEDIA = _UxGT("Видаліть SD-картку"); LSTR MSG_ZPROBE_OUT = _UxGT("Z-Зонд поза столом"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index deed0fda7b..fda9b65367 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -309,7 +309,12 @@ 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 - LSTR MSG_ATTACH_MEDIA = _UxGT("Khởi tạo phương tiện"); // Attach media + #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_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_ZPROBE_OUT = _UxGT("Đầu Dò Z qua bàn"); // Z Probe past bed diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 120bbdca35..13c49fa9f1 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -398,7 +398,12 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_FILAMENTUNLOAD = _UxGT("卸载丝料"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_E = _UxGT("卸载丝料 *"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("卸载全部"); // "Unload All" - LSTR MSG_ATTACH_MEDIA = _UxGT("初始化存储卡"); // "Init. SD card" + #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_CHANGE_MEDIA = _UxGT("更换存储卡"); // "Change SD card" LSTR MSG_RELEASE_MEDIA = _UxGT("释放存储卡"); LSTR MSG_ZPROBE_OUT = _UxGT("Z探针在热床之外"); // "Z probe out. bed" Z probe is not within the physical limits diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 43378e5874..c705d126cb 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -350,8 +350,12 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_FILAMENTUNLOAD = _UxGT("卸載絲料"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_E = _UxGT("卸載絲料 *"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("卸載全部"); // "Unload All" - LSTR MSG_INIT_MEDIA = _UxGT("初始化記憶卡"); // "Init. SD card" - LSTR MSG_ATTACH_MEDIA = _UxGT("連接記憶卡"); // "Attach Media + #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_CHANGE_MEDIA = _UxGT("更換記憶卡"); // "Change SD card" LSTR MSG_RELEASE_MEDIA = _UxGT("釋放媒體"); // "Release Media" LSTR MSG_ZPROBE_OUT = _UxGT("Z探針在熱床之外"); // "Z probe out. bed" Z probe is not within the physical limits diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index c74d6b2a1d..6142e0e153 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -441,12 +441,12 @@ void menu_main() { #if HAS_SD_DETECT 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 - #else - GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21")); // M21 Attach Media - #endif + #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 + #else + GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21")); // M21 Attach Media + #endif #endif } // END MEDIA MENU