From 455ea933136d667b2c135f7b140bb0b765e29fbb Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 1 Jul 2020 15:02:31 +0200 Subject: [PATCH 01/55] Allow from 0 to 5 preheats setup This will complete "more than 2" preheats integration Fix also #18450 --- Marlin/src/inc/Conditionals_LCD.h | 8 -- Marlin/src/inc/Conditionals_post.h | 14 ++- Marlin/src/lcd/language/language_an.h | 59 ++++++++--- Marlin/src/lcd/language/language_bg.h | 59 ++++++++--- Marlin/src/lcd/language/language_ca.h | 59 ++++++++--- Marlin/src/lcd/language/language_cz.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_da.h | 59 ++++++++--- Marlin/src/lcd/language/language_de.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_el.h | 59 ++++++++--- Marlin/src/lcd/language/language_el_gr.h | 59 ++++++++--- Marlin/src/lcd/language/language_en.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_es.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_eu.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_fi.h | 59 ++++++++--- Marlin/src/lcd/language/language_fr.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_gl.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_hr.h | 59 ++++++++--- Marlin/src/lcd/language/language_hu.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_it.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_jp_kana.h | 59 ++++++++--- Marlin/src/lcd/language/language_ko_KR.h | 38 +++++-- Marlin/src/lcd/language/language_nl.h | 59 ++++++++--- Marlin/src/lcd/language/language_pl.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_pt.h | 59 ++++++++--- Marlin/src/lcd/language/language_pt_br.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_ro.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_ru.h | 112 +++++++++++++++++---- Marlin/src/lcd/language/language_sk.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_test.h | 24 +++-- Marlin/src/lcd/language/language_tr.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_uk.h | 97 ++++++++++++++---- Marlin/src/lcd/language/language_vi.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_zh_CN.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_zh_TW.h | 93 +++++++++++++---- Marlin/src/lcd/menu/menu_configuration.cpp | 32 +++--- Marlin/src/lcd/menu/menu_temperature.cpp | 78 +++++++------- Marlin/src/lcd/menu/menu_ubl.cpp | 104 +++++++++++-------- 37 files changed, 2122 insertions(+), 615 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 71b5d7a89aa4..1267e1dcf341 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -566,14 +566,6 @@ #define NUM_SERVOS 0 #endif -#ifndef PREHEAT_1_LABEL - #define PREHEAT_1_LABEL "PLA" -#endif - -#ifndef PREHEAT_2_LABEL - #define PREHEAT_2_LABEL "ABS" -#endif - /** * Set a flag for a servo probe (or BLTouch) */ diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index be63d3ec36db..3dd5894ee9f6 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2092,8 +2092,18 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) - #define PREHEAT_COUNT 2 +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) + #ifdef PREHEAT_5_LABEL + #define PREHEAT_COUNT 5 + #elif defined(PREHEAT_4_LABEL) + #define PREHEAT_COUNT 4 + #elif defined(PREHEAT_3_LABEL) + #define PREHEAT_COUNT 3 + #elif defined(PREHEAT_2_LABEL) + #define PREHEAT_COUNT 2 + #else + #define PREHEAT_COUNT 1 + #endif #else #undef PREHEAT_COUNT #endif diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index fb2a2277b754..ee641f0ecd35 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -56,20 +56,51 @@ namespace Language_an { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Amortar Fuent"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index aa7875e44bf9..99b344705ac7 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -46,20 +46,51 @@ namespace Language_bg { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Паркиране"); PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Изкл. захранване"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 70966ca4cdf0..b53455866e79 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -54,20 +54,51 @@ namespace Language_ca { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Extrudeix"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 3e852249886f..4c88749e0935 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -79,20 +79,51 @@ namespace Language_cz { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Ovládání laseru"); @@ -156,14 +187,40 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 zařívání trysky"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 0ecb583e8008..d5d32cc64a35 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -49,20 +49,51 @@ namespace Language_da { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Slå strøm fra"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index b472eaf8571d..39f8082d324a 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -64,20 +64,51 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenz"); @@ -140,14 +171,40 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Düse aufheizen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 17e4e819c12e..299d63494bc8 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -54,20 +54,51 @@ namespace Language_el { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); //SHORTEN PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H0 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H0 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H0 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Απενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index d107f42f7b73..13368f62876b 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -55,20 +55,51 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Απενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index cb95205514a8..f590c9086bde 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -74,20 +74,51 @@ namespace Language_en { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequency"); @@ -150,14 +181,40 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index c95fd09f1013..17ecae6f4795 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -69,20 +69,51 @@ namespace Language_es { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia"); @@ -145,14 +176,40 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Calent. Boquilla"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index ed065559b624..e8616063eb87 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -58,20 +58,51 @@ namespace Language_eu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Etxe. offset eza."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Energia itzali"); @@ -98,13 +129,39 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); + #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 59bdf8d6d6f6..923a430fedca 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -45,20 +45,51 @@ namespace Language_fi { PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit"); PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Virta pois"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index f303bf93dcb9..b4be40a47e03 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -70,20 +70,51 @@ namespace Language_fr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Contrôle Laser"); @@ -146,15 +177,41 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajuster haut. couche"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index e819d9075f78..a9623d828fce 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -72,20 +72,51 @@ namespace Language_gl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Axustar Desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia"); @@ -148,14 +179,40 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Quentando Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index e50d4b8d775f..e871593beb41 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -55,20 +55,51 @@ namespace Language_hr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Postavi home offsete"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Isključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index da647de1bcbf..499ecb1a8d0f 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -74,20 +74,51 @@ namespace Language_hu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia"); @@ -150,14 +181,40 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló Kész"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Fúvóka Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 0f06d862c164..5cafc1814c05 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -72,20 +72,51 @@ namespace Language_it { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenza"); @@ -148,14 +179,40 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.Mesh fatta"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Priming manuale..."); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index f6d4ede51fdd..4172795c4c02 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -63,20 +63,51 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("キジュンオフセットセッテイ"); // "Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("デンゲン オフ"); // "Switch power off" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 8d022e99c0fe..88700e862987 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -55,14 +55,36 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("누르면 시작합니다"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("예열하기 - ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("예열하기 - ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("예열하기 - ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("예열하기 - ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("예열하기 - ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("예열하기 - ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐 ~"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Custom 예열"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("식히기"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("스위치 전원 켜기"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 9bc88cffb89d..44ebaf71f065 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -55,20 +55,51 @@ namespace Language_nl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Zet home offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Stroom uit"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 4fb2df6eec64..40dbbea07fa6 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -70,20 +70,51 @@ namespace Language_pl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ust. poz. zer."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Sterowanie Lasera"); @@ -145,14 +176,40 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Nagrzewanie dyszy"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index bc7465716ce5..92d627b4cfd7 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -54,20 +54,51 @@ namespace Language_pt { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Definir desvio"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Desligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index f3faf2aac360..d71b56081a0b 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -69,20 +69,51 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Compensar origem"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); @@ -132,14 +163,40 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Aquecendo Ext."); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 643589f1bddd..aeb12dd3fcd2 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -70,20 +70,51 @@ namespace Language_ro { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecventa"); @@ -146,14 +177,40 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 229e8199375a..2092a86986e0 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -78,20 +78,51 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Частота"); @@ -184,8 +215,21 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); #else @@ -195,12 +239,38 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Высота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить сетку"); #if LCD_WIDTH > 21 - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Проверить сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Проверить сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Проверить сетку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Проверить свою сетку"); #else - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Провер. сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Провер. сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Провер. сетку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Провер. свою сетку"); #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрев стола"); @@ -413,7 +483,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_BUTTON_DONE = _UxGT("Готово"); PROGMEM Language_Str MSG_BUTTON_BACK = _UxGT("Назад"); PROGMEM Language_Str MSG_BUTTON_PROCEED = _UxGT("Продолжить"); - + PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Пауза печати"); PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Продолжить печать"); PROGMEM Language_Str MSG_STOP_PRINT = _UxGT("Остановить печать"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index a505b2e0ea8b..bd9c029ec26b 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -74,20 +74,51 @@ namespace Language_sk { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia"); @@ -150,14 +181,40 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 ohrev trysky"); diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h index 147379f5bd48..680041ba1746 100644 --- a/Marlin/src/lcd/language/language_test.h +++ b/Marlin/src/lcd/language/language_test.h @@ -138,8 +138,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_C2_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_C2_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_C2_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_C3_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_C3_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_C3_b; @@ -175,8 +179,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_D0_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_D0_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_D0_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_D1_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_D1_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_D1_b; @@ -211,8 +219,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_E382_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_E382_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_E382_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_E383_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_E383_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_E383_b; diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index aa68ece99210..657c1952b1be 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -75,20 +75,51 @@ namespace Language_tr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Lazer Kontrolü"); @@ -150,14 +181,40 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 2572d1b0ae11..0951e13c3668 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -80,20 +80,51 @@ namespace Language_uk { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Частота"); @@ -148,7 +179,7 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOTEND_OFFSET_X = _UxGT("Друге сопло X"); PROGMEM Language_Str MSG_HOTEND_OFFSET_Y = _UxGT("Друге сопло Y"); PROGMEM Language_Str MSG_HOTEND_OFFSET_Z = _UxGT("Друге сопло Z"); - + PROGMEM Language_Str MSG_UBL_DOING_G29 = _UxGT("Виконується G29"); PROGMEM Language_Str MSG_UBL_TOOLS = _UxGT("Інструменти UBL"); PROGMEM Language_Str MSG_UBL_LEVEL_BED = _UxGT("Налаштування UBL"); @@ -185,14 +216,40 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Редагування сітки"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 нагрів сопла"); @@ -651,7 +708,7 @@ namespace Language_uk { PROGMEM Language_Str MSG_KILL_HOMING_FAILED = _UxGT("Помилка паркування"); PROGMEM Language_Str MSG_LCD_PROBING_FAILED = _UxGT("Помилка зондування"); PROGMEM Language_Str MSG_M600_TOO_COLD = _UxGT("M600: низька Т") LCD_STR_DEGREE; - + PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER = _UxGT("ОБЕРІТЬ ПРУТОК"); PROGMEM Language_Str MSG_MMU2_MENU = _UxGT("Налаштування MMU"); PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE = _UxGT("Понови прошивку MMU!"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 8538c81831b5..d565d8de5ad1 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -65,20 +65,51 @@ namespace Language_vi { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Đặt bù đắp nhà"); // Set home offsets PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Bật nguồn"); // Switch power on @@ -124,14 +155,40 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sửa xong lưới"); // Done Editing Mesh PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index fc9ae67818da..d3f82990d483 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -69,20 +69,51 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("设置原点偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("切割频率"); @@ -145,14 +176,40 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26加热喷嘴"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 1019fcb03ac8..985d20a80d89 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -68,20 +68,51 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("設置原點偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" PROGMEM Language_Str MSG_LASER_MENU = _UxGT("激光控制"); //"Laser Control" @@ -143,14 +174,40 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成編輯網格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle" diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 9e4653cf3553..45e8cf49e326 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -322,13 +322,15 @@ void menu_advanced_settings(); } void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(0); } - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(2); } + #if PREHEAT_COUNT >= 4 + void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(3); } + #if PREHEAT_COUNT >= 5 + void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(4); } + #endif #endif #endif #endif @@ -413,13 +415,15 @@ void menu_configuration() { // Preheat configurations #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) SUBMENU(MSG_PREHEAT_1_SETTINGS, menu_preheat_material1_settings); - SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); + #if PREHEAT_COUNT >= 2 + SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); + #if PREHEAT_COUNT >= 3 + SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); + #if PREHEAT_COUNT >= 4 + SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); + #if PREHEAT_COUNT >= 5 + SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); + #endif #endif #endif #endif diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index a94e79062793..9bcc3264aae7 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -66,17 +66,17 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i ui.return_to_status(); } -#if HAS_TEMP_HOTEND - inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); } +#if PREHEAT_COUNT + + #if HAS_TEMP_HOTEND + inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); } + #if HAS_HEATED_BED + inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); } + #endif + #endif #if HAS_HEATED_BED - inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); } + inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); } #endif -#endif -#if HAS_HEATED_BED - inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); } -#endif - -#if HAS_TEMP_HOTEND || HAS_HEATED_BED #if HAS_TEMP_HOTEND && HAS_HEATED_BED @@ -145,17 +145,23 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i } void menu_preheat_m1() { menu_preheat_m(0); } - void menu_preheat_m2() { menu_preheat_m(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_m3() { menu_preheat_m(2); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_m4() { menu_preheat_m(3); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_m5() { menu_preheat_m(4); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_m2() { menu_preheat_m(1); } + #if PREHEAT_COUNT >= 3 + void menu_preheat_m3() { menu_preheat_m(2); } + #if PREHEAT_COUNT >= 4 + void menu_preheat_m4() { menu_preheat_m(3); } + #if PREHEAT_COUNT >= 5 + void menu_preheat_m5() { menu_preheat_m(4); } + #endif #endif #endif #endif +#endif // PREHEAT_COUNT + +#if HAS_TEMP_HOTEND || HAS_HEATED_BED + void lcd_cooldown() { thermalManager.zero_fan_speeds(); thermalManager.disable_all_heaters(); @@ -279,32 +285,36 @@ void menu_temperature() { #endif // HAS_FAN - #if HAS_TEMP_HOTEND + // + // Preheat for Materials 1 to 5 + // + #ifdef PREHEAT_COUNT - // - // Preheat for Material 1 and 2 - // #if HOTENDS > 1 || HAS_HEATED_BED SUBMENU(MSG_PREHEAT_1, menu_preheat_m1); - SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); + #if PREHEAT_COUNT >= 2 + SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); + #if PREHEAT_COUNT >= 3 + SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); + #if PREHEAT_COUNT >= 4 + SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); + #if PREHEAT_COUNT >= 5 + SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); + #endif #endif #endif #endif #else ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); }); - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + #if PREHEAT_COUNT >= 2 + ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + #if PREHEAT_COUNT >= 4 + ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); + #if PREHEAT_COUNT >= 5 + ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + #endif #endif #endif #endif @@ -316,7 +326,7 @@ void menu_temperature() { if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true; if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown); - #endif // HAS_TEMP_HOTEND + #endif // PREHEAT_COUNT END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 58cf13a11c52..25c7fc806d03 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -206,21 +206,40 @@ void _lcd_ubl_edit_mesh() { * UBL Validate Mesh submenu * * << UBL Tools - * Mesh Validation with Material 1 - * Mesh Validation with Material 2 + * Mesh Validation with Material 1 up to 5 * Validate Custom Mesh * << Info Screen */ void _lcd_ubl_validate_mesh() { START_MENU(); BACK_ITEM(MSG_UBL_TOOLS); - #if HAS_HEATED_BED - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); - #else - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); - #endif + #if PREHEAT_COUNT + #if HAS_HEATED_BED + #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ + "G28\n" \ + "G26 C B" STRINGIFY(PREHEAT_##p##_TEMP_BED) " H" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) " P" \ + )) + #else + #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ + "G28\n" \ + "G26 C B0 H" STRINGIFY(PREHEAT_##p#_TEMP_HOTEND) " P" \ + )) + #endif + + VALIDATE_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT >= 2 + VALIDATE_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT >= 3 + VALIDATE_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT >= 4 + VALIDATE_MESH_GCODE_ITEM(4); + #if PREHEAT_COUNT >= 5 + VALIDATE_MESH_GCODE_ITEM(5); + #endif + #endif + #endif + #endif + #endif // PREHEAT_COUNT ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh); ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status); END_MENU(); @@ -302,8 +321,7 @@ void _lcd_ubl_invalidate() { * UBL Build Mesh submenu * * << UBL Tools - * Build Mesh with Material 1 - * Build Mesh with Material 2 + * Build Mesh with Material 1 up to 5 * - Build Custom Mesh >> * Build Cold Mesh * - Fill-in Mesh >> @@ -315,37 +333,39 @@ void _lcd_ubl_invalidate() { void _lcd_ubl_build_mesh() { START_MENU(); BACK_ITEM(MSG_UBL_TOOLS); - #if HAS_HEATED_BED - GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR( - "G28\n" - "M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n" - "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0\n" - "M140 S0" - )); - GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR( - "G28\n" - "M190 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\n" - "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0\n" - "M140 S0" - )); - #else - GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR( - "G28\n" - "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0" - )); - GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR( - "G28\n" - "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0" - )); - #endif + #if PREHEAT_COUNT + #if HAS_HEATED_BED + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + "G28\n" \ + "M190 S" STRINGIFY(PREHEAT_##p##_TEMP_BED) "\n" \ + "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ + "G29 P1\n" \ + "M104 S0\n" \ + "M140 S0" \ + )) + #else + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + "G28\n" \ + "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ + "G29 P1\n" \ + "M104 S0" \ + )) + #endif + + BUILD_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT >= 2 + BUILD_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT >= 3 + BUILD_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT >= 4 + BUILD_MESH_GCODE_ITEM(4); + #if PREHEAT_COUNT >= 5 + BUILD_MESH_GCODE_ITEM(5); + #endif + #endif + #endif + #endif + #endif // PREHEAT_COUNT SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh); GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1")); SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin); From c7396491ba9f8379f428798b6d5b0104414edd78 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 1 Jul 2020 16:06:25 +0200 Subject: [PATCH 02/55] Fix Japanese typo --- Marlin/src/lcd/language/language_jp_kana.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 4172795c4c02..5f7b0cd6eae9 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -81,7 +81,7 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif - #ifdef PREHEAT_2_LABEL + #ifdef PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" From 5eaee87b49303f2e35b7a328e46accbf7d31a864 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:34:22 -0500 Subject: [PATCH 03/55] Update language_an.h --- Marlin/src/lcd/language/language_an.h | 70 +++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index ee641f0ecd35..c1f1d2a13cd9 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,49 +57,49 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); From c72eda59a400cca0913f63de7003336fc9fd8e1a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:35:49 -0500 Subject: [PATCH 04/55] Update language_bg.h --- Marlin/src/lcd/language/language_bg.h | 70 +++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 99b344705ac7..6fa2d231ab21 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,49 +47,49 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); From ebb09a396228a819444c5daf7f71405b0cd383c2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:41:54 -0500 Subject: [PATCH 05/55] Fix spacing with regex --- Marlin/src/lcd/language/language_ca.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_cz.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_da.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_de.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_el.h | 14 ++--- Marlin/src/lcd/language/language_el_gr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_en.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_es.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_eu.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_fi.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_fr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_gl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_hr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_hu.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_it.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_jp_kana.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_nl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pt.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pt_br.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_ro.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_ru.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_sk.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_tr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_uk.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_vi.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_zh_CN.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_zh_TW.h | 70 +++++++++++----------- 28 files changed, 952 insertions(+), 952 deletions(-) diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index b53455866e79..f35aff5f42a8 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,49 +55,49 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 4c88749e0935..3611447462e2 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,49 +80,49 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index d5d32cc64a35..f4568dc8128a 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,49 +50,49 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 39f8082d324a..a5768086e470 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,49 +65,49 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 299d63494bc8..659d22ea4d34 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,13 +55,13 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN #endif #ifdef PREHEAT_2_LABEL PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 13368f62876b..3c1edcbba765 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,49 +56,49 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index f590c9086bde..f213bc233205 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,49 +75,49 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 17ecae6f4795..e30a6f9be946 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,49 +70,49 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index e8616063eb87..8d5f33cb131b 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,49 +59,49 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 923a430fedca..4a8a0ef1168f 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,49 +46,49 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index b4be40a47e03..eadee9c38b86 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,49 +71,49 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index a9623d828fce..de6cdb5a686a 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,49 +73,49 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index e871593beb41..885b7a36ee61 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,49 +56,49 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 499ecb1a8d0f..30a24193c5ca 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,49 +75,49 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 5cafc1814c05..ba2476966a19 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,49 +73,49 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 5f7b0cd6eae9..0d953deac56d 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,49 +64,49 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 44ebaf71f065..a9aa1b40ea03 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,49 +56,49 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 40dbbea07fa6..c980654b8161 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,49 +71,49 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 92d627b4cfd7..25d7aae1c10d 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,49 +55,49 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index d71b56081a0b..16f6c944529f 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,49 +70,49 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index aeb12dd3fcd2..9b4702b8f336 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -71,49 +71,49 @@ namespace Language_ro { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 2092a86986e0..950a3456758b 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,49 +79,49 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index bd9c029ec26b..76aa343db26f 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,49 +75,49 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 657c1952b1be..1c5ae3ee8f03 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,49 +76,49 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 0951e13c3668..d11ac98ff945 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,49 +81,49 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index d565d8de5ad1..6f66c938918a 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,49 +66,49 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index d3f82990d483..14d366e88677 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,49 +70,49 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 985d20a80d89..cf3ad73aba93 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,49 +69,49 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" From ec0970e7773866fa36c650f1587bbf03ac37d883 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:44:26 -0500 Subject: [PATCH 06/55] And more strings --- Marlin/src/lcd/language/language_cz.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_de.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_en.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_es.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_eu.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_fr.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_gl.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_hu.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_it.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_pl.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_pt_br.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_ro.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_ru.h | 10 +++++----- Marlin/src/lcd/language/language_sk.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_tr.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_uk.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_vi.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_zh_CN.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_zh_TW.h | 20 ++++++++++---------- 19 files changed, 185 insertions(+), 185 deletions(-) diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 3611447462e2..4f00f9aeecd0 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -188,38 +188,38 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index a5768086e470..48bb72ef2faa 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -172,38 +172,38 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index f213bc233205..341a96a7209a 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -182,38 +182,38 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index e30a6f9be946..10efe6081623 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -177,38 +177,38 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 8d5f33cb131b..9fd48c0f73b3 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -130,37 +130,37 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index eadee9c38b86..1fed3f96e445 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -178,19 +178,19 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); @@ -198,19 +198,19 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index de6cdb5a686a..6a0e96eef6d3 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -180,38 +180,38 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 30a24193c5ca..a789575aabc2 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -182,38 +182,38 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index ba2476966a19..ccc23a53a893 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -180,38 +180,38 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index c980654b8161..23740a50846f 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -177,38 +177,38 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 16f6c944529f..fdd2a88052a3 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -164,38 +164,38 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 9b4702b8f336..e619ff61a601 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -178,38 +178,38 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 950a3456758b..ba777318d10c 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -216,19 +216,19 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 76aa343db26f..f812cc956a75 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -182,38 +182,38 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 1c5ae3ee8f03..7eab16cf8ba7 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -182,38 +182,38 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index d11ac98ff945..3e846aeab8e1 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -217,38 +217,38 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 6f66c938918a..fe8e3156ddee 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -156,38 +156,38 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 14d366e88677..b1553b94586b 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -177,38 +177,38 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index cf3ad73aba93..5d931a14e39f 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -175,38 +175,38 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" From 0285052b11fea639a83d9bc60755f8ae53d8410c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:52:08 -0500 Subject: [PATCH 07/55] Update menu_configuration.cpp --- Marlin/src/lcd/menu/menu_configuration.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 45e8cf49e326..78a91798a023 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -321,15 +321,15 @@ void menu_advanced_settings(); END_MENU(); } - void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(0); } + void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(1-1); } #if PREHEAT_COUNT >= 2 - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(2); } + void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(2-1); } + #if PREHEAT_COUNT >= 3 + void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3-1); } #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(3); } + void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4-1); } #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(4); } + void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5-1); } #endif #endif #endif From a665662314fa1527e6d74e47644d3103358426cb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:46:20 -0500 Subject: [PATCH 08/55] Simplify setting preset temps Add an I parameter to M104, M106, M109, M140, and M190 so temperatures can be set from presets. --- Marlin/src/gcode/temp/M104_M109.cpp | 67 ++++++++++++++++++++++++----- Marlin/src/gcode/temp/M106_M107.cpp | 27 +++++++++--- Marlin/src/gcode/temp/M140_M190.cpp | 63 ++++++++++++++++++++++----- 3 files changed, 129 insertions(+), 28 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index bb453412d7a6..9d43e3971899 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -50,7 +50,11 @@ #endif /** - * M104: Set hot end temperature + * M104: Set Hotend Temperature target and return immediately + * + * Parameters: + * T : Tool index. If omitted, applies to the active tool + * S : The target temperature in current units */ void GcodeSuite::M104() { @@ -63,8 +67,21 @@ void GcodeSuite::M104() { if (target_extruder < 0) return; #endif - if (parser.seenval('S')) { - const int16_t temp = parser.value_celsius(); + int16_t temp = 0; + + // Accept 'P' if there are temperature presets are defined + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('P'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; + #else + constexpr bool got_preset = false; + #endif + + // If no 'P' get the temperature from 'S' + const bool got_temp = !got_preset && parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + + if (got_preset || got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -91,10 +108,24 @@ void GcodeSuite::M104() { } /** - * M109: Sxxx Wait for hotend(s) to reach temperature. Waits only when heating. - * Rxxx Wait for hotend(s) to reach temperature. Waits when heating and cooling. + * M109: Set Hotend Temperature target and wait + * + * Parameters + * T : Tool index. If omitted, applies to the active tool + * S : The target temperature in current units. Wait for heating only. + * R : The target temperature in current units. Wait for heating and cooling. + * + * With AUTOTEMP... + * F : Autotemp Scaling Factor. Set non-zero to enable Auto-temp. + * S : Minimum temperature, in current units. + * B : Maximum temperature, in current units. * - * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating and stop it if turned off. + * Examples + * M109 S100 : Set target to 100°. Wait until the hotend is at or above 100°. + * M109 R150 : Set target to 150°. Wait until the hotend gets close to 150°. + * + * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer + * (used by printingIsActive, etc.) and turning off heaters will stop the timer. */ void GcodeSuite::M109() { @@ -107,10 +138,24 @@ void GcodeSuite::M109() { if (target_extruder < 0) return; #endif - const bool no_wait_for_cooling = parser.seenval('S'), - set_temp = no_wait_for_cooling || parser.seenval('R'); - if (set_temp) { - const int16_t temp = parser.value_celsius(); + int16_t temp = 0; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('P'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; + #else + constexpr bool got_preset = false; + #endif + + // Get the temperature from 'S' or 'R' + bool no_wait_for_cooling = false, got_temp = false; + if (!got_preset) { + no_wait_for_cooling = parser.seenval('S'); + got_temp = no_wait_for_cooling || parser.seenval('R'); + if (got_temp) temp = int16_t(parser.value_celsius()); + } + + if (got_preset || got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -139,7 +184,7 @@ void GcodeSuite::M109() { TERN_(AUTOTEMP, planner.autotemp_M104_M109()); - if (set_temp) + if (got_preset || got_temp) (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling); } diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index 7fbc53297e8c..e5f3bd55e305 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -39,6 +39,7 @@ /** * M106: Set Fan Speed * + * I Material Preset index (if material presets are defined) * S Speed between 0-255 * P Fan index, if more than one fan * @@ -50,19 +51,31 @@ * 3-255 = Set the speed for use with T2 */ void GcodeSuite::M106() { - const uint8_t p = parser.byteval('P', _ALT_P); + const uint8_t pfan = parser.byteval('P', _ALT_P); - if (p < _CNT_P) { + if (pfan < _CNT_P) { #if ENABLED(EXTRA_FAN_SPEED) const uint16_t t = parser.intval('T'); - if (t > 0) return thermalManager.set_temp_fan_speed(p, t); + if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t); + #endif + + const uint16_t dspeed = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255; + + uint16_t speed = dspeed; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed; + #else + constexpr bool got_preset = false; #endif - uint16_t d = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255; - uint16_t s = parser.ushortval('S', d); - NOMORE(s, 255U); - thermalManager.set_fan_speed(p, s); + if (!got_preset && parser.seenval('S')) + speed = parser.value_ushort(); + + // Set speed, with constraint + thermalManager.set_fan_speed(pfan, speed); } } diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 394ce2de1796..725a238087bb 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -47,11 +47,29 @@ /** * M140: Set bed temperature + * + * I : Preset index (if material presets are defined) + * S : The target temperature in current units */ void GcodeSuite::M140() { if (DEBUGGING(DRYRUN)) return; - if (parser.seenval('S')) { - thermalManager.setTargetBed(parser.value_celsius()); + + int16_t temp = 0; + + // Accept 'P' if there are temperature presets are defined + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + #else + constexpr bool got_preset = false; + #endif + + // If no 'P' get the temperature from 'S' + const bool got_temp = !got_preset && parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + + if (got_preset || got_temp) { + thermalManager.setTargetBed(temp); #if ENABLED(PRINTJOB_TIMER_AUTOSTART) /** @@ -65,20 +83,45 @@ void GcodeSuite::M140() { } /** - * M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating - * Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling + * M190 - Set Bed Temperature target and wait + * + * Parameters: + * I : Preset index (if material presets are defined) + * S : The target temperature in current units. Wait for heating only. + * R : The target temperature in current units. Wait for heating and cooling. * - * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating. + * Examples: + * M190 S60 : Set target to 60°. Wait until the bed is at or above 60°. + * M190 R40 : Set target to 40°. Wait until the bed gets close to 40°. + * + * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer + * (used by printingIsActive, etc.) and turning off heaters will stop the timer. */ void GcodeSuite::M190() { if (DEBUGGING(DRYRUN)) return; - const bool no_wait_for_cooling = parser.seenval('S'); - if (no_wait_for_cooling || parser.seenval('R')) { - thermalManager.setTargetBed(parser.value_celsius()); - TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false)); + int16_t temp = 0; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + #else + constexpr bool got_preset = false; + #endif + + // Get the temperature from 'S' or 'R' + bool no_wait_for_cooling = false, got_temp = false; + if (!got_preset) { + no_wait_for_cooling = parser.seenval('S'); + got_temp = no_wait_for_cooling || parser.seenval('R'); + if (got_temp) temp = int16_t(parser.value_celsius()); } - else return; + + if (!got_preset && !got_temp) return; + + thermalManager.setTargetBed(temp); + + TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false)); ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING)); From 17793898e214db271f668f40553db5169f9fb2ca Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:51:08 -0500 Subject: [PATCH 09/55] Update comments, preset --- Marlin/src/gcode/temp/M104_M109.cpp | 11 +++++++---- Marlin/src/gcode/temp/M106_M107.cpp | 1 + Marlin/src/gcode/temp/M140_M190.cpp | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index 9d43e3971899..0e7801e5e1df 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -53,6 +53,7 @@ * M104: Set Hotend Temperature target and return immediately * * Parameters: + * I : Material Preset index (if material presets are defined) * T : Tool index. If omitted, applies to the active tool * S : The target temperature in current units */ @@ -69,15 +70,15 @@ void GcodeSuite::M104() { int16_t temp = 0; - // Accept 'P' if there are temperature presets are defined + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('P'); + const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; #else constexpr bool got_preset = false; #endif - // If no 'P' get the temperature from 'S' + // If no 'I' get the temperature from 'S' const bool got_temp = !got_preset && parser.seenval('S'); if (got_temp) temp = parser.value_celsius(); @@ -111,6 +112,7 @@ void GcodeSuite::M104() { * M109: Set Hotend Temperature target and wait * * Parameters + * I : Material Preset index (if material presets are defined) * T : Tool index. If omitted, applies to the active tool * S : The target temperature in current units. Wait for heating only. * R : The target temperature in current units. Wait for heating and cooling. @@ -140,8 +142,9 @@ void GcodeSuite::M109() { int16_t temp = 0; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('P'); + const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; #else constexpr bool got_preset = false; diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index e5f3bd55e305..5e72e87b2a1b 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -64,6 +64,7 @@ void GcodeSuite::M106() { uint16_t speed = dspeed; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed; diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 725a238087bb..a36be359bc22 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -56,7 +56,7 @@ void GcodeSuite::M140() { int16_t temp = 0; - // Accept 'P' if there are temperature presets are defined + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; @@ -64,7 +64,7 @@ void GcodeSuite::M140() { constexpr bool got_preset = false; #endif - // If no 'P' get the temperature from 'S' + // If no 'I' get the temperature from 'S' const bool got_temp = !got_preset && parser.seenval('S'); if (got_temp) temp = parser.value_celsius(); @@ -102,6 +102,7 @@ void GcodeSuite::M190() { int16_t temp = 0; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; From 3771f407e946505060e06c4a15d98e9b9578d700 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:55:36 -0500 Subject: [PATCH 10/55] Use indexed presets --- Marlin/src/lcd/menu/menu_ubl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 25c7fc806d03..18c545f2b36b 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -335,19 +335,19 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ - "M190 S" STRINGIFY(PREHEAT_##p##_TEMP_BED) "\n" \ - "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ - "G29 P1\n" \ + "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ + "G29 P1\n" \ "M104 S0\n" \ "M140 S0" \ )) #else #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ "G28\n" \ - "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ - "G29 P1\n" \ + "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ + "G29 P1\n" \ "M104 S0" \ )) #endif From 234f60f2bb9d0169833e76e01a7b1132cc3b50d9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:58:17 -0500 Subject: [PATCH 11/55] Update language_zh_TW.h --- Marlin/src/lcd/language/language_zh_TW.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 5d931a14e39f..a41bf85e938a 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -72,7 +72,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" @@ -81,7 +81,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" @@ -90,7 +90,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" @@ -99,7 +99,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" @@ -108,7 +108,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" From 6ee8c31362d03a093ab49497795e527c6cfda134 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:59:54 -0500 Subject: [PATCH 12/55] Update language_test.h --- Marlin/src/lcd/language/language_test.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h index 680041ba1746..147379f5bd48 100644 --- a/Marlin/src/lcd/language/language_test.h +++ b/Marlin/src/lcd/language/language_test.h @@ -138,12 +138,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_C2_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_C2_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_C2_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_C3_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_C3_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_C3_b; @@ -179,12 +175,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_D0_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_D0_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_D0_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_D1_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_D1_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_D1_b; @@ -219,12 +211,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_E382_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_E382_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_E382_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_E383_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_E383_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_E383_b; From 0a9fd172a75cad55f9754d315eed4cf12e4e8c82 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 19:39:31 -0500 Subject: [PATCH 13/55] Add ultralcd include --- Marlin/src/gcode/temp/M106_M107.cpp | 4 ++++ Marlin/src/lcd/menu/menu_ubl.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index 5e72e87b2a1b..ffc00eafa32a 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -28,6 +28,10 @@ #include "../../module/motion.h" #include "../../module/temperature.h" +#if PREHEAT_COUNT + #include "../../lcd/ultralcd.h" +#endif + #if ENABLED(SINGLENOZZLE) #define _ALT_P active_extruder #define _CNT_P EXTRUDERS diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 18c545f2b36b..c4b629a872e6 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -335,16 +335,16 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ "G29 P1\n" \ "M104 S0\n" \ "M140 S0" \ )) #else - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ "G28\n" \ "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ "G29 P1\n" \ From 1e56659f807a19ee1ba9c2c2143e433962b58d8e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:29:44 -0500 Subject: [PATCH 14/55] Add G26 I for material preset --- Marlin/src/gcode/bedlevel/G26.cpp | 57 +++++++++++++++++++++++++------ Marlin/src/lcd/menu/menu_ubl.cpp | 12 +++---- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 4e2e94a7144a..98387976eb65 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -47,6 +47,8 @@ * * H # Hotend Set the Nozzle Temperature. If not specified, a default of 205 C. will be assumed. * + * I # Preset Heat the Nozzle and Bed based on a Material Preset (if material presets are defined). + * * F # Filament Used to specify the diameter of the filament being used. If not specified * 1.75mm filament is assumed. If you are not getting acceptable results by using the * 'correct' numbers, you can scale this number up or down a little bit to change the amount @@ -140,7 +142,7 @@ constexpr float g26_e_axis_feedrate = 0.025; static MeshFlags circle_flags, horizontal_mesh_line_flags, vertical_mesh_line_flags; -float random_deviation = 0.0; +float g26_random_deviation = 0.0; static bool g26_retracted = false; // Track the retracted state of the nozzle so mismatched // retracts/recovers won't result in a bad state. @@ -193,7 +195,7 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) { f += (g26_xy_pos - m).magnitude() / 15.0f; // Add the specified amount of Random Noise to our search - if (random_deviation > 1.0) f += random(0.0, random_deviation); + if (g26_random_deviation > 1.0) f += random(0.0, g26_random_deviation); if (f < closest) { closest = f; // Found a closer un-printed location @@ -508,15 +510,35 @@ void GcodeSuite::G26() { bool g26_continue_with_closest = parser.boolval('C'), g26_keep_heaters_on = parser.boolval('K'); + // Accept 'I' if temperature presets are defined + const uint8_t preset_index = (0 + #if PREHEAT_COUNT + + (parser.seenval('I') ? _MIN(parser.value_byte(), PREHEAT_COUNT - 1) + 1 : 0) + #endif + ); + #if HAS_HEATED_BED - if (parser.seenval('B')) { - g26_bed_temp = parser.value_celsius(); - if (g26_bed_temp && !WITHIN(g26_bed_temp, 40, BED_MAX_TARGET)) { + + // Get a temperature from 'I' or 'B' + int16_t bedtemp = 0; + + // Use the 'I' index if temperature presets are defined + #if PREHEAT_COUNT + if (preset_index) bedtemp = ui.material_preset[preset_index - 1].bed_temp; + #endif + + // Look for 'B' Bed Temperature + if (parser.seenval('B')) bedtemp = parser.value_celsius(); + + if (bedtemp) { + if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) { SERIAL_ECHOLNPAIR("?Specified bed temperature not plausible (40-", int(BED_MAX_TARGET), "C)."); return; } + g26_bed_temp = bedtemp; } - #endif + + #endif // HAS_HEATED_BED if (parser.seenval('L')) { g26_layer_height = parser.value_linear_units(); @@ -580,20 +602,34 @@ void GcodeSuite::G26() { g26_extrusion_multiplier *= g26_filament_diameter * sq(g26_nozzle) / sq(0.3); // Scale up by nozzle size - if (parser.seenval('H')) { - g26_hotend_temp = parser.value_celsius(); - if (!WITHIN(g26_hotend_temp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) { + // Get a temperature from 'I' or 'H' + int16_t noztemp = 0; + + // Accept 'I' if temperature presets are defined + #if PREHEAT_COUNT + if (preset_index) noztemp = ui.material_preset[preset_index - 1].hotend_temp; + #endif + + // Look for 'H' Hotend Temperature + if (parser.seenval('H')) noztemp = parser.value_celsius(); + + // If any preset or temperature was specified + if (noztemp) { + if (!WITHIN(noztemp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) { SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible."); return; } + g26_hotend_temp = noztemp } + // 'U' to Randomize and optionally set circle deviation if (parser.seen('U')) { randomSeed(millis()); // This setting will persist for the next G26 - random_deviation = parser.has_value() ? parser.value_float() : 50.0; + g26_random_deviation = parser.has_value() ? parser.value_float() : 50.0; } + // Get repeat from 'R', otherwise do one full circuit int16_t g26_repeats; #if HAS_LCD_MENU g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1); @@ -610,6 +646,7 @@ void GcodeSuite::G26() { return; } + // Set a position with 'X' and/or 'Y'. Default: current_position g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x, parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y); if (!position_is_reachable(g26_xy_pos)) { diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index c4b629a872e6..9b135abdceaf 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -215,15 +215,11 @@ void _lcd_ubl_edit_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ - "G28\n" \ - "G26 C B" STRINGIFY(PREHEAT_##p##_TEMP_BED) " H" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) " P" \ - )) + #define VALIDATE_MESH_GCODE_ITEM(M) \ + GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P I" STRINGIFY(DECREMENT(M)))) #else - #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ - "G28\n" \ - "G26 C B0 H" STRINGIFY(PREHEAT_##p#_TEMP_HOTEND) " P" \ - )) + #define VALIDATE_MESH_GCODE_ITEM(M) \ + GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P B0 I" STRINGIFY(DECREMENT(M)))) #endif VALIDATE_MESH_GCODE_ITEM(1); From 2f23a6f157a9bcb99923dc276650cd1454b3f94b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:55:23 -0500 Subject: [PATCH 15/55] Fewer boolies --- Marlin/src/gcode/temp/M104_M109.cpp | 36 +++++++++++++++++------------ Marlin/src/gcode/temp/M140_M190.cpp | 31 ++++++++++++++----------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index 0e7801e5e1df..f8eca4bc028f 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -68,21 +68,25 @@ void GcodeSuite::M104() { if (target_extruder < 0) return; #endif + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp; + } #endif // If no 'I' get the temperature from 'S' - const bool got_temp = !got_preset && parser.seenval('S'); - if (got_temp) temp = parser.value_celsius(); + if (!got_temp) { + got_temp = parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + } - if (got_preset || got_temp) { + if (got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -140,25 +144,27 @@ void GcodeSuite::M109() { if (target_extruder < 0) return; #endif + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp; + } #endif // Get the temperature from 'S' or 'R' - bool no_wait_for_cooling = false, got_temp = false; - if (!got_preset) { + bool no_wait_for_cooling = false; + if (!got_temp) { no_wait_for_cooling = parser.seenval('S'); got_temp = no_wait_for_cooling || parser.seenval('R'); if (got_temp) temp = int16_t(parser.value_celsius()); } - if (got_preset || got_temp) { + if (got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -187,7 +193,7 @@ void GcodeSuite::M109() { TERN_(AUTOTEMP, planner.autotemp_M104_M109()); - if (got_preset || got_temp) + if (got_temp) (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling); } diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index a36be359bc22..955b1cf0df55 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -54,21 +54,22 @@ void GcodeSuite::M140() { if (DEBUGGING(DRYRUN)) return; + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; #endif // If no 'I' get the temperature from 'S' - const bool got_temp = !got_preset && parser.seenval('S'); - if (got_temp) temp = parser.value_celsius(); + if (!got_temp) { + got_temp = parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + } - if (got_preset || got_temp) { + if (got_temp) { thermalManager.setTargetBed(temp); #if ENABLED(PRINTJOB_TIMER_AUTOSTART) @@ -100,25 +101,27 @@ void GcodeSuite::M140() { void GcodeSuite::M190() { if (DEBUGGING(DRYRUN)) return; + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp; + } #endif // Get the temperature from 'S' or 'R' - bool no_wait_for_cooling = false, got_temp = false; - if (!got_preset) { + bool no_wait_for_cooling = false; + if (!got_temp) { no_wait_for_cooling = parser.seenval('S'); got_temp = no_wait_for_cooling || parser.seenval('R'); if (got_temp) temp = int16_t(parser.value_celsius()); } - if (!got_preset && !got_temp) return; + if (!got_temp) return; thermalManager.setTargetBed(temp); From d630405c350c40ff5f9dd286dc09109002be7ad5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:59:14 -0500 Subject: [PATCH 16/55] Fix a typo --- Marlin/src/gcode/bedlevel/G26.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 98387976eb65..516f5792f70e 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -619,7 +619,7 @@ void GcodeSuite::G26() { SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible."); return; } - g26_hotend_temp = noztemp + g26_hotend_temp = noztemp; } // 'U' to Randomize and optionally set circle deviation From 0e1d31e78f34cb67cf80ec0def979ee494595bcd Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Sat, 4 Jul 2020 11:23:22 +0200 Subject: [PATCH 17/55] Uniform define argument --- Marlin/src/lcd/menu/menu_ubl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 9b135abdceaf..43718ab85e47 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -340,9 +340,9 @@ void _lcd_ubl_build_mesh() { "M140 S0" \ )) #else - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ - "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ "G29 P1\n" \ "M104 S0" \ )) From f30dc319fe1cbfcb25bb7b59adcb175da772c5c8 Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Sat, 4 Jul 2020 11:24:33 +0200 Subject: [PATCH 18/55] enforce base 0 argument --- Marlin/src/lcd/menu/menu_temperature.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index 9bcc3264aae7..90a3ad240201 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -305,15 +305,15 @@ void menu_temperature() { #endif #endif #else - ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); }); + ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(1-1, 0); }); #if PREHEAT_COUNT >= 2 - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); + ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(2-1, 0); }); #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(3-1, 0); }); #if PREHEAT_COUNT >= 4 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); + ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(4-1, 0); }); #if PREHEAT_COUNT >= 5 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(5-1, 0); }); #endif #endif #endif From c6f843f07d74606988fa26476b347930df5c701b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 6 Jul 2020 16:42:08 -0500 Subject: [PATCH 19/55] Update M140_M190.cpp --- Marlin/src/gcode/temp/M140_M190.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 955b1cf0df55..4af09bdfe038 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -60,7 +60,10 @@ void GcodeSuite::M140() { // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT got_temp = parser.seenval('I'); - if (got_temp) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp; + } #endif // If no 'I' get the temperature from 'S' From 07295ac5a9238f6ce8c07d6011ba72ee130c3732 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 7 Jul 2020 18:00:12 -0500 Subject: [PATCH 20/55] String list substitution --- Marlin/src/inc/Conditionals_post.h | 4 +- Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 14 +- Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 16 +- Marlin/src/lcd/language/language_an.h | 46 +---- Marlin/src/lcd/language/language_bg.h | 46 +---- Marlin/src/lcd/language/language_ca.h | 46 +---- Marlin/src/lcd/language/language_cz.h | 78 ++------ Marlin/src/lcd/language/language_da.h | 46 +---- Marlin/src/lcd/language/language_de.h | 78 ++------ Marlin/src/lcd/language/language_el.h | 46 +---- Marlin/src/lcd/language/language_el_gr.h | 46 +---- Marlin/src/lcd/language/language_en.h | 78 ++------ Marlin/src/lcd/language/language_es.h | 92 ++-------- Marlin/src/lcd/language/language_eu.h | 78 ++------ Marlin/src/lcd/language/language_fi.h | 46 +---- Marlin/src/lcd/language/language_fr.h | 78 ++------ Marlin/src/lcd/language/language_gl.h | 78 ++------ Marlin/src/lcd/language/language_hr.h | 46 +---- Marlin/src/lcd/language/language_hu.h | 78 ++------ Marlin/src/lcd/language/language_it.h | 78 ++------ Marlin/src/lcd/language/language_jp_kana.h | 46 +---- Marlin/src/lcd/language/language_ko_KR.h | 39 ++-- Marlin/src/lcd/language/language_nl.h | 46 +---- Marlin/src/lcd/language/language_pl.h | 78 ++------ Marlin/src/lcd/language/language_pt.h | 46 +---- Marlin/src/lcd/language/language_pt_br.h | 78 ++------ Marlin/src/lcd/language/language_ro.h | 78 ++------ Marlin/src/lcd/language/language_ru.h | 94 ++-------- Marlin/src/lcd/language/language_sk.h | 78 ++------ Marlin/src/lcd/language/language_tr.h | 78 ++------ Marlin/src/lcd/language/language_uk.h | 78 ++------ Marlin/src/lcd/language/language_vi.h | 78 ++------ Marlin/src/lcd/language/language_zh_CN.h | 78 ++------ Marlin/src/lcd/language/language_zh_TW.h | 78 ++------ Marlin/src/lcd/lcdprint.cpp | 5 +- Marlin/src/lcd/lcdprint.h | 6 +- Marlin/src/lcd/menu/menu.cpp | 1 + Marlin/src/lcd/menu/menu.h | 187 ++++++++++++-------- Marlin/src/lcd/menu/menu_configuration.cpp | 32 +--- Marlin/src/lcd/menu/menu_filament.cpp | 23 ++- Marlin/src/lcd/menu/menu_temperature.cpp | 142 +++++---------- Marlin/src/lcd/menu/menu_ubl.cpp | 67 ++++--- Marlin/src/lcd/ultralcd.cpp | 31 +++- Marlin/src/lcd/ultralcd.h | 1 + platformio.ini | 1 + 45 files changed, 616 insertions(+), 1971 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 3dd5894ee9f6..769853f4865c 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2101,11 +2101,9 @@ #define PREHEAT_COUNT 3 #elif defined(PREHEAT_2_LABEL) #define PREHEAT_COUNT 2 - #else + #elif defined(PREHEAT_1_LABEL) #define PREHEAT_COUNT 1 #endif -#else - #undef PREHEAT_COUNT #endif /** diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp index 21e8130850ca..5b1de8008aab 100644 --- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp +++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp @@ -1004,7 +1004,7 @@ void MarlinUI::draw_status_screen() { int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2; while (--pad >= 0) { lcd_put_wchar(' '); n--; } } - n = lcd_put_u8str_ind_P(pstr, itemIndex, n); + n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n); if (valstr) n -= lcd_put_u8str_max(valstr, n); for (; n > 0; --n) lcd_put_wchar(' '); } @@ -1012,20 +1012,20 @@ void MarlinUI::draw_status_screen() { // Draw a generic menu item with pre_char (if selected) and post_char void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) { lcd_put_wchar(0, row, sel ? pre_char : ' '); - uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2); + uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2); for (; n; --n) lcd_put_wchar(' '); lcd_put_wchar(post_char); } // Draw a menu item with a (potentially) editable value - void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) { - const uint8_t vlen = data ? (pgm ? utf8_strlen_P(data) : utf8_strlen(data)) : 0; + void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) { + const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0; lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' '); - uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vlen); + uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen); if (vlen) { lcd_put_wchar(':'); for (; n; --n) lcd_put_wchar(' '); - if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str(data); + if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr); } } @@ -1033,7 +1033,7 @@ void MarlinUI::draw_status_screen() { void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) { ui.encoder_direction_normal(); - uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, LCD_WIDTH - 1); + uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, itemString, LCD_WIDTH - 1); if (value != nullptr) { lcd_put_wchar(':'); int len = utf8_strlen(value); diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp index e0b704e71219..dfcd090d4302 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp @@ -359,7 +359,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop n -= MENU_FONT_WIDTH; } - n = lcd_put_u8str_ind_P(pstr, itemIndex, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH); + n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH); if (valstr) n -= lcd_put_u8str_max(valstr, n); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); } @@ -368,7 +368,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop // Draw a generic menu item void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) { if (mark_as_selected(row, sel)) { - pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 1) * (MENU_FONT_WIDTH); + pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char); lcd_put_wchar(' '); @@ -376,17 +376,17 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop } // Draw a menu item with an editable value - void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) { + void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) { if (mark_as_selected(row, sel)) { - const uint8_t vallen = (pgm ? utf8_strlen_P(data) : utf8_strlen((char*)data)), - pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), data) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)data)); + const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)), + pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr)); - pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH); + pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH); if (vallen) { lcd_put_wchar(':'); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2); - if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str((char*)data); + if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str((char*)inStr); } } } @@ -423,7 +423,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop // Assume the label is alpha-numeric (with a descender) bool onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline + EDIT_FONT_DESCENT); - if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex); + if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex, itemString); // If a value is included, print a colon, then print the value right-justified if (value != nullptr) { diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index c1f1d2a13cd9..6b119549a5cc 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -56,7 +56,7 @@ namespace Language_an { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); @@ -64,42 +64,14 @@ namespace Language_an { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precalentar $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precalentar $ Base"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precalentar $ Conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 6fa2d231ab21..e7c497e7eb3c 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -46,7 +46,7 @@ namespace Language_bg { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Паркиране"); PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); @@ -54,42 +54,14 @@ namespace Language_bg { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Подгряване $ Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Подгр. $ Всички"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Подгр. $ Легло"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Настройки $"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index f35aff5f42a8..b98c46623339 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -54,7 +54,7 @@ namespace Language_ca { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); @@ -62,42 +62,14 @@ namespace Language_ca { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preescalfa $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preescalfa $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preescalfa $ Llit"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preescalfa $ Conf."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 4f00f9aeecd0..48a7020a49e3 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -79,7 +79,7 @@ namespace Language_cz { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); @@ -87,42 +87,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahřát $ end ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahřát $ vše"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahřát $ podlož"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahřát $ nast"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); @@ -187,40 +159,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 zařívání trysky"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index f4568dc8128a..151583161f8c 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -49,7 +49,7 @@ namespace Language_da { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") @@ -57,42 +57,14 @@ namespace Language_da { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Forvarm $ end ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Forvarm $ Alle"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Forvarm $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Forvarm $ conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 48bb72ef2faa..4617bf7f00d4 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -64,7 +64,7 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); @@ -72,42 +72,14 @@ namespace Language_de { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ Einstellungen"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); @@ -171,40 +143,14 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Düse aufheizen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 659d22ea4d34..eb288ba8ab4b 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -54,7 +54,7 @@ namespace Language_el { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); //SHORTEN PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); @@ -62,42 +62,14 @@ namespace Language_el { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H0 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H0 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H0 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Προθέρμανση $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Προθέρμανση $ όλα"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Προθέρμανση $ bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Προθέρμανση $ επιβεβαίωση"); //SHORTEN #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 3c1edcbba765..c79bca37d429 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -55,7 +55,7 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); @@ -63,42 +63,14 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Προθέρμανση $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Προθέρμανση $ όλα"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Προθέρμανση $ κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Προθέρμανση $ επιβεβαίωση"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 341a96a7209a..e8fa3f202b0b 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -74,7 +74,7 @@ namespace Language_en { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); @@ -82,42 +82,14 @@ namespace Language_en { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preheat $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preheat $ All"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preheat $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preheat $ Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); @@ -181,40 +153,12 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)"); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)"); PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 10efe6081623..e355c2777e6e 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -69,50 +69,22 @@ namespace Language_es { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); @@ -176,40 +148,14 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Mallado ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valid. Mall. ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Calent. Boquilla"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 9fd48c0f73b3..d72de0c1fa7c 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -58,7 +58,7 @@ namespace Language_eu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Etxe. offset eza."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); @@ -66,42 +66,14 @@ namespace Language_eu { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Berotu $ Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Berotu $ Guztia"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Berotu $ Ohea"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Berotu $ Ezarp."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); @@ -129,39 +101,13 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); - #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 4a8a0ef1168f..8166fa3136bd 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -45,7 +45,7 @@ namespace Language_fi { PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit"); PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); @@ -53,42 +53,14 @@ namespace Language_fi { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Esilä. $Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Esilä. $ Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Esilä. $ Alusta"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Esilämm. $ konf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 1fed3f96e445..c4c1f723516a 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -70,7 +70,7 @@ namespace Language_fr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); @@ -78,42 +78,14 @@ namespace Language_fr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Préch. $ buse ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Préch. $ Tout"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Préch. $ lit"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Régler préch. $"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); @@ -177,41 +149,15 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajuster haut. couche"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 6a0e96eef6d3..0159421d68d1 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -72,7 +72,7 @@ namespace Language_gl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Axustar Desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); @@ -80,42 +80,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preque. $ Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preque. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preque. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preque. $ conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); @@ -179,40 +151,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Malla ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validar Malla ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Quentando Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 885b7a36ee61..24a1f1dcc701 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -55,7 +55,7 @@ namespace Language_hr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Postavi home offsete"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); @@ -63,42 +63,14 @@ namespace Language_hr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Predgrij $ Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Predgrij $ Sve"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Predgrij $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Predgrij $ conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index a789575aabc2..24461bdfe2bc 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -74,7 +74,7 @@ namespace Language_hu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); @@ -82,42 +82,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Fütés $ Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Fütés $ Mind"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Fütés $ Ágy"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Fütés $ Beáll"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); @@ -181,40 +153,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló Kész"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Háló Építés ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Háló Elfogadás ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Fúvóka Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index ccc23a53a893..bdb56f2448e9 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -72,7 +72,7 @@ namespace Language_it { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); @@ -80,42 +80,14 @@ namespace Language_it { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preris.$ Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preris.$ Tutto"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preris.$ Piatto"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preris.$ conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); @@ -179,40 +151,14 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.Mesh fatta"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Priming manuale..."); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 0d953deac56d..2322651506ba 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -63,7 +63,7 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("キジュンオフセットセッテイ"); // "Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" @@ -71,42 +71,14 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ ヨネツセッテイ"); // " conf" #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 88700e862987..7627a7d15565 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -55,35 +55,16 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("누르면 시작합니다"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("예열하기 - ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("예열하기 - ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("예열하기 - ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("예열하기 - ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("예열하기 - ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("예열하기 - ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐 ~"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("예열하기 - $ 노즐 ~"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Custom 예열"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("식히기"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index a9aa1b40ea03..25499eec2146 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -55,7 +55,7 @@ namespace Language_nl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Zet home offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); @@ -63,42 +63,14 @@ namespace Language_nl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ verw. conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 23740a50846f..9383f405628f 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -70,7 +70,7 @@ namespace Language_pl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ust. poz. zer."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); @@ -78,42 +78,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Rozgrzej $ Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Rozgrzej $ wsz."); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Rozgrzej $ stół"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Rozgrzej $ ustaw."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); @@ -176,40 +148,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Buduj siatkę ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Sprawdzenie siatki ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Nagrzewanie dyszy"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 25d7aae1c10d..41bfdc741494 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -54,7 +54,7 @@ namespace Language_pt { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Definir desvio"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); @@ -62,42 +62,14 @@ namespace Language_pt { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Pre-aquecer $ Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq. $ Tudo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq. $ ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Definições $"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index fdd2a88052a3..1bde3dba7ead 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -69,7 +69,7 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Compensar origem"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; @@ -77,42 +77,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Extrusora $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq.Todo $"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq.Mesa $"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ajustar $"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); @@ -163,40 +135,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Aquecendo Ext."); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index e619ff61a601..2e790ce79794 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -70,7 +70,7 @@ namespace Language_ro { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); @@ -78,42 +78,14 @@ namespace Language_ro { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preincalzeste $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preincalzeste $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preincalzeste $ Capatul"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preincalzeste $ Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preincalzeste $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preincalzeste $ Patul"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preincalzeste $ Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); @@ -177,40 +149,14 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index ba777318d10c..44f334aae582 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -78,7 +78,7 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); @@ -86,42 +86,14 @@ namespace Language_ru { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Нагрев $ сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Нагрев $ всё"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Нагрев $ стол"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Нагрев $ правка"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); @@ -215,20 +187,8 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); @@ -239,37 +199,13 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Высота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить сетку"); #if LCD_WIDTH > 21 - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Проверить сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Проверить сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Проверить сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Проверить сетку $"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Проверить свою сетку"); #else - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Провер. сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Провер. сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Провер. сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Провер. сетку $"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Провер. свою сетку"); #endif diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index f812cc956a75..760dc817c7f3 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -74,7 +74,7 @@ namespace Language_sk { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); @@ -82,42 +82,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahriať $ hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahriať $ všetko"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahriať $ podlož"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahriať $ nast."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); @@ -181,40 +153,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 ohrev trysky"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 7eab16cf8ba7..6c4a0931d11b 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -75,7 +75,7 @@ namespace Language_tr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); @@ -83,42 +83,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Ön Isınma $ Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Ön Isınma $ Tüm"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Ön Isınma $ Tabla"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ön Isınma $ Ayarlar"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); @@ -181,40 +153,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Mesh Oluştur ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Doğrulama Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 3e846aeab8e1..eeb5c2eca22a 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -80,7 +80,7 @@ namespace Language_uk { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); @@ -88,42 +88,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Нагрів $ сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Нагрів $ все"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Нагрів $ стіл"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Нагрів $ налашт"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); @@ -216,40 +188,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Редагування сітки"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 нагрів сопла"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index fe8e3156ddee..7dbcf2e725fc 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -65,7 +65,7 @@ namespace Language_vi { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Đặt bù đắp nhà"); // Set home offsets PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); @@ -73,42 +73,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Làm nóng $ Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Làm nóng $ Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Làm nóng $ Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Làm nóng $ Cấu hình"); // conf #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown @@ -155,40 +127,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sửa xong lưới"); // Done Editing Mesh PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Xây dựng lưới ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Thẩm tra lưới ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index b1553b94586b..4652e608a672 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -69,7 +69,7 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("设置原点偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " @@ -77,42 +77,14 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -176,40 +148,14 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26加热喷嘴"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index a41bf85e938a..c5cdc58da7bf 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -68,7 +68,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("設置原點偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " @@ -76,42 +76,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("預熱 $ 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("預熱 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("預熱 $ 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("預熱 $ 設置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" @@ -174,40 +146,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成編輯網格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("創設 $ 網格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 網格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle" diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index d1c0c02cdb75..771bd86b9d3f 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -35,7 +35,7 @@ * lcd_put_u8str_ind_P * Print a string with an index substituted within it */ -lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen/*=LCD_WIDTH*/) { +lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) { uint8_t *p = (uint8_t*)pstr; lcd_uint_t n = maxlen; for (; n; n--) { @@ -57,6 +57,9 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uin if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n); break; } + else if (ch == '$') + n -= lcd_put_u8str_max_P(inStr, n); + lcd_put_wchar(ch); } return n; diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h index ba938b52d752..5dca046011b4 100644 --- a/Marlin/src/lcd/lcdprint.h +++ b/Marlin/src/lcd/lcdprint.h @@ -71,10 +71,10 @@ inline int lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P con return lcd_put_u8str_P(pstr); } -lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH); -inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH) { +lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH); +inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) { lcd_moveto(col, row); - return lcd_put_u8str_ind_P(pstr, ind, maxlen); + return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen); } inline int lcd_put_u8str(const char* str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); } diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp index 58a759655c5d..a3a542b348bc 100644 --- a/Marlin/src/lcd/menu/menu.cpp +++ b/Marlin/src/lcd/menu/menu.cpp @@ -62,6 +62,7 @@ menuPosition screen_history[6]; uint8_t screen_history_depth = 0; int8_t MenuItemBase::itemIndex; // Index number for draw and action +PGM_P MenuItemBase::itemString; // A PSTR for substitution chimera_t editable; // Value Editing // Menu Edit Items diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index 29b3272bf643..3daa52aae95c 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -63,12 +63,14 @@ typedef void (*selectFunc_t)(); class MenuItemBase { public: - // An index to interject in the item label and for - // use by the action + // Index to interject in the item label and/or for use by its action. static int8_t itemIndex; + // An optional pointer for use in display or by the action + static PGM_P itemString; + // Store the index of the item ahead of use by indexed items - FORCE_INLINE static void init(const int8_t ind) { itemIndex = ind; } + FORCE_INLINE static void init(const int8_t ind=0, PGM_P const pstr=nullptr) { itemIndex = ind; itemString = pstr; } // Draw an item either selected (pre_char) or not (space) with post_char static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char); @@ -221,7 +223,7 @@ class MenuEditItemBase : public MenuItemBase { public: // Implemented for HD44780 and DOGM // Draw the current item at specified row with edit data - static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm=false); + static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm=false); // Implemented for HD44780 and DOGM // This low-level method is good to draw from anywhere @@ -403,15 +405,15 @@ class MenuItem_bool : public MenuEditItemBase { */ #define _MENU_INNER_P(TYPE, USE_MULTIPLIER, PLABEL, V...) do { \ - PGM_P const plabel = PLABEL; \ - if (encoderLine == _thisItemNr && ui.use_click()) { \ - _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \ - MenuItem_##TYPE::action(plabel, ##V); \ - if (ui.screen_changed) return; \ - } \ - if (ui.should_draw()) \ - MenuItem_##TYPE::draw \ - (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \ + PGM_P const plabel = PLABEL; \ + if (encoderLine == _thisItemNr && ui.use_click()) { \ + _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \ + MenuItem_##TYPE::action(plabel, ##V); \ + if (ui.screen_changed) return; \ + } \ + if (ui.should_draw()) \ + MenuItem_##TYPE::draw \ + (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \ }while(0) #define _MENU_ITEM_P(TYPE, V...) do { \ @@ -421,11 +423,31 @@ class MenuItem_bool : public MenuEditItemBase { NEXT_ITEM(); \ }while(0) +// Indexed items set a global index value and optional data +#define _MENU_ITEM_N_S_P(TYPE, N, S, V...) do{ \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::init(N, S); \ + _MENU_INNER_P(TYPE, ##V); \ + } \ + NEXT_ITEM(); \ +}while(0) + // Indexed items set a global index value #define _MENU_ITEM_N_P(TYPE, N, V...) do{ \ _skipStatic = false; \ if (_menuLineNr == _thisItemNr) { \ - MenuItemBase::init(N); \ + MenuItemBase::itemIndex = N; \ + _MENU_INNER_P(TYPE, ##V); \ + } \ + NEXT_ITEM(); \ +}while(0) + +// Items with a unique string +#define _MENU_ITEM_S_P(TYPE, S, V...) do{ \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::itemString = S; \ _MENU_INNER_P(TYPE, ##V); \ } \ NEXT_ITEM(); \ @@ -457,72 +479,91 @@ class MenuItem_bool : public MenuEditItemBase { NEXT_ITEM(); \ }while(0) -#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P( GET_TEXT(LABEL), ##V) -#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) - -#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) -#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - -#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V) -#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) - -#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) - -#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION) -#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) - -#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION) -#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION) - -#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES) -#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES) - -#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES) -#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES) - -#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) -#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) - -#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) -#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) - -#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) -#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) -#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) -#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) -#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V) +#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) + +#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) +#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) + +#define MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, PLABEL, ##V) +#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, GET_TEXT(LABEL), ##V) +#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, 0, S, false, PLABEL, ##V) +#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V) +#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) + +#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) + +#define ACTION_ITEM_N_S_P(N, S, PLABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, PLABEL, ACTION) +#define ACTION_ITEM_N_S(N, S, LABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_S_P(S, PLABEL, ACTION) MENU_ITEM_S_P(function, S, PLABEL, ACTION) +#define ACTION_ITEM_S(S, LABEL, ACTION) MENU_ITEM_S_P(function, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION) +#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION) +#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) + +#define GCODES_ITEM_N_S_P(N, S, PLABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, PLABEL, GCODES) +#define GCODES_ITEM_N_S(N, S, LABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_S_P(S, PLABEL, GCODES) MENU_ITEM_S_P(gcode, S, PLABEL, GCODES) +#define GCODES_ITEM_S(S, LABEL, GCODES) GCODES_ITEM_S_P(S, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES) +#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES) +#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES) + +#define SUBMENU_N_S_P(N, S, PLABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST) +#define SUBMENU_N_S(N, S, LABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, GET_TEXT(LABEL), DEST) +#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) +#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) +#define SUBMENU_S_P(S, PLABEL, DEST) MENU_ITEM_S_P(submenu, S, PLABEL, DEST) +#define SUBMENU_S(S, LABEL, DEST) SUBMENU_S_P(S, GET_TEXT(LABEL), DEST) +#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) +#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) + +#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) +#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) + +#define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V) +#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) +#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) + +#define EDIT_ITEM_FAST_N_S_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N_S(TYPE, N, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) +#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) + +#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \ + if (encoderLine == _thisItemNr && ui.use_click()) { \ + ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \ + return; \ + } \ + if (ui.should_draw()) MenuItem_confirm::draw \ + (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \ +}while(0) -#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \ - if (encoderLine == _thisItemNr && ui.use_click()) { \ - ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \ - return; \ - } \ - if (ui.should_draw()) MenuItem_confirm::draw \ - (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \ +// Indexed items set a global index value and optional data +#define _CONFIRM_ITEM_P(PLABEL, V...) do { \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) \ + _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \ + NEXT_ITEM(); \ }while(0) -#define _CONFIRM_ITEM_P(PLABEL, V...) do { \ +// Indexed items set a global index value +#define _CONFIRM_ITEM_N_S_P(N, S, V...) do{ \ _skipStatic = false; \ - if (_menuLineNr == _thisItemNr) \ - _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::init(N, S); \ + _CONFIRM_ITEM_INNER_P(TYPE, ##V); \ + } \ NEXT_ITEM(); \ }while(0) // Indexed items set a global index value -#define _CONFIRM_ITEM_N_P(N, V...) do{ \ - _skipStatic = false; \ - if (_menuLineNr == _thisItemNr) { \ - MenuItemBase::init(N); \ - _CONFIRM_ITEM_INNER_P(TYPE, ##V); \ - } \ - NEXT_ITEM(); \ -}while(0) +#define _CONFIRM_ITEM_N_P(N, V...) _CONFIRM_ITEM_N_S_P(N, nullptr, V) #define CONFIRM_ITEM_P(PLABEL,A,B,V...) _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM(LABEL, V...) CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V) @@ -530,9 +571,11 @@ class MenuItem_bool : public MenuEditItemBase { #define YESNO_ITEM_P(PLABEL, V...) _CONFIRM_ITEM_P(PLABEL, ##V) #define YESNO_ITEM(LABEL, V...) YESNO_ITEM_P(GET_TEXT(LABEL), ##V) +#define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V) +#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, ##V) #define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V) #define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V) diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 78a91798a023..ae3de2a3071f 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -300,11 +300,12 @@ void menu_advanced_settings(); #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) - void _menu_configuration_preheat_settings(const uint8_t m) { + void _menu_configuration_preheat_settings() { #define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP, #define _MAXTEMP_ITEM(N) HEATER_##N##_MAXTEMP, #define MINTEMP_ALL _MIN(REPEAT(HOTENDS, _MINTEMP_ITEM) 999) #define MAXTEMP_ALL _MAX(REPEAT(HOTENDS, _MAXTEMP_ITEM) 0) + const uint8_t m = MenuItemBase::itemIndex; START_MENU(); BACK_ITEM(MSG_CONFIGURATION); editable.uint8 = uint8_t(ui.material_preset[m].fan_speed); @@ -321,20 +322,6 @@ void menu_advanced_settings(); END_MENU(); } - void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(1-1); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(2-1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3-1); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4-1); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5-1); } - #endif - #endif - #endif - #endif - #endif void menu_configuration() { @@ -414,19 +401,8 @@ void menu_configuration() { // Preheat configurations #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) - SUBMENU(MSG_PREHEAT_1_SETTINGS, menu_preheat_material1_settings); - #if PREHEAT_COUNT >= 2 - SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); - #endif - #endif - #endif - #endif + LOOP_L_N(m, PREHEAT_COUNT) + SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings); #endif #if ENABLED(EEPROM_SETTINGS) diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp index 1c7abba6d4ce..90639c3af521 100644 --- a/Marlin/src/lcd/menu/menu_filament.cpp +++ b/Marlin/src/lcd/menu/menu_filament.cpp @@ -55,13 +55,21 @@ inline PGM_P _change_filament_command() { } // Initiate Filament Load/Unload/Change at the specified temperature -static void _change_filament(const uint16_t celsius) { +static void _change_filament_with_temp(const uint16_t celsius) { char cmd[11]; sprintf_P(cmd, _change_filament_command(), _change_filament_extruder); thermalManager.setTargetHotend(celsius, _change_filament_extruder); queue.inject(cmd); } +static void _change_filament_with_preset() { + _change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp); +} + +static void _change_filament_with_custom() { + _change_filament_with_temp(thermalManager.temp_hotend[MenuItemBase::itemIndex].target); +} + // // Menu to choose the temperature and start Filament Change // @@ -81,11 +89,14 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) { START_MENU(); if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT); BACK_ITEM(MSG_BACK); - ACTION_ITEM(MSG_PREHEAT_1, []{ _change_filament(ui.material_preset[0].hotend_temp); }); - ACTION_ITEM(MSG_PREHEAT_2, []{ _change_filament(ui.material_preset[1].hotend_temp); }); - EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_extruder].target, EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, []{ - _change_filament(thermalManager.temp_hotend[_change_filament_extruder].target); - }); + #if PREHEAT_COUNT + LOOP_L_N(m, PREHEAT_COUNT) + ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset); + #endif + EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target, + EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, + _change_filament_with_custom + ); END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index 90a3ad240201..46f48e22fa52 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -82,81 +82,56 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i // Indexed "Preheat ABC" and "Heat Bed" items #define PREHEAT_ITEMS(M,E) do{ \ - ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_both(M, MenuItemBase::itemIndex); }); \ - ACTION_ITEM_N_P(E, msg_preheat_end_e[M], []{ _preheat_end(M, MenuItemBase::itemIndex); }); \ + ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_both(M, MenuItemBase::itemIndex); }); \ + ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_END_E, []{ _preheat_end(M, MenuItemBase::itemIndex); }); \ }while(0) #elif HAS_MULTI_HOTEND // No heated bed, so just indexed "Preheat ABC" items - #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_end(M, MenuItemBase::itemIndex); }) + #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_end(M, MenuItemBase::itemIndex); }) #endif - void menu_preheat_m(const uint8_t m) { + void do_preheat_end_m() { _preheat_end(editable.int8, 0); } - #if HOTENDS == 1 - PGM_P msg_preheat[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1), GET_TEXT(MSG_PREHEAT_2), GET_TEXT(MSG_PREHEAT_3), GET_TEXT(MSG_PREHEAT_4), GET_TEXT(MSG_PREHEAT_5)); - #if HAS_HEATED_BED - PGM_P msg_preheat_end[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END), GET_TEXT(MSG_PREHEAT_2_END), GET_TEXT(MSG_PREHEAT_3_END), GET_TEXT(MSG_PREHEAT_4_END), GET_TEXT(MSG_PREHEAT_5_END)); - #endif - #elif HAS_MULTI_HOTEND - PGM_P msg_preheat_all[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_ALL), GET_TEXT(MSG_PREHEAT_2_ALL), GET_TEXT(MSG_PREHEAT_3_ALL), GET_TEXT(MSG_PREHEAT_4_ALL), GET_TEXT(MSG_PREHEAT_5_ALL)); - #endif - - #if HAS_TEMP_HOTEND && HAS_HEATED_BED && HAS_MULTI_HOTEND - PGM_P msg_preheat_end_e[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END_E), GET_TEXT(MSG_PREHEAT_2_END_E), GET_TEXT(MSG_PREHEAT_3_END_E), GET_TEXT(MSG_PREHEAT_4_END_E), GET_TEXT(MSG_PREHEAT_5_END_E)); - #endif + #if HAS_MULTI_HOTEND || HAS_HEATED_BED - #if HAS_MULTI_HOTEND - PGM_P msg_preheat_h[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_H), GET_TEXT(MSG_PREHEAT_2_H), GET_TEXT(MSG_PREHEAT_3_H), GET_TEXT(MSG_PREHEAT_4_H), GET_TEXT(MSG_PREHEAT_5_H)); - #endif + // Set editable.int8 to the Material index before entering this menu + // because MenuItemBase::itemIndex will be re-used by PREHEAT_ITEMS + void menu_preheat_m() { + const uint8_t m = editable.int8; // Don't re-use 'editable' in this menu - MenuItemBase::itemIndex = m; + START_MENU(); + BACK_ITEM(MSG_TEMPERATURE); - START_MENU(); - BACK_ITEM(MSG_TEMPERATURE); + #if HOTENDS == 1 - #if HOTENDS == 1 + #if HAS_HEATED_BED + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, []{ _preheat_both(editable.int8, 0); }); + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_END, do_preheat_end_m); + #else + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m); + #endif - #if HAS_HEATED_BED - ACTION_ITEM_P(msg_preheat[m], []{ _preheat_both(MenuItemBase::itemIndex, 0); }); - ACTION_ITEM_P(msg_preheat_end[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); }); - #else - ACTION_ITEM_P(msg_preheat[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); }); - #endif + #elif HAS_MULTI_HOTEND - #elif HAS_MULTI_HOTEND + HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e); + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() { + TERN_(HAS_HEATED_BED, []{ _preheat_bed(editable.int8); }); + HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[editable.int8].hotend_temp, e); + }); - LOOP_S_L_N(n, 0, HOTENDS) PREHEAT_ITEMS(MenuItemBase::itemIndex, n); - ACTION_ITEM_P(msg_preheat_all[m], []() { - TERN_(HAS_HEATED_BED, _preheat_bed(MenuItemBase::itemIndex)); - HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[MenuItemBase::itemIndex].hotend_temp, e); - }); + #endif - #endif + #if HAS_HEATED_BED + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_BEDONLY, []{ _preheat_bed(editable.int8); }); + #endif - #if HAS_HEATED_BED - PGM_P msg_preheat_bed[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_BEDONLY), GET_TEXT(MSG_PREHEAT_2_BEDONLY), GET_TEXT(MSG_PREHEAT_3_BEDONLY), GET_TEXT(MSG_PREHEAT_4_BEDONLY), GET_TEXT(MSG_PREHEAT_5_BEDONLY)); - ACTION_ITEM_P(msg_preheat_bed[m], []{ _preheat_bed(MenuItemBase::itemIndex); }); - #endif + END_MENU(); + } - END_MENU(); - } - - void menu_preheat_m1() { menu_preheat_m(0); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_m2() { menu_preheat_m(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_m3() { menu_preheat_m(2); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_m4() { menu_preheat_m(3); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_m5() { menu_preheat_m(4); } - #endif - #endif - #endif - #endif + #endif // HAS_MULTI_HOTEND || HAS_HEATED_BED #endif // PREHEAT_COUNT @@ -171,9 +146,11 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i #endif // HAS_TEMP_HOTEND || HAS_HEATED_BED void menu_temperature() { - #if HAS_TEMP_HOTEND + #if HAS_TEMP_HOTEND || HAS_HEATED_BED bool has_heat = false; - HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; } + #if HAS_TEMP_HOTEND + HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; } + #endif #endif START_MENU(); @@ -285,48 +262,27 @@ void menu_temperature() { #endif // HAS_FAN - // - // Preheat for Materials 1 to 5 - // - #ifdef PREHEAT_COUNT - - #if HOTENDS > 1 || HAS_HEATED_BED - SUBMENU(MSG_PREHEAT_1, menu_preheat_m1); - #if PREHEAT_COUNT >= 2 - SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); - #endif - #endif - #endif - #endif - #else - ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(1-1, 0); }); - #if PREHEAT_COUNT >= 2 - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(2-1, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(3-1, 0); }); - #if PREHEAT_COUNT >= 4 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(4-1, 0); }); - #if PREHEAT_COUNT >= 5 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(5-1, 0); }); - #endif - #endif - #endif + #if PREHEAT_COUNT + // + // Preheat for Materials 1 to 5 + // + LOOP_L_N(m, PREHEAT_COUNT) { + editable.int8 = m; + #if HOTENDS > 1 || HAS_HEATED_BED + SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m); + #else + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m); #endif - #endif + } + #endif + #if HAS_TEMP_HOTEND || HAS_HEATED_BED // // Cooldown // if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true; if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown); - - #endif // PREHEAT_COUNT + #endif END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 43718ab85e47..8929933e61d6 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -216,21 +216,21 @@ void _lcd_ubl_edit_mesh() { #if PREHEAT_COUNT #if HAS_HEATED_BED #define VALIDATE_MESH_GCODE_ITEM(M) \ - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P I" STRINGIFY(DECREMENT(M)))) + GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P I" STRINGIFY(M))) #else #define VALIDATE_MESH_GCODE_ITEM(M) \ - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P B0 I" STRINGIFY(DECREMENT(M)))) + GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P B0 I" STRINGIFY(M))) #endif - VALIDATE_MESH_GCODE_ITEM(1); - #if PREHEAT_COUNT >= 2 - VALIDATE_MESH_GCODE_ITEM(2); - #if PREHEAT_COUNT >= 3 - VALIDATE_MESH_GCODE_ITEM(3); - #if PREHEAT_COUNT >= 4 - VALIDATE_MESH_GCODE_ITEM(4); - #if PREHEAT_COUNT >= 5 - VALIDATE_MESH_GCODE_ITEM(5); + VALIDATE_MESH_GCODE_ITEM(0); + #if PREHEAT_COUNT > 1 + VALIDATE_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT > 2 + VALIDATE_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT > 3 + VALIDATE_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT > 4 + VALIDATE_MESH_GCODE_ITEM(4); #endif #endif #endif @@ -331,37 +331,34 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ - "G28\n" \ - "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ - "G29 P1\n" \ - "M104 S0\n" \ - "M140 S0" \ - )) + #define PREHEAT_BED_GCODE(M) "M190 I" STRINGIFY(M) "\n" #else - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ - "G28\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ - "G29 P1\n" \ - "M104 S0" \ - )) + #define PREHEAT_BED_GCODE(M) "" #endif - - BUILD_MESH_GCODE_ITEM(1); - #if PREHEAT_COUNT >= 2 - BUILD_MESH_GCODE_ITEM(2); - #if PREHEAT_COUNT >= 3 - BUILD_MESH_GCODE_ITEM(3); - #if PREHEAT_COUNT >= 4 - BUILD_MESH_GCODE_ITEM(4); - #if PREHEAT_COUNT >= 5 - BUILD_MESH_GCODE_ITEM(5); + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_S(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \ + PSTR( \ + "G28\n" \ + PREHEAT_BED_GCODE(M) \ + "M109 I" STRINGIFY(M) "\n" \ + "G29 P1\n" \ + "M104 S0\n" \ + "M140 S0" \ + ) ) + BUILD_MESH_GCODE_ITEM(0); + #if PREHEAT_COUNT > 1 + BUILD_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT > 2 + BUILD_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT > 3 + BUILD_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT > 4 + BUILD_MESH_GCODE_ITEM(4); #endif #endif #endif #endif #endif // PREHEAT_COUNT + SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh); GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1")); SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin); diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 74924e1dd131..0eb9e04d96c7 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -86,10 +86,6 @@ MarlinUI ui; } #endif -#if PREHEAT_COUNT - preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load() -#endif - #if HAS_SPI_LCD #if HAS_GRAPHICAL_LCD @@ -153,6 +149,33 @@ millis_t MarlinUI::next_button_update_ms; // = 0 volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update #endif +#if PREHEAT_COUNT + preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load() + + PGM_P MarlinUI::get_preheat_label(const uint8_t m) { + #ifdef PREHEAT_1_LABEL + static PGMSTR(preheat_0_label, PREHEAT_1_LABEL); + #endif + #ifdef PREHEAT_2_LABEL + static PGMSTR(preheat_1_label, PREHEAT_2_LABEL); + #endif + #ifdef PREHEAT_3_LABEL + static PGMSTR(preheat_2_label, PREHEAT_3_LABEL); + #endif + #ifdef PREHEAT_4_LABEL + static PGMSTR(preheat_3_label, PREHEAT_4_LABEL); + #endif + #ifdef PREHEAT_5_LABEL + static PGMSTR(preheat_4_label, PREHEAT_5_LABEL); + #endif + + #define _PLBL(N) preheat_##N##_label, + static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = ARRAY_N(PREHEAT_COUNT, REPEAT(PREHEAT_COUNT, _PLBL)); + + return (PGM_P)pgm_read_ptr(&preheat_labels[m]); + } +#endif + #if ENABLED(SDSUPPORT) #include "../sd/cardreader.h" diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 7641643409e5..a8b24390f940 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -479,6 +479,7 @@ class MarlinUI { #if PREHEAT_COUNT static preheat_t material_preset[PREHEAT_COUNT]; + static PGM_P get_preheat_label(const uint8_t m); #endif #if HAS_LCD_MENU diff --git a/platformio.ini b/platformio.ini index 1f5385ca5149..5b4f0a5c5f6f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,6 +19,7 @@ src_dir = Marlin boards_dir = buildroot/share/PlatformIO/boards default_envs = mega2560 +include_dir = Marlin # # The 'common' values are used for most Marlin builds From 1936c7f7db0d8e146f2075c62ec5b395ddb1a666 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 10:53:03 +0200 Subject: [PATCH 21/55] Remove unused messages --- Marlin/src/inc/Conditionals_post.h | 2 +- Marlin/src/lcd/language/language_an.h | 8 ------- Marlin/src/lcd/language/language_bg.h | 8 ------- Marlin/src/lcd/language/language_ca.h | 8 ------- Marlin/src/lcd/language/language_cz.h | 12 ++-------- Marlin/src/lcd/language/language_da.h | 8 ------- Marlin/src/lcd/language/language_de.h | 14 +++--------- Marlin/src/lcd/language/language_el.h | 8 ------- Marlin/src/lcd/language/language_el_gr.h | 8 ------- Marlin/src/lcd/language/language_en.h | 8 ------- Marlin/src/lcd/language/language_es.h | 22 ++++++------------ Marlin/src/lcd/language/language_eu.h | 12 ++-------- Marlin/src/lcd/language/language_fi.h | 8 ------- Marlin/src/lcd/language/language_fr.h | 12 ++-------- Marlin/src/lcd/language/language_gl.h | 8 ------- Marlin/src/lcd/language/language_hr.h | 8 ------- Marlin/src/lcd/language/language_hu.h | 8 ------- Marlin/src/lcd/language/language_it.h | 12 ++-------- Marlin/src/lcd/language/language_jp_kana.h | 12 ++-------- Marlin/src/lcd/language/language_ko_KR.h | 5 ----- Marlin/src/lcd/language/language_nl.h | 8 ------- Marlin/src/lcd/language/language_pl.h | 8 ------- Marlin/src/lcd/language/language_pt.h | 8 ------- Marlin/src/lcd/language/language_pt_br.h | 12 ++-------- Marlin/src/lcd/language/language_ru.h | 10 +-------- Marlin/src/lcd/language/language_sk.h | 12 ++-------- Marlin/src/lcd/language/language_tr.h | 8 ------- Marlin/src/lcd/language/language_uk.h | 12 ++-------- Marlin/src/lcd/language/language_vi.h | 8 ------- Marlin/src/lcd/language/language_zh_CN.h | 26 ++++++++-------------- Marlin/src/lcd/language/language_zh_TW.h | 8 ------- 31 files changed, 37 insertions(+), 274 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 769853f4865c..8e48f054eac0 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2092,7 +2092,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 6b119549a5cc..ca5d214f1d63 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,14 +57,6 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index e7c497e7eb3c..f48281498554 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,14 +47,6 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index b98c46623339..8f610a44897b 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,14 +55,6 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 48a7020a49e3..1e42cdbb0d33 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,14 +80,6 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); @@ -160,8 +152,8 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 151583161f8c..c729851c6d38 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,14 +50,6 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 4617bf7f00d4..73ae847aa1e6 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,16 +65,8 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); @@ -144,8 +136,8 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index eb288ba8ab4b..30d3e94f8b95 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,14 +55,6 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index c79bca37d429..7b9782cc65c8 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,14 +56,6 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index e8fa3f202b0b..d80143e5a474 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,14 +75,6 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index e355c2777e6e..582ef41b440f 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,21 +70,13 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. $ Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index d72de0c1fa7c..d66e1b903e7f 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,14 +59,6 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); @@ -102,8 +94,8 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 8166fa3136bd..f5ca4c67f1c4 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,14 +46,6 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index c4c1f723516a..b76f45e6f020 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,14 +71,6 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); @@ -150,8 +142,8 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 0159421d68d1..3da9cfa28140 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,14 +73,6 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 24a1f1dcc701..edaf4fc2598b 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,14 +56,6 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 24461bdfe2bc..11d32308715e 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,14 +75,6 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index bdb56f2448e9..c742017bf716 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,14 +73,6 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); @@ -152,8 +144,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 2322651506ba..50a94366727b 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,16 +64,8 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_n_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_n_LABEL PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 7627a7d15565..e57c4c4acecb 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -56,11 +56,6 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 25499eec2146..3d6baf6c4085 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,14 +56,6 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 9383f405628f..1839db809946 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,14 +71,6 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 41bfdc741494..5ca9678671df 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,14 +55,6 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 1bde3dba7ead..65d2fe035677 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,14 +70,6 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); @@ -136,8 +128,8 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 44f334aae582..6b2c8328a350 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,14 +79,6 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); @@ -188,7 +180,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку ($)"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 760dc817c7f3..cf71638e2503 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,14 +75,6 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); @@ -154,8 +146,8 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 6c4a0931d11b..f93a877f40db 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,14 +76,6 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index eeb5c2eca22a..038344afc07a 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,14 +81,6 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); @@ -189,8 +181,8 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 7dbcf2e725fc..b111afceb326 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,14 +66,6 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 4652e608a672..a8ad8b159379 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,21 +70,13 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_n_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_n_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_n " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_n " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_n " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_n " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_n " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -149,8 +141,8 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_n_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_n_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index c5cdc58da7bf..6be085ede34a 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,14 +69,6 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " From 24060473388d28445c95c2c58afb03c4554429ab Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:49:07 +0200 Subject: [PATCH 22/55] Revert "Remove unused messages" This reverts commit 1936c7f7db0d8e146f2075c62ec5b395ddb1a666. --- Marlin/src/inc/Conditionals_post.h | 2 +- Marlin/src/lcd/language/language_an.h | 8 +++++++ Marlin/src/lcd/language/language_bg.h | 8 +++++++ Marlin/src/lcd/language/language_ca.h | 8 +++++++ Marlin/src/lcd/language/language_cz.h | 12 ++++++++-- Marlin/src/lcd/language/language_da.h | 8 +++++++ Marlin/src/lcd/language/language_de.h | 14 +++++++++--- Marlin/src/lcd/language/language_el.h | 8 +++++++ Marlin/src/lcd/language/language_el_gr.h | 8 +++++++ Marlin/src/lcd/language/language_en.h | 8 +++++++ Marlin/src/lcd/language/language_es.h | 22 ++++++++++++------ Marlin/src/lcd/language/language_eu.h | 12 ++++++++-- Marlin/src/lcd/language/language_fi.h | 8 +++++++ Marlin/src/lcd/language/language_fr.h | 12 ++++++++-- Marlin/src/lcd/language/language_gl.h | 8 +++++++ Marlin/src/lcd/language/language_hr.h | 8 +++++++ Marlin/src/lcd/language/language_hu.h | 8 +++++++ Marlin/src/lcd/language/language_it.h | 12 ++++++++-- Marlin/src/lcd/language/language_jp_kana.h | 12 ++++++++-- Marlin/src/lcd/language/language_ko_KR.h | 5 +++++ Marlin/src/lcd/language/language_nl.h | 8 +++++++ Marlin/src/lcd/language/language_pl.h | 8 +++++++ Marlin/src/lcd/language/language_pt.h | 8 +++++++ Marlin/src/lcd/language/language_pt_br.h | 12 ++++++++-- Marlin/src/lcd/language/language_ru.h | 10 ++++++++- Marlin/src/lcd/language/language_sk.h | 12 ++++++++-- Marlin/src/lcd/language/language_tr.h | 8 +++++++ Marlin/src/lcd/language/language_uk.h | 12 ++++++++-- Marlin/src/lcd/language/language_vi.h | 8 +++++++ Marlin/src/lcd/language/language_zh_CN.h | 26 ++++++++++++++-------- Marlin/src/lcd/language/language_zh_TW.h | 8 +++++++ 31 files changed, 274 insertions(+), 37 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 8e48f054eac0..769853f4865c 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2092,7 +2092,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index ca5d214f1d63..6b119549a5cc 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,6 +57,14 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index f48281498554..e7c497e7eb3c 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,6 +47,14 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 8f610a44897b..b98c46623339 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,6 +55,14 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 1e42cdbb0d33..48a7020a49e3 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,6 +80,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); @@ -152,8 +160,8 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index c729851c6d38..151583161f8c 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,6 +50,14 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 73ae847aa1e6..4617bf7f00d4 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,8 +65,16 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen ~"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); @@ -136,8 +144,8 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) Netz erstellen"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) Netz validieren"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 30d3e94f8b95..eb288ba8ab4b 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,6 +55,14 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 7b9782cc65c8..c79bca37d429 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,6 +56,14 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index d80143e5a474..e8fa3f202b0b 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,6 +75,14 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 582ef41b440f..e355c2777e6e 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,13 +70,21 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. $"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. $ ~"); - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Fusor"); - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. $ Todo"); - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. $ Cama"); - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. $ Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index d66e1b903e7f..d72de0c1fa7c 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,6 +59,14 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); @@ -94,8 +102,8 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) sarea sortu"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index f5ca4c67f1c4..8166fa3136bd 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,6 +46,14 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index b76f45e6f020..c4c1f723516a 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,6 +71,14 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); @@ -142,8 +150,8 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 3da9cfa28140..0159421d68d1 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,6 +73,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index edaf4fc2598b..24a1f1dcc701 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,6 +56,14 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 11d32308715e..24461bdfe2bc 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,6 +75,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index c742017bf716..bdb56f2448e9 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,6 +73,14 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); @@ -144,8 +152,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 50a94366727b..2322651506ba 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,8 +64,16 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_n_LABEL - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_n_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index e57c4c4acecb..7627a7d15565 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -56,6 +56,11 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 3d6baf6c4085..25499eec2146 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,6 +56,14 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 1839db809946..9383f405628f 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,6 +71,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 5ca9678671df..41bfdc741494 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,6 +55,14 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 65d2fe035677..1bde3dba7ead 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,6 +70,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); @@ -128,8 +136,8 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 6b2c8328a350..44f334aae582 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,6 +79,14 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); @@ -180,7 +188,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index cf71638e2503..760dc817c7f3 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,6 +75,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); @@ -146,8 +154,8 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index f93a877f40db..6c4a0931d11b 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,6 +76,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 038344afc07a..eeb5c2eca22a 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,6 +81,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); @@ -181,8 +189,8 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index b111afceb326..7dbcf2e725fc 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,6 +66,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index a8ad8b159379..4652e608a672 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,13 +70,21 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_n_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_n_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_n " " - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_n " " - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_n " All" - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_n " Bed" - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_n " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -141,8 +149,8 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_n_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_n_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 6be085ede34a..c5cdc58da7bf 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,6 +69,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " From edfc8218adb811d7e6cae9e383fd7b040475e6fb Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:50:24 +0200 Subject: [PATCH 23/55] Remove duplicated if test --- Marlin/src/inc/Conditionals_post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 769853f4865c..8e48f054eac0 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2092,7 +2092,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) From 4bbcb16b5a7c257ea4375abd874696cfd5924016 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:52:10 +0200 Subject: [PATCH 24/55] Update some languages --- Marlin/src/lcd/language/language_de.h | 2 +- Marlin/src/lcd/language/language_it.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 4617bf7f00d4..ee0462333dfe 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -66,7 +66,7 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~"); PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index bdb56f2448e9..15f6efb4d76d 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -152,8 +152,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); From aa20f99655cbe1aba4cf9fa23ce2a3e12eb5774f Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 1 Jul 2020 15:02:31 +0200 Subject: [PATCH 25/55] Allow from 0 to 5 preheats setup This will complete "more than 2" preheats integration Fix also #18450 --- Marlin/src/inc/Conditionals_LCD.h | 8 -- Marlin/src/inc/Conditionals_post.h | 14 ++- Marlin/src/lcd/language/language_an.h | 59 ++++++++--- Marlin/src/lcd/language/language_bg.h | 59 ++++++++--- Marlin/src/lcd/language/language_ca.h | 59 ++++++++--- Marlin/src/lcd/language/language_cz.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_da.h | 59 ++++++++--- Marlin/src/lcd/language/language_de.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_el.h | 59 ++++++++--- Marlin/src/lcd/language/language_el_gr.h | 59 ++++++++--- Marlin/src/lcd/language/language_en.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_es.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_eu.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_fi.h | 59 ++++++++--- Marlin/src/lcd/language/language_fr.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_gl.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_hr.h | 59 ++++++++--- Marlin/src/lcd/language/language_hu.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_it.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_jp_kana.h | 59 ++++++++--- Marlin/src/lcd/language/language_ko_KR.h | 38 +++++-- Marlin/src/lcd/language/language_nl.h | 59 ++++++++--- Marlin/src/lcd/language/language_pl.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_pt.h | 59 ++++++++--- Marlin/src/lcd/language/language_pt_br.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_ro.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_ru.h | 110 +++++++++++++++++---- Marlin/src/lcd/language/language_sk.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_test.h | 24 +++-- Marlin/src/lcd/language/language_tr.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_uk.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_vi.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_zh_CN.h | 93 +++++++++++++---- Marlin/src/lcd/language/language_zh_TW.h | 93 +++++++++++++---- Marlin/src/lcd/menu/menu_configuration.cpp | 32 +++--- Marlin/src/lcd/menu/menu_temperature.cpp | 78 ++++++++------- Marlin/src/lcd/menu/menu_ubl.cpp | 104 +++++++++++-------- 37 files changed, 2119 insertions(+), 612 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 877518c89764..10755c180ea0 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -589,14 +589,6 @@ #define NUM_SERVOS 0 #endif -#ifndef PREHEAT_1_LABEL - #define PREHEAT_1_LABEL "PLA" -#endif - -#ifndef PREHEAT_2_LABEL - #define PREHEAT_2_LABEL "ABS" -#endif - /** * Set a flag for a servo probe (or BLTouch) */ diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 04af5e40c94f..69be10b7c917 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2128,8 +2128,18 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) - #define PREHEAT_COUNT 2 +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) + #ifdef PREHEAT_5_LABEL + #define PREHEAT_COUNT 5 + #elif defined(PREHEAT_4_LABEL) + #define PREHEAT_COUNT 4 + #elif defined(PREHEAT_3_LABEL) + #define PREHEAT_COUNT 3 + #elif defined(PREHEAT_2_LABEL) + #define PREHEAT_COUNT 2 + #else + #define PREHEAT_COUNT 1 + #endif #else #undef PREHEAT_COUNT #endif diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 89c36f754ffb..f00b946873b9 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -56,20 +56,51 @@ namespace Language_an { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Amortar Fuent"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index aa7875e44bf9..99b344705ac7 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -46,20 +46,51 @@ namespace Language_bg { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Паркиране"); PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Изкл. захранване"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 93a0af243ec1..721b06fc7084 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -54,20 +54,51 @@ namespace Language_ca { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); PROGMEM Language_Str MSG_EXTRUDE = _UxGT("Extrudeix"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index a46b4affda8e..70d0b2b1dea7 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -79,20 +79,51 @@ namespace Language_cz { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Ovládání laseru"); @@ -156,14 +187,40 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 zařívání trysky"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index d8c63447d82d..a47668f104f9 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -49,20 +49,51 @@ namespace Language_da { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Slå strøm fra"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index f2cb0cf3f3e2..fc6fef8eaa82 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -64,20 +64,51 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenz"); @@ -140,14 +171,40 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Düse aufheizen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 17e4e819c12e..299d63494bc8 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -54,20 +54,51 @@ namespace Language_el { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); //SHORTEN PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H0 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H0 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H0 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Απενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index d107f42f7b73..13368f62876b 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -55,20 +55,51 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Απενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 788bc230bfb8..62e0bcb2db5a 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -74,20 +74,51 @@ namespace Language_en { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequency"); @@ -150,14 +181,40 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index e1d7562d000d..9641885a2b7d 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -69,20 +69,51 @@ namespace Language_es { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia"); @@ -145,14 +176,40 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Calent. Boquilla"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 428d282d38d3..25d88591a1a0 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -58,20 +58,51 @@ namespace Language_eu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Etxe. offset eza."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Energia itzali"); @@ -98,13 +129,39 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); + #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 59bdf8d6d6f6..923a430fedca 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -45,20 +45,51 @@ namespace Language_fi { PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit"); PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Virta pois"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index bb6c9269e2ca..98df1b64ac10 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -70,20 +70,51 @@ namespace Language_fr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Contrôle Laser"); @@ -146,15 +177,41 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajuster haut. couche"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 097efeb35ad1..59f05215f982 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -72,20 +72,51 @@ namespace Language_gl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Axustar Desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecuencia"); @@ -148,14 +179,40 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Quentando Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index e50d4b8d775f..e871593beb41 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -55,20 +55,51 @@ namespace Language_hr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Postavi home offsete"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Isključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 3d2101b824f7..f874bae1613c 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -74,20 +74,51 @@ namespace Language_hu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia"); @@ -150,14 +181,40 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló Kész"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Fúvóka Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 76e76355fda4..c58ed8f96b05 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -72,20 +72,51 @@ namespace Language_it { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frequenza"); @@ -148,14 +179,40 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.Mesh fatta"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Priming manuale..."); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 084d8b4831ee..b3ad2da36775 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -63,20 +63,51 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("キジュンオフセットセッテイ"); // "Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("デンゲン オフ"); // "Switch power off" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 8d022e99c0fe..88700e862987 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -55,14 +55,36 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("누르면 시작합니다"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("예열하기 - ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("예열하기 - ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("예열하기 - ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("예열하기 - ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐 ~"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("예열하기 - ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("예열하기 - ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐 ~"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Custom 예열"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("식히기"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("스위치 전원 켜기"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 9911f73eadf0..8ad1ac3e0745 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -55,20 +55,51 @@ namespace Language_nl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Zet home offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Stroom uit"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index b1da41bc6169..16879e43d8fc 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -70,20 +70,51 @@ namespace Language_pl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ust. poz. zer."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Sterowanie Lasera"); @@ -145,14 +176,40 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Nagrzewanie dyszy"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index bc7465716ce5..92d627b4cfd7 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -54,20 +54,51 @@ namespace Language_pt { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Definir desvio"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); PROGMEM Language_Str MSG_SWITCH_PS_OFF = _UxGT("Desligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index bf4b8343035f..de13ea6f7051 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -69,20 +69,51 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Compensar origem"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); @@ -132,14 +163,40 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Aquecendo Ext."); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index da9a159a3f87..19cf90a7f05f 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -70,20 +70,51 @@ namespace Language_ro { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frecventa"); @@ -146,14 +177,40 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 77e309fdaedd..1a4bddfb85bd 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -78,20 +78,51 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Частота"); @@ -184,8 +215,21 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); #else @@ -195,12 +239,38 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Высота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить сетку"); #if LCD_WIDTH > 21 - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Проверить сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Проверить сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Проверить сетку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Проверить свою сетку"); #else - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Провер. сетку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Провер. сетку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Провер. сетку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Провер. свою сетку"); #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрев стола"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 0a251f1548a5..e9e5f59ecc90 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -74,20 +74,51 @@ namespace Language_sk { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Frekvencia"); @@ -150,14 +181,40 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 ohrev trysky"); diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h index 147379f5bd48..680041ba1746 100644 --- a/Marlin/src/lcd/language/language_test.h +++ b/Marlin/src/lcd/language/language_test.h @@ -138,8 +138,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_C2_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_C2_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_C2_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_C3_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_C3_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_C3_b; @@ -175,8 +179,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_D0_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_D0_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_D0_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_D1_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_D1_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_D1_b; @@ -211,8 +219,12 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_E382_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_E382_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_E382_a; - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; + #endif PROGMEM Language_Str MSG_COOLDOWN = STRG_E383_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_E383_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_E383_b; diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 8776eee8f40a..6de4445b83e8 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -75,20 +75,51 @@ namespace Language_tr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); PROGMEM Language_Str MSG_LASER_MENU = _UxGT("Lazer Kontrolü"); @@ -150,14 +181,40 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 2751a640bbf7..d3a99568fb34 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -80,20 +80,51 @@ namespace Language_uk { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("Частота"); @@ -185,14 +216,40 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Редагування сітки"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 нагрів сопла"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 4450e9852023..286fb59f6e42 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -65,20 +65,51 @@ namespace Language_vi { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Đặt bù đắp nhà"); // Set home offsets PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Bật nguồn"); // Switch power on @@ -124,14 +155,40 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sửa xong lưới"); // Done Editing Mesh PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 7aaf57d3b579..b2b9175ccca0 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -69,20 +69,51 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("设置原点偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" PROGMEM Language_Str MSG_CUTTER_FREQUENCY = _UxGT("切割频率"); @@ -145,14 +176,40 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26加热喷嘴"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 793890e3001b..637febd7435b 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -68,20 +68,51 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("設置原點偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" PROGMEM Language_Str MSG_LASER_MENU = _UxGT("激光控制"); //"Laser Control" @@ -143,14 +174,40 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成編輯網格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + #ifdef PREHEAT_1_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" + #endif + #ifdef PREHEAT_2_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + #endif + #ifdef PREHEAT_3_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" + #endif + #ifdef PREHEAT_4_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" + #endif + #ifdef PREHEAT_5_LABEL + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" + #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle" diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 0bd1c1e65511..babc3522b40f 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -324,13 +324,15 @@ void menu_advanced_settings(); } void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(0); } - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(2); } + #if PREHEAT_COUNT >= 4 + void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(3); } + #if PREHEAT_COUNT >= 5 + void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(4); } + #endif #endif #endif #endif @@ -415,13 +417,15 @@ void menu_configuration() { // Preheat configurations #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) SUBMENU(MSG_PREHEAT_1_SETTINGS, menu_preheat_material1_settings); - SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); + #if PREHEAT_COUNT >= 2 + SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); + #if PREHEAT_COUNT >= 3 + SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); + #if PREHEAT_COUNT >= 4 + SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); + #if PREHEAT_COUNT >= 5 + SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); + #endif #endif #endif #endif diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index a94e79062793..9bcc3264aae7 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -66,17 +66,17 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i ui.return_to_status(); } -#if HAS_TEMP_HOTEND - inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); } +#if PREHEAT_COUNT + + #if HAS_TEMP_HOTEND + inline void _preheat_end(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, -1); } + #if HAS_HEATED_BED + inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); } + #endif + #endif #if HAS_HEATED_BED - inline void _preheat_both(const uint8_t m, const uint8_t e) { thermalManager.lcd_preheat(e, m, m); } + inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); } #endif -#endif -#if HAS_HEATED_BED - inline void _preheat_bed(const uint8_t m) { thermalManager.lcd_preheat(-1, -1, m); } -#endif - -#if HAS_TEMP_HOTEND || HAS_HEATED_BED #if HAS_TEMP_HOTEND && HAS_HEATED_BED @@ -145,17 +145,23 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i } void menu_preheat_m1() { menu_preheat_m(0); } - void menu_preheat_m2() { menu_preheat_m(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_m3() { menu_preheat_m(2); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_m4() { menu_preheat_m(3); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_m5() { menu_preheat_m(4); } + #if PREHEAT_COUNT >= 2 + void menu_preheat_m2() { menu_preheat_m(1); } + #if PREHEAT_COUNT >= 3 + void menu_preheat_m3() { menu_preheat_m(2); } + #if PREHEAT_COUNT >= 4 + void menu_preheat_m4() { menu_preheat_m(3); } + #if PREHEAT_COUNT >= 5 + void menu_preheat_m5() { menu_preheat_m(4); } + #endif #endif #endif #endif +#endif // PREHEAT_COUNT + +#if HAS_TEMP_HOTEND || HAS_HEATED_BED + void lcd_cooldown() { thermalManager.zero_fan_speeds(); thermalManager.disable_all_heaters(); @@ -279,32 +285,36 @@ void menu_temperature() { #endif // HAS_FAN - #if HAS_TEMP_HOTEND + // + // Preheat for Materials 1 to 5 + // + #ifdef PREHEAT_COUNT - // - // Preheat for Material 1 and 2 - // #if HOTENDS > 1 || HAS_HEATED_BED SUBMENU(MSG_PREHEAT_1, menu_preheat_m1); - SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); + #if PREHEAT_COUNT >= 2 + SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); + #if PREHEAT_COUNT >= 3 + SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); + #if PREHEAT_COUNT >= 4 + SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); + #if PREHEAT_COUNT >= 5 + SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); + #endif #endif #endif #endif #else ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); }); - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + #if PREHEAT_COUNT >= 2 + ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + #if PREHEAT_COUNT >= 4 + ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); + #if PREHEAT_COUNT >= 5 + ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + #endif #endif #endif #endif @@ -316,7 +326,7 @@ void menu_temperature() { if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true; if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown); - #endif // HAS_TEMP_HOTEND + #endif // PREHEAT_COUNT END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 3722b53cb9be..a7c30ea52bfb 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -196,21 +196,40 @@ void _lcd_ubl_edit_mesh() { * UBL Validate Mesh submenu * * << UBL Tools - * Mesh Validation with Material 1 - * Mesh Validation with Material 2 + * Mesh Validation with Material 1 up to 5 * Validate Custom Mesh * << Info Screen */ void _lcd_ubl_validate_mesh() { START_MENU(); BACK_ITEM(MSG_UBL_TOOLS); - #if HAS_HEATED_BED - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); - #else - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P")); - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P")); - #endif + #if PREHEAT_COUNT + #if HAS_HEATED_BED + #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ + "G28\n" \ + "G26 C B" STRINGIFY(PREHEAT_##p##_TEMP_BED) " H" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) " P" \ + )) + #else + #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ + "G28\n" \ + "G26 C B0 H" STRINGIFY(PREHEAT_##p#_TEMP_HOTEND) " P" \ + )) + #endif + + VALIDATE_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT >= 2 + VALIDATE_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT >= 3 + VALIDATE_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT >= 4 + VALIDATE_MESH_GCODE_ITEM(4); + #if PREHEAT_COUNT >= 5 + VALIDATE_MESH_GCODE_ITEM(5); + #endif + #endif + #endif + #endif + #endif // PREHEAT_COUNT ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh); ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status); END_MENU(); @@ -292,8 +311,7 @@ void _lcd_ubl_invalidate() { * UBL Build Mesh submenu * * << UBL Tools - * Build Mesh with Material 1 - * Build Mesh with Material 2 + * Build Mesh with Material 1 up to 5 * - Build Custom Mesh >> * Build Cold Mesh * - Fill-in Mesh >> @@ -305,37 +323,39 @@ void _lcd_ubl_invalidate() { void _lcd_ubl_build_mesh() { START_MENU(); BACK_ITEM(MSG_UBL_TOOLS); - #if HAS_HEATED_BED - GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR( - "G28\n" - "M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n" - "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0\n" - "M140 S0" - )); - GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR( - "G28\n" - "M190 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\n" - "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0\n" - "M140 S0" - )); - #else - GCODES_ITEM(MSG_UBL_BUILD_MESH_M1, PSTR( - "G28\n" - "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0" - )); - GCODES_ITEM(MSG_UBL_BUILD_MESH_M2, PSTR( - "G28\n" - "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n" - "G29 P1\n" - "M104 S0" - )); - #endif + #if PREHEAT_COUNT + #if HAS_HEATED_BED + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + "G28\n" \ + "M190 S" STRINGIFY(PREHEAT_##p##_TEMP_BED) "\n" \ + "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ + "G29 P1\n" \ + "M104 S0\n" \ + "M140 S0" \ + )) + #else + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + "G28\n" \ + "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ + "G29 P1\n" \ + "M104 S0" \ + )) + #endif + + BUILD_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT >= 2 + BUILD_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT >= 3 + BUILD_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT >= 4 + BUILD_MESH_GCODE_ITEM(4); + #if PREHEAT_COUNT >= 5 + BUILD_MESH_GCODE_ITEM(5); + #endif + #endif + #endif + #endif + #endif // PREHEAT_COUNT SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh); GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1")); SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin); From 39e868a1d071c94f792cb3e993fb2712de8b1e2d Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 1 Jul 2020 16:06:25 +0200 Subject: [PATCH 26/55] Fix Japanese typo --- Marlin/src/lcd/language/language_jp_kana.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index b3ad2da36775..ff53d986d082 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -81,7 +81,7 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif - #ifdef PREHEAT_2_LABEL + #ifdef PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" From 88948beea1b9291739987228459cc8e26d723d57 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:34:22 -0500 Subject: [PATCH 27/55] Update language_an.h --- Marlin/src/lcd/language/language_an.h | 70 +++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index f00b946873b9..17bd4d5a1133 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,49 +57,49 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); From 18c65d52fcbed958b5da632f27a4800f91c76b75 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:35:49 -0500 Subject: [PATCH 28/55] Update language_bg.h --- Marlin/src/lcd/language/language_bg.h | 70 +++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 99b344705ac7..6fa2d231ab21 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,49 +47,49 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); From 691c5e04b5bf008679efaa51e28a9499f659b5ae Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:41:54 -0500 Subject: [PATCH 29/55] Fix spacing with regex --- Marlin/src/lcd/language/language_ca.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_cz.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_da.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_de.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_el.h | 14 ++--- Marlin/src/lcd/language/language_el_gr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_en.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_es.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_eu.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_fi.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_fr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_gl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_hr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_hu.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_it.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_jp_kana.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_nl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pl.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pt.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_pt_br.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_ro.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_ru.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_sk.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_tr.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_uk.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_vi.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_zh_CN.h | 70 +++++++++++----------- Marlin/src/lcd/language/language_zh_TW.h | 70 +++++++++++----------- 28 files changed, 952 insertions(+), 952 deletions(-) diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 721b06fc7084..6ad1143a399e 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,49 +55,49 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 70d0b2b1dea7..c36a84da7ec0 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,49 +80,49 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index a47668f104f9..49921bd4a3aa 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,49 +50,49 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index fc6fef8eaa82..92a193b8cf39 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,49 +65,49 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 299d63494bc8..659d22ea4d34 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,13 +55,13 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN #endif #ifdef PREHEAT_2_LABEL PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 13368f62876b..3c1edcbba765 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,49 +56,49 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 62e0bcb2db5a..7755ebe9d74f 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,49 +75,49 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 9641885a2b7d..feb7b792d8c4 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,49 +70,49 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 25d88591a1a0..458af443cbb8 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,49 +59,49 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 923a430fedca..4a8a0ef1168f 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,49 +46,49 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 98df1b64ac10..80d6fb08fcdf 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,49 +71,49 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 59f05215f982..41666db756f5 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,49 +73,49 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index e871593beb41..885b7a36ee61 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,49 +56,49 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index f874bae1613c..8abbbec07009 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,49 +75,49 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index c58ed8f96b05..0d33bc157759 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,49 +73,49 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index ff53d986d082..4050d862c955 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,49 +64,49 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 8ad1ac3e0745..65aeef8833f7 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,49 +56,49 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 16879e43d8fc..405cde0b433e 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,49 +71,49 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 92d627b4cfd7..25d7aae1c10d 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,49 +55,49 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index de13ea6f7051..96d43f133f41 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,49 +70,49 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 19cf90a7f05f..352ad6e431c6 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -71,49 +71,49 @@ namespace Language_ro { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 1a4bddfb85bd..48f1e929d3af 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,49 +79,49 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index e9e5f59ecc90..aed713f13f2d 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,49 +75,49 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 6de4445b83e8..b2165eb7bc29 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,49 +76,49 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index d3a99568fb34..c9eaf04c3946 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,49 +81,49 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 286fb59f6e42..e84a09afb55f 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,49 +66,49 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index b2b9175ccca0..f5a1a9c3bb3a 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,49 +70,49 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 637febd7435b..653ec0df350b 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,49 +69,49 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" + PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" + PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" + PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" + PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" + PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" + PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" + PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" + PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" + PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" + PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" + PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" + PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" + PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" + PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" From 3e2177509985982ad91cbfdb1e252b391b62a88d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:44:26 -0500 Subject: [PATCH 30/55] And more strings --- Marlin/src/lcd/language/language_cz.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_de.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_en.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_es.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_eu.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_fr.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_gl.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_hu.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_it.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_pl.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_pt_br.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_ro.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_ru.h | 10 +++++----- Marlin/src/lcd/language/language_sk.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_tr.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_uk.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_vi.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_zh_CN.h | 20 ++++++++++---------- Marlin/src/lcd/language/language_zh_TW.h | 20 ++++++++++---------- 19 files changed, 185 insertions(+), 185 deletions(-) diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index c36a84da7ec0..110ab0a76dff 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -188,38 +188,38 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 92a193b8cf39..1ee12d89a0b7 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -172,38 +172,38 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 7755ebe9d74f..24bfa651c2d0 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -182,38 +182,38 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index feb7b792d8c4..3e0736790c48 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -177,38 +177,38 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 458af443cbb8..8f632d55a761 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -130,37 +130,37 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 80d6fb08fcdf..ca1fd112cd5c 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -178,19 +178,19 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); @@ -198,19 +198,19 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 41666db756f5..46608b69de93 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -180,38 +180,38 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 8abbbec07009..3980e80ea693 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -182,38 +182,38 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 0d33bc157759..a377051d83d5 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -180,38 +180,38 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 405cde0b433e..ef25128caf6c 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -177,38 +177,38 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 96d43f133f41..69e076f12876 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -164,38 +164,38 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 352ad6e431c6..eb184eea949b 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -178,38 +178,38 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 48f1e929d3af..75d5be91880d 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -216,19 +216,19 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index aed713f13f2d..d88c8e4541d7 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -182,38 +182,38 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index b2165eb7bc29..f4083ae128e6 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -182,38 +182,38 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index c9eaf04c3946..95f19746a58c 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -217,38 +217,38 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index e84a09afb55f..99988bf885fa 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -156,38 +156,38 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index f5a1a9c3bb3a..18797055dea9 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -177,38 +177,38 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 653ec0df350b..5df1c73870d8 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -175,38 +175,38 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" #endif #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" #endif #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" #endif #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" #endif #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" From 7ddb31053ccf3ac3908fd4a7d7361d161ac08d17 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:46:20 -0500 Subject: [PATCH 31/55] Simplify setting preset temps Add an I parameter to M104, M106, M109, M140, and M190 so temperatures can be set from presets. --- Marlin/src/gcode/temp/M104_M109.cpp | 67 ++++++++++++++++++++++++----- Marlin/src/gcode/temp/M106_M107.cpp | 27 +++++++++--- Marlin/src/gcode/temp/M140_M190.cpp | 63 ++++++++++++++++++++++----- 3 files changed, 129 insertions(+), 28 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index bb453412d7a6..9d43e3971899 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -50,7 +50,11 @@ #endif /** - * M104: Set hot end temperature + * M104: Set Hotend Temperature target and return immediately + * + * Parameters: + * T : Tool index. If omitted, applies to the active tool + * S : The target temperature in current units */ void GcodeSuite::M104() { @@ -63,8 +67,21 @@ void GcodeSuite::M104() { if (target_extruder < 0) return; #endif - if (parser.seenval('S')) { - const int16_t temp = parser.value_celsius(); + int16_t temp = 0; + + // Accept 'P' if there are temperature presets are defined + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('P'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; + #else + constexpr bool got_preset = false; + #endif + + // If no 'P' get the temperature from 'S' + const bool got_temp = !got_preset && parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + + if (got_preset || got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -91,10 +108,24 @@ void GcodeSuite::M104() { } /** - * M109: Sxxx Wait for hotend(s) to reach temperature. Waits only when heating. - * Rxxx Wait for hotend(s) to reach temperature. Waits when heating and cooling. + * M109: Set Hotend Temperature target and wait + * + * Parameters + * T : Tool index. If omitted, applies to the active tool + * S : The target temperature in current units. Wait for heating only. + * R : The target temperature in current units. Wait for heating and cooling. + * + * With AUTOTEMP... + * F : Autotemp Scaling Factor. Set non-zero to enable Auto-temp. + * S : Minimum temperature, in current units. + * B : Maximum temperature, in current units. * - * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating and stop it if turned off. + * Examples + * M109 S100 : Set target to 100°. Wait until the hotend is at or above 100°. + * M109 R150 : Set target to 150°. Wait until the hotend gets close to 150°. + * + * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer + * (used by printingIsActive, etc.) and turning off heaters will stop the timer. */ void GcodeSuite::M109() { @@ -107,10 +138,24 @@ void GcodeSuite::M109() { if (target_extruder < 0) return; #endif - const bool no_wait_for_cooling = parser.seenval('S'), - set_temp = no_wait_for_cooling || parser.seenval('R'); - if (set_temp) { - const int16_t temp = parser.value_celsius(); + int16_t temp = 0; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('P'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; + #else + constexpr bool got_preset = false; + #endif + + // Get the temperature from 'S' or 'R' + bool no_wait_for_cooling = false, got_temp = false; + if (!got_preset) { + no_wait_for_cooling = parser.seenval('S'); + got_temp = no_wait_for_cooling || parser.seenval('R'); + if (got_temp) temp = int16_t(parser.value_celsius()); + } + + if (got_preset || got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -139,7 +184,7 @@ void GcodeSuite::M109() { TERN_(AUTOTEMP, planner.autotemp_M104_M109()); - if (set_temp) + if (got_preset || got_temp) (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling); } diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index 7fbc53297e8c..e5f3bd55e305 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -39,6 +39,7 @@ /** * M106: Set Fan Speed * + * I Material Preset index (if material presets are defined) * S Speed between 0-255 * P Fan index, if more than one fan * @@ -50,19 +51,31 @@ * 3-255 = Set the speed for use with T2 */ void GcodeSuite::M106() { - const uint8_t p = parser.byteval('P', _ALT_P); + const uint8_t pfan = parser.byteval('P', _ALT_P); - if (p < _CNT_P) { + if (pfan < _CNT_P) { #if ENABLED(EXTRA_FAN_SPEED) const uint16_t t = parser.intval('T'); - if (t > 0) return thermalManager.set_temp_fan_speed(p, t); + if (t > 0) return thermalManager.set_temp_fan_speed(pfan, t); + #endif + + const uint16_t dspeed = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255; + + uint16_t speed = dspeed; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed; + #else + constexpr bool got_preset = false; #endif - uint16_t d = parser.seen('A') ? thermalManager.fan_speed[active_extruder] : 255; - uint16_t s = parser.ushortval('S', d); - NOMORE(s, 255U); - thermalManager.set_fan_speed(p, s); + if (!got_preset && parser.seenval('S')) + speed = parser.value_ushort(); + + // Set speed, with constraint + thermalManager.set_fan_speed(pfan, speed); } } diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 394ce2de1796..725a238087bb 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -47,11 +47,29 @@ /** * M140: Set bed temperature + * + * I : Preset index (if material presets are defined) + * S : The target temperature in current units */ void GcodeSuite::M140() { if (DEBUGGING(DRYRUN)) return; - if (parser.seenval('S')) { - thermalManager.setTargetBed(parser.value_celsius()); + + int16_t temp = 0; + + // Accept 'P' if there are temperature presets are defined + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + #else + constexpr bool got_preset = false; + #endif + + // If no 'P' get the temperature from 'S' + const bool got_temp = !got_preset && parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + + if (got_preset || got_temp) { + thermalManager.setTargetBed(temp); #if ENABLED(PRINTJOB_TIMER_AUTOSTART) /** @@ -65,20 +83,45 @@ void GcodeSuite::M140() { } /** - * M190: Sxxx Wait for bed current temp to reach target temp. Waits only when heating - * Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling + * M190 - Set Bed Temperature target and wait + * + * Parameters: + * I : Preset index (if material presets are defined) + * S : The target temperature in current units. Wait for heating only. + * R : The target temperature in current units. Wait for heating and cooling. * - * With PRINTJOB_TIMER_AUTOSTART also start the job timer on heating. + * Examples: + * M190 S60 : Set target to 60°. Wait until the bed is at or above 60°. + * M190 R40 : Set target to 40°. Wait until the bed gets close to 40°. + * + * With PRINTJOB_TIMER_AUTOSTART turning on heaters will start the print job timer + * (used by printingIsActive, etc.) and turning off heaters will stop the timer. */ void GcodeSuite::M190() { if (DEBUGGING(DRYRUN)) return; - const bool no_wait_for_cooling = parser.seenval('S'); - if (no_wait_for_cooling || parser.seenval('R')) { - thermalManager.setTargetBed(parser.value_celsius()); - TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false)); + int16_t temp = 0; + + #if PREHEAT_COUNT + const bool got_preset = parser.seenval('I'); + if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + #else + constexpr bool got_preset = false; + #endif + + // Get the temperature from 'S' or 'R' + bool no_wait_for_cooling = false, got_temp = false; + if (!got_preset) { + no_wait_for_cooling = parser.seenval('S'); + got_temp = no_wait_for_cooling || parser.seenval('R'); + if (got_temp) temp = int16_t(parser.value_celsius()); } - else return; + + if (!got_preset && !got_temp) return; + + thermalManager.setTargetBed(temp); + + TERN_(PRINTJOB_TIMER_AUTOSTART, thermalManager.check_timer_autostart(true, false)); ui.set_status_P(thermalManager.isHeatingBed() ? GET_TEXT(MSG_BED_HEATING) : GET_TEXT(MSG_BED_COOLING)); From 032e5c841c3c3a0b915134a404b1eb9991288313 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 16:52:08 -0500 Subject: [PATCH 32/55] Update menu_configuration.cpp --- Marlin/src/lcd/menu/menu_configuration.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index babc3522b40f..6865140cb155 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -323,15 +323,15 @@ void menu_advanced_settings(); END_MENU(); } - void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(0); } + void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(1-1); } #if PREHEAT_COUNT >= 2 - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(1); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(2); } + void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(2-1); } + #if PREHEAT_COUNT >= 3 + void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3-1); } #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(3); } + void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4-1); } #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(4); } + void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5-1); } #endif #endif #endif From acd72830cde36c4d5fc8c0adf793fc30a3c9999a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:51:08 -0500 Subject: [PATCH 33/55] Update comments, preset --- Marlin/src/gcode/temp/M104_M109.cpp | 11 +++++++---- Marlin/src/gcode/temp/M106_M107.cpp | 1 + Marlin/src/gcode/temp/M140_M190.cpp | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index 9d43e3971899..0e7801e5e1df 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -53,6 +53,7 @@ * M104: Set Hotend Temperature target and return immediately * * Parameters: + * I : Material Preset index (if material presets are defined) * T : Tool index. If omitted, applies to the active tool * S : The target temperature in current units */ @@ -69,15 +70,15 @@ void GcodeSuite::M104() { int16_t temp = 0; - // Accept 'P' if there are temperature presets are defined + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('P'); + const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; #else constexpr bool got_preset = false; #endif - // If no 'P' get the temperature from 'S' + // If no 'I' get the temperature from 'S' const bool got_temp = !got_preset && parser.seenval('S'); if (got_temp) temp = parser.value_celsius(); @@ -111,6 +112,7 @@ void GcodeSuite::M104() { * M109: Set Hotend Temperature target and wait * * Parameters + * I : Material Preset index (if material presets are defined) * T : Tool index. If omitted, applies to the active tool * S : The target temperature in current units. Wait for heating only. * R : The target temperature in current units. Wait for heating and cooling. @@ -140,8 +142,9 @@ void GcodeSuite::M109() { int16_t temp = 0; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('P'); + const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; #else constexpr bool got_preset = false; diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index e5f3bd55e305..5e72e87b2a1b 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -64,6 +64,7 @@ void GcodeSuite::M106() { uint16_t speed = dspeed; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) speed = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].fan_speed; diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 725a238087bb..a36be359bc22 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -56,7 +56,7 @@ void GcodeSuite::M140() { int16_t temp = 0; - // Accept 'P' if there are temperature presets are defined + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; @@ -64,7 +64,7 @@ void GcodeSuite::M140() { constexpr bool got_preset = false; #endif - // If no 'P' get the temperature from 'S' + // If no 'I' get the temperature from 'S' const bool got_temp = !got_preset && parser.seenval('S'); if (got_temp) temp = parser.value_celsius(); @@ -102,6 +102,7 @@ void GcodeSuite::M190() { int16_t temp = 0; + // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT const bool got_preset = parser.seenval('I'); if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; From 932419018f86a44d86939dc1f613a1812bbd139f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:55:36 -0500 Subject: [PATCH 34/55] Use indexed presets --- Marlin/src/lcd/menu/menu_ubl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index a7c30ea52bfb..a62f9b92184b 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -325,19 +325,19 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ - "M190 S" STRINGIFY(PREHEAT_##p##_TEMP_BED) "\n" \ - "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ - "G29 P1\n" \ + "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ + "G29 P1\n" \ "M104 S0\n" \ "M140 S0" \ )) #else #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ "G28\n" \ - "M109 S" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) "\n" \ - "G29 P1\n" \ + "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ + "G29 P1\n" \ "M104 S0" \ )) #endif From e123f687c97d8a7bacc73ded90b4273f136fe48b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:58:17 -0500 Subject: [PATCH 35/55] Update language_zh_TW.h --- Marlin/src/lcd/language/language_zh_TW.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 5df1c73870d8..0f37bcd30e09 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -72,7 +72,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" @@ -81,7 +81,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " + PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" @@ -90,7 +90,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " + PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" @@ -99,7 +99,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " + PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" @@ -108,7 +108,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " + PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" From 24500d94106dcbf6357438fc6cb5ca5bc6dd00ea Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 18:59:54 -0500 Subject: [PATCH 36/55] Update language_test.h --- Marlin/src/lcd/language/language_test.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h index 680041ba1746..147379f5bd48 100644 --- a/Marlin/src/lcd/language/language_test.h +++ b/Marlin/src/lcd/language/language_test.h @@ -138,12 +138,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_C2_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_C2_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_C2_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_C2_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_C3_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_C3_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_C3_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_C3_b; @@ -179,12 +175,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_D0_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_D0_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_D0_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_D0_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_D1_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_D1_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_D1_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_D1_b; @@ -219,12 +211,8 @@ namespace Language_test { PROGMEM Language_Str MSG_DISABLE_STEPPERS = STRG_E382_8; PROGMEM Language_Str MSG_AUTO_HOME = STRG_E382_9; PROGMEM Language_Str MSG_SET_HOME_OFFSETS = STRG_E382_a; - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; - #endif + PROGMEM Language_Str MSG_PREHEAT_1 = STRG_E382_b; + PROGMEM Language_Str MSG_PREHEAT_2 = STRG_E383_8; PROGMEM Language_Str MSG_COOLDOWN = STRG_E383_9; PROGMEM Language_Str MSG_SWITCH_PS_OFF = STRG_E383_a; PROGMEM Language_Str MSG_MOVE_AXIS = STRG_E383_b; From 9bdc6fadba20d00fcc5bdc875fdbcfd0b733b880 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 19:39:31 -0500 Subject: [PATCH 37/55] Add ultralcd include --- Marlin/src/gcode/temp/M106_M107.cpp | 4 ++++ Marlin/src/lcd/menu/menu_ubl.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Marlin/src/gcode/temp/M106_M107.cpp b/Marlin/src/gcode/temp/M106_M107.cpp index 5e72e87b2a1b..ffc00eafa32a 100644 --- a/Marlin/src/gcode/temp/M106_M107.cpp +++ b/Marlin/src/gcode/temp/M106_M107.cpp @@ -28,6 +28,10 @@ #include "../../module/motion.h" #include "../../module/temperature.h" +#if PREHEAT_COUNT + #include "../../lcd/ultralcd.h" +#endif + #if ENABLED(SINGLENOZZLE) #define _ALT_P active_extruder #define _CNT_P EXTRUDERS diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index a62f9b92184b..5096e6ddccd0 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -325,16 +325,16 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ "G29 P1\n" \ "M104 S0\n" \ "M140 S0" \ )) #else - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ "G28\n" \ "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ "G29 P1\n" \ From 9fa060e791e6d019009db26b0cd8b1a1f256b129 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:29:44 -0500 Subject: [PATCH 38/55] Add G26 I for material preset --- Marlin/src/gcode/bedlevel/G26.cpp | 57 +++++++++++++++++++++++++------ Marlin/src/lcd/menu/menu_ubl.cpp | 12 +++---- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 4e2e94a7144a..98387976eb65 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -47,6 +47,8 @@ * * H # Hotend Set the Nozzle Temperature. If not specified, a default of 205 C. will be assumed. * + * I # Preset Heat the Nozzle and Bed based on a Material Preset (if material presets are defined). + * * F # Filament Used to specify the diameter of the filament being used. If not specified * 1.75mm filament is assumed. If you are not getting acceptable results by using the * 'correct' numbers, you can scale this number up or down a little bit to change the amount @@ -140,7 +142,7 @@ constexpr float g26_e_axis_feedrate = 0.025; static MeshFlags circle_flags, horizontal_mesh_line_flags, vertical_mesh_line_flags; -float random_deviation = 0.0; +float g26_random_deviation = 0.0; static bool g26_retracted = false; // Track the retracted state of the nozzle so mismatched // retracts/recovers won't result in a bad state. @@ -193,7 +195,7 @@ mesh_index_pair find_closest_circle_to_print(const xy_pos_t &pos) { f += (g26_xy_pos - m).magnitude() / 15.0f; // Add the specified amount of Random Noise to our search - if (random_deviation > 1.0) f += random(0.0, random_deviation); + if (g26_random_deviation > 1.0) f += random(0.0, g26_random_deviation); if (f < closest) { closest = f; // Found a closer un-printed location @@ -508,15 +510,35 @@ void GcodeSuite::G26() { bool g26_continue_with_closest = parser.boolval('C'), g26_keep_heaters_on = parser.boolval('K'); + // Accept 'I' if temperature presets are defined + const uint8_t preset_index = (0 + #if PREHEAT_COUNT + + (parser.seenval('I') ? _MIN(parser.value_byte(), PREHEAT_COUNT - 1) + 1 : 0) + #endif + ); + #if HAS_HEATED_BED - if (parser.seenval('B')) { - g26_bed_temp = parser.value_celsius(); - if (g26_bed_temp && !WITHIN(g26_bed_temp, 40, BED_MAX_TARGET)) { + + // Get a temperature from 'I' or 'B' + int16_t bedtemp = 0; + + // Use the 'I' index if temperature presets are defined + #if PREHEAT_COUNT + if (preset_index) bedtemp = ui.material_preset[preset_index - 1].bed_temp; + #endif + + // Look for 'B' Bed Temperature + if (parser.seenval('B')) bedtemp = parser.value_celsius(); + + if (bedtemp) { + if (!WITHIN(bedtemp, 40, BED_MAX_TARGET)) { SERIAL_ECHOLNPAIR("?Specified bed temperature not plausible (40-", int(BED_MAX_TARGET), "C)."); return; } + g26_bed_temp = bedtemp; } - #endif + + #endif // HAS_HEATED_BED if (parser.seenval('L')) { g26_layer_height = parser.value_linear_units(); @@ -580,20 +602,34 @@ void GcodeSuite::G26() { g26_extrusion_multiplier *= g26_filament_diameter * sq(g26_nozzle) / sq(0.3); // Scale up by nozzle size - if (parser.seenval('H')) { - g26_hotend_temp = parser.value_celsius(); - if (!WITHIN(g26_hotend_temp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) { + // Get a temperature from 'I' or 'H' + int16_t noztemp = 0; + + // Accept 'I' if temperature presets are defined + #if PREHEAT_COUNT + if (preset_index) noztemp = ui.material_preset[preset_index - 1].hotend_temp; + #endif + + // Look for 'H' Hotend Temperature + if (parser.seenval('H')) noztemp = parser.value_celsius(); + + // If any preset or temperature was specified + if (noztemp) { + if (!WITHIN(noztemp, 165, (HEATER_0_MAXTEMP) - (HOTEND_OVERSHOOT))) { SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible."); return; } + g26_hotend_temp = noztemp } + // 'U' to Randomize and optionally set circle deviation if (parser.seen('U')) { randomSeed(millis()); // This setting will persist for the next G26 - random_deviation = parser.has_value() ? parser.value_float() : 50.0; + g26_random_deviation = parser.has_value() ? parser.value_float() : 50.0; } + // Get repeat from 'R', otherwise do one full circuit int16_t g26_repeats; #if HAS_LCD_MENU g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1); @@ -610,6 +646,7 @@ void GcodeSuite::G26() { return; } + // Set a position with 'X' and/or 'Y'. Default: current_position g26_xy_pos.set(parser.seenval('X') ? RAW_X_POSITION(parser.value_linear_units()) : current_position.x, parser.seenval('Y') ? RAW_Y_POSITION(parser.value_linear_units()) : current_position.y); if (!position_is_reachable(g26_xy_pos)) { diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 5096e6ddccd0..6f6e5cf07b59 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -205,15 +205,11 @@ void _lcd_ubl_edit_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ - "G28\n" \ - "G26 C B" STRINGIFY(PREHEAT_##p##_TEMP_BED) " H" STRINGIFY(PREHEAT_##p##_TEMP_HOTEND) " P" \ - )) + #define VALIDATE_MESH_GCODE_ITEM(M) \ + GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P I" STRINGIFY(DECREMENT(M)))) #else - #define VALIDATE_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##p, PSTR( \ - "G28\n" \ - "G26 C B0 H" STRINGIFY(PREHEAT_##p#_TEMP_HOTEND) " P" \ - )) + #define VALIDATE_MESH_GCODE_ITEM(M) \ + GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P B0 I" STRINGIFY(DECREMENT(M)))) #endif VALIDATE_MESH_GCODE_ITEM(1); From 55ae371b9c79767bb41fccc40f157238590c1a2a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:55:23 -0500 Subject: [PATCH 39/55] Fewer boolies --- Marlin/src/gcode/temp/M104_M109.cpp | 36 +++++++++++++++++------------ Marlin/src/gcode/temp/M140_M190.cpp | 31 ++++++++++++++----------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Marlin/src/gcode/temp/M104_M109.cpp b/Marlin/src/gcode/temp/M104_M109.cpp index 0e7801e5e1df..f8eca4bc028f 100644 --- a/Marlin/src/gcode/temp/M104_M109.cpp +++ b/Marlin/src/gcode/temp/M104_M109.cpp @@ -68,21 +68,25 @@ void GcodeSuite::M104() { if (target_extruder < 0) return; #endif + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp; + } #endif // If no 'I' get the temperature from 'S' - const bool got_temp = !got_preset && parser.seenval('S'); - if (got_temp) temp = parser.value_celsius(); + if (!got_temp) { + got_temp = parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + } - if (got_preset || got_temp) { + if (got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -140,25 +144,27 @@ void GcodeSuite::M109() { if (target_extruder < 0) return; #endif + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].hotend_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].hotend_temp; + } #endif // Get the temperature from 'S' or 'R' - bool no_wait_for_cooling = false, got_temp = false; - if (!got_preset) { + bool no_wait_for_cooling = false; + if (!got_temp) { no_wait_for_cooling = parser.seenval('S'); got_temp = no_wait_for_cooling || parser.seenval('R'); if (got_temp) temp = int16_t(parser.value_celsius()); } - if (got_preset || got_temp) { + if (got_temp) { #if ENABLED(SINGLENOZZLE_STANDBY_TEMP) singlenozzle_temp[target_extruder] = temp; if (target_extruder != active_extruder) return; @@ -187,7 +193,7 @@ void GcodeSuite::M109() { TERN_(AUTOTEMP, planner.autotemp_M104_M109()); - if (got_preset || got_temp) + if (got_temp) (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling); } diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index a36be359bc22..955b1cf0df55 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -54,21 +54,22 @@ void GcodeSuite::M140() { if (DEBUGGING(DRYRUN)) return; + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; #endif // If no 'I' get the temperature from 'S' - const bool got_temp = !got_preset && parser.seenval('S'); - if (got_temp) temp = parser.value_celsius(); + if (!got_temp) { + got_temp = parser.seenval('S'); + if (got_temp) temp = parser.value_celsius(); + } - if (got_preset || got_temp) { + if (got_temp) { thermalManager.setTargetBed(temp); #if ENABLED(PRINTJOB_TIMER_AUTOSTART) @@ -100,25 +101,27 @@ void GcodeSuite::M140() { void GcodeSuite::M190() { if (DEBUGGING(DRYRUN)) return; + bool got_temp = false; int16_t temp = 0; // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT - const bool got_preset = parser.seenval('I'); - if (got_preset) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; - #else - constexpr bool got_preset = false; + got_temp = parser.seenval('I'); + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp; + } #endif // Get the temperature from 'S' or 'R' - bool no_wait_for_cooling = false, got_temp = false; - if (!got_preset) { + bool no_wait_for_cooling = false; + if (!got_temp) { no_wait_for_cooling = parser.seenval('S'); got_temp = no_wait_for_cooling || parser.seenval('R'); if (got_temp) temp = int16_t(parser.value_celsius()); } - if (!got_preset && !got_temp) return; + if (!got_temp) return; thermalManager.setTargetBed(temp); From b474e1215dc7a9df0215ea1b4c3fd53444cbaac9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 3 Jul 2020 20:59:14 -0500 Subject: [PATCH 40/55] Fix a typo --- Marlin/src/gcode/bedlevel/G26.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp index 98387976eb65..516f5792f70e 100644 --- a/Marlin/src/gcode/bedlevel/G26.cpp +++ b/Marlin/src/gcode/bedlevel/G26.cpp @@ -619,7 +619,7 @@ void GcodeSuite::G26() { SERIAL_ECHOLNPGM("?Specified nozzle temperature not plausible."); return; } - g26_hotend_temp = noztemp + g26_hotend_temp = noztemp; } // 'U' to Randomize and optionally set circle deviation From f57afd55168d6bf433d5611c913e00c64c63a22d Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Sat, 4 Jul 2020 11:23:22 +0200 Subject: [PATCH 41/55] Uniform define argument --- Marlin/src/lcd/menu/menu_ubl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 6f6e5cf07b59..9e9fd8ee2842 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -330,9 +330,9 @@ void _lcd_ubl_build_mesh() { "M140 S0" \ )) #else - #define BUILD_MESH_GCODE_ITEM(p) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##p, PSTR( \ + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ "G28\n" \ - "M109 I" STRINGIFY(DECREMENT(p)) "\n" \ + "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ "G29 P1\n" \ "M104 S0" \ )) From c5c29670e8244bf9fdfd91264b4a3956389b9a29 Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Sat, 4 Jul 2020 11:24:33 +0200 Subject: [PATCH 42/55] enforce base 0 argument --- Marlin/src/lcd/menu/menu_temperature.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index 9bcc3264aae7..90a3ad240201 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -305,15 +305,15 @@ void menu_temperature() { #endif #endif #else - ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(0, 0); }); + ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(1-1, 0); }); #if PREHEAT_COUNT >= 2 - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(1, 0); }); + ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(2-1, 0); }); #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(2, 0); }); + ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(3-1, 0); }); #if PREHEAT_COUNT >= 4 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(3, 0); }); + ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(4-1, 0); }); #if PREHEAT_COUNT >= 5 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(4, 0); }); + ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(5-1, 0); }); #endif #endif #endif From 98239df96cefa1e0da9e594ce832314e2585a548 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 6 Jul 2020 16:42:08 -0500 Subject: [PATCH 43/55] Update M140_M190.cpp --- Marlin/src/gcode/temp/M140_M190.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Marlin/src/gcode/temp/M140_M190.cpp b/Marlin/src/gcode/temp/M140_M190.cpp index 955b1cf0df55..4af09bdfe038 100644 --- a/Marlin/src/gcode/temp/M140_M190.cpp +++ b/Marlin/src/gcode/temp/M140_M190.cpp @@ -60,7 +60,10 @@ void GcodeSuite::M140() { // Accept 'I' if temperature presets are defined #if PREHEAT_COUNT got_temp = parser.seenval('I'); - if (got_temp) temp = ui.material_preset[_MIN(parser.value_byte(), PREHEAT_COUNT - 1)].bed_temp; + if (got_temp) { + const uint8_t index = parser.value_byte(); + temp = ui.material_preset[_MIN(index, PREHEAT_COUNT - 1)].bed_temp; + } #endif // If no 'I' get the temperature from 'S' From 599217318e32377eec7b759c154840688e971055 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 7 Jul 2020 18:00:12 -0500 Subject: [PATCH 44/55] String list substitution --- Marlin/src/inc/Conditionals_post.h | 4 +- Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp | 14 +- Marlin/src/lcd/dogm/ultralcd_DOGM.cpp | 16 +- Marlin/src/lcd/language/language_an.h | 46 +---- Marlin/src/lcd/language/language_bg.h | 46 +---- Marlin/src/lcd/language/language_ca.h | 46 +---- Marlin/src/lcd/language/language_cz.h | 78 ++------ Marlin/src/lcd/language/language_da.h | 46 +---- Marlin/src/lcd/language/language_de.h | 78 ++------ Marlin/src/lcd/language/language_el.h | 46 +---- Marlin/src/lcd/language/language_el_gr.h | 46 +---- Marlin/src/lcd/language/language_en.h | 78 ++------ Marlin/src/lcd/language/language_es.h | 92 ++-------- Marlin/src/lcd/language/language_eu.h | 78 ++------ Marlin/src/lcd/language/language_fi.h | 46 +---- Marlin/src/lcd/language/language_fr.h | 78 ++------ Marlin/src/lcd/language/language_gl.h | 78 ++------ Marlin/src/lcd/language/language_hr.h | 46 +---- Marlin/src/lcd/language/language_hu.h | 78 ++------ Marlin/src/lcd/language/language_it.h | 78 ++------ Marlin/src/lcd/language/language_jp_kana.h | 46 +---- Marlin/src/lcd/language/language_ko_KR.h | 39 ++-- Marlin/src/lcd/language/language_nl.h | 46 +---- Marlin/src/lcd/language/language_pl.h | 78 ++------ Marlin/src/lcd/language/language_pt.h | 46 +---- Marlin/src/lcd/language/language_pt_br.h | 78 ++------ Marlin/src/lcd/language/language_ro.h | 78 ++------ Marlin/src/lcd/language/language_ru.h | 94 ++-------- Marlin/src/lcd/language/language_sk.h | 78 ++------ Marlin/src/lcd/language/language_tr.h | 78 ++------ Marlin/src/lcd/language/language_uk.h | 78 ++------ Marlin/src/lcd/language/language_vi.h | 78 ++------ Marlin/src/lcd/language/language_zh_CN.h | 78 ++------ Marlin/src/lcd/language/language_zh_TW.h | 78 ++------ Marlin/src/lcd/lcdprint.cpp | 5 +- Marlin/src/lcd/lcdprint.h | 6 +- Marlin/src/lcd/menu/menu.cpp | 1 + Marlin/src/lcd/menu/menu.h | 187 ++++++++++++-------- Marlin/src/lcd/menu/menu_configuration.cpp | 32 +--- Marlin/src/lcd/menu/menu_filament.cpp | 23 ++- Marlin/src/lcd/menu/menu_temperature.cpp | 142 +++++---------- Marlin/src/lcd/menu/menu_ubl.cpp | 67 ++++--- Marlin/src/lcd/ultralcd.cpp | 31 +++- Marlin/src/lcd/ultralcd.h | 1 + 44 files changed, 615 insertions(+), 1971 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 69be10b7c917..7b89c27e597e 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2137,11 +2137,9 @@ #define PREHEAT_COUNT 3 #elif defined(PREHEAT_2_LABEL) #define PREHEAT_COUNT 2 - #else + #elif defined(PREHEAT_1_LABEL) #define PREHEAT_COUNT 1 #endif -#else - #undef PREHEAT_COUNT #endif /** diff --git a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp index 21e8130850ca..5b1de8008aab 100644 --- a/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp +++ b/Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp @@ -1004,7 +1004,7 @@ void MarlinUI::draw_status_screen() { int8_t pad = (LCD_WIDTH - utf8_strlen_P(pstr)) / 2; while (--pad >= 0) { lcd_put_wchar(' '); n--; } } - n = lcd_put_u8str_ind_P(pstr, itemIndex, n); + n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n); if (valstr) n -= lcd_put_u8str_max(valstr, n); for (; n > 0; --n) lcd_put_wchar(' '); } @@ -1012,20 +1012,20 @@ void MarlinUI::draw_status_screen() { // Draw a generic menu item with pre_char (if selected) and post_char void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char) { lcd_put_wchar(0, row, sel ? pre_char : ' '); - uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2); + uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2); for (; n; --n) lcd_put_wchar(' '); lcd_put_wchar(post_char); } // Draw a menu item with a (potentially) editable value - void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) { - const uint8_t vlen = data ? (pgm ? utf8_strlen_P(data) : utf8_strlen(data)) : 0; + void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) { + const uint8_t vlen = inStr ? (pgm ? utf8_strlen_P(inStr) : utf8_strlen(inStr)) : 0; lcd_put_wchar(0, row, sel ? LCD_STR_ARROW_RIGHT[0] : ' '); - uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vlen); + uint8_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vlen); if (vlen) { lcd_put_wchar(':'); for (; n; --n) lcd_put_wchar(' '); - if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str(data); + if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str(inStr); } } @@ -1033,7 +1033,7 @@ void MarlinUI::draw_status_screen() { void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) { ui.encoder_direction_normal(); - uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, LCD_WIDTH - 1); + uint8_t n = lcd_put_u8str_ind_P(0, 1, pstr, itemIndex, itemString, LCD_WIDTH - 1); if (value != nullptr) { lcd_put_wchar(':'); int len = utf8_strlen(value); diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp index e26b990a2474..728d028deb70 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.cpp @@ -359,7 +359,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop n -= MENU_FONT_WIDTH; } - n = lcd_put_u8str_ind_P(pstr, itemIndex, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH); + n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, n / (MENU_FONT_WIDTH)) * (MENU_FONT_WIDTH); if (valstr) n -= lcd_put_u8str_max(valstr, n); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); } @@ -368,7 +368,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop // Draw a generic menu item void MenuItemBase::_draw(const bool sel, const uint8_t row, PGM_P const pstr, const char, const char post_char) { if (mark_as_selected(row, sel)) { - pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 1) * (MENU_FONT_WIDTH); + pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 1) * (MENU_FONT_WIDTH); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); lcd_put_wchar(LCD_PIXEL_WIDTH - (MENU_FONT_WIDTH), row_y2, post_char); lcd_put_wchar(' '); @@ -376,17 +376,17 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop } // Draw a menu item with an editable value - void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm) { + void MenuEditItemBase::draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm) { if (mark_as_selected(row, sel)) { - const uint8_t vallen = (pgm ? utf8_strlen_P(data) : utf8_strlen((char*)data)), - pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), data) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)data)); + const uint8_t vallen = (pgm ? utf8_strlen_P(inStr) : utf8_strlen((char*)inStr)), + pixelwidth = (pgm ? uxg_GetUtf8StrPixelWidthP(u8g.getU8g(), inStr) : uxg_GetUtf8StrPixelWidth(u8g.getU8g(), (char*)inStr)); - pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH); + pixel_len_t n = lcd_put_u8str_ind_P(pstr, itemIndex, itemString, LCD_WIDTH - 2 - vallen) * (MENU_FONT_WIDTH); if (vallen) { lcd_put_wchar(':'); while (n > MENU_FONT_WIDTH) n -= lcd_put_wchar(' '); lcd_moveto(LCD_PIXEL_WIDTH - _MAX((MENU_FONT_WIDTH) * vallen, pixelwidth + 2), row_y2); - if (pgm) lcd_put_u8str_P(data); else lcd_put_u8str((char*)data); + if (pgm) lcd_put_u8str_P(inStr); else lcd_put_u8str((char*)inStr); } } } @@ -423,7 +423,7 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop // Assume the label is alpha-numeric (with a descender) bool onpage = PAGE_CONTAINS(baseline - (EDIT_FONT_ASCENT - 1), baseline + EDIT_FONT_DESCENT); - if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex); + if (onpage) lcd_put_u8str_ind_P(0, baseline, pstr, itemIndex, itemString); // If a value is included, print a colon, then print the value right-justified if (value != nullptr) { diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 17bd4d5a1133..324c5b2c0109 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -56,7 +56,7 @@ namespace Language_an { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); @@ -64,42 +64,14 @@ namespace Language_an { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precalentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precalentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precalentar ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precalentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precalentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precalentar ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precalentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precalentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precalentar ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precalentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precalentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precalentar ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precalentar $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precalentar $ Base"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precalentar $ Conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 6fa2d231ab21..e7c497e7eb3c 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -46,7 +46,7 @@ namespace Language_bg { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Паркиране"); PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); @@ -54,42 +54,14 @@ namespace Language_bg { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Подгряване ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Подгряване ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Подгряване ") PREHEAT_2_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Подгр. ") PREHEAT_2_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Настройки ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Подгряване ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Подгряване ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Подгряване ") PREHEAT_3_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Подгр. ") PREHEAT_3_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Настройки ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Подгряване ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Подгряване ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Подгряване ") PREHEAT_4_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Подгр. ") PREHEAT_4_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Настройки ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Подгряване ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Подгряване ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Подгряване ") PREHEAT_5_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Подгр. ") PREHEAT_5_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Настройки ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Подгряване $ Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Подгр. $ Всички"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Подгр. $ Легло"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Настройки $"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждане"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 6ad1143a399e..3eed7933c55d 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -54,7 +54,7 @@ namespace Language_ca { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); @@ -62,42 +62,14 @@ namespace Language_ca { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preescalfa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preescalfa ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preescalfa ") PREHEAT_2_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preescalfa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preescalfa ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preescalfa ") PREHEAT_3_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preescalfa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preescalfa ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preescalfa ") PREHEAT_4_LABEL _UxGT(" Conf."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preescalfa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preescalfa ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preescalfa ") PREHEAT_5_LABEL _UxGT(" Conf."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preescalfa $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preescalfa $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preescalfa $ Llit"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preescalfa $ Conf."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refreda"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 110ab0a76dff..3796284f4ee5 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -79,7 +79,7 @@ namespace Language_cz { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); @@ -87,42 +87,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahřát ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahřát ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahřát ") PREHEAT_2_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahřát ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahřát ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahřát ") PREHEAT_3_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahřát ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahřát ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahřát ") PREHEAT_4_LABEL _UxGT(" nast"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahřát ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahřát ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahřát ") PREHEAT_5_LABEL _UxGT(" nast"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahřát $ end ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahřát $ vše"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahřát $ podlož"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahřát $ nast"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Zchladit"); @@ -187,40 +159,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Síť bodů ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Síť bodů ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Síť bodů ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Síť bodů ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Síť bodů ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Zkontrolovat síť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola sítě ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola sítě ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola sítě ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola sítě ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola sítě ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast. sítě"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 zahřívání podl."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 zařívání trysky"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 49921bd4a3aa..fc69aa55c334 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -49,7 +49,7 @@ namespace Language_da { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") @@ -57,42 +57,14 @@ namespace Language_da { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Forvarm ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Forvarm ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Forvarm ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Forvarm ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Forvarm ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Forvarm ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Forvarm ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Forvarm ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Forvarm ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Forvarm ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Forvarm ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Forvarm ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Forvarm $ end ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Forvarm $ Alle"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Forvarm $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Forvarm $ conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkøl"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Slå strøm til"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 1ee12d89a0b7..465f4c63845b 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -64,7 +64,7 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Setze Homeversatz"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); @@ -72,42 +72,14 @@ namespace Language_de { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" Einstellungen"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" Einstellungen"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ Einstellungen"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("benutzerdef. Heizen"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Abkühlen"); @@ -171,40 +143,14 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Bearbeitung beendet"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz erstellen"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz erstellen"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Höhe"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Netz validieren"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" Netz validieren"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" Netz validieren"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Eig. Netz validieren"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 heizt Bett"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Düse aufheizen"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 659d22ea4d34..eb288ba8ab4b 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -54,7 +54,7 @@ namespace Language_el { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); //SHORTEN PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); @@ -62,42 +62,14 @@ namespace Language_el { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H0 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H0 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H0 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H0 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Προθέρμανση $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Προθέρμανση $ όλα"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Προθέρμανση $ bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Προθέρμανση $ επιβεβαίωση"); //SHORTEN #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 3c1edcbba765..c79bca37d429 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -55,7 +55,7 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ορισμός βασικών μετατοπίσεων"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); @@ -63,42 +63,14 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_2_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_3_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_4_LABEL _UxGT(" επιβεβαίωση"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_5_LABEL _UxGT(" επιβεβαίωση"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Προθέρμανση $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Προθέρμανση $ όλα"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Προθέρμανση $ κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Προθέρμανση $ επιβεβαίωση"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Μειωση θερμοκρασιας"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ενεργοποίηση"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 24bfa651c2d0..d70b007c6e9e 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -74,7 +74,7 @@ namespace Language_en { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Set Home Offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); @@ -82,42 +82,14 @@ namespace Language_en { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preheat ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preheat ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preheat ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preheat ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preheat ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preheat ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preheat ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preheat ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preheat ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preheat ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preheat ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preheat ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preheat $ End ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preheat $ All"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preheat $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preheat $ Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preheat Custom"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Cooldown"); @@ -181,40 +153,12 @@ namespace Language_en { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)"); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)"); PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 3e0736790c48..bd63e6479e52 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -69,50 +69,22 @@ namespace Language_es { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ajustar desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Precal. ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Precal. ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Precal. ") PREHEAT_2_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Precal. ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Precal. ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Precal. ") PREHEAT_3_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Precal. ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Precal. ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Precal. ") PREHEAT_4_LABEL _UxGT(" Ajuste"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Precal. ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Precal. ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Precal. ") PREHEAT_5_LABEL _UxGT(" Ajuste"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); @@ -176,40 +148,14 @@ namespace Language_es { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Term. edici. Mallado"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Mallado Pers."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Mallado"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Mallado (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Mallado (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Mallado (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Mallado (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Mallado (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Mallado ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valid. Mall. ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Mallado Frío"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar alt. Mallado"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Cantidad de altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valid. Mallado"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valid. Mall. (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valid. Mall. (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valid. Mall. (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valid. Mall. (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valid. Mall. (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valid. Mall. perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Calentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Calent. Boquilla"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 8f632d55a761..35c4717a4057 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -58,7 +58,7 @@ namespace Language_eu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Etxe. offset eza."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); @@ -66,42 +66,14 @@ namespace Language_eu { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Berotu ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Berotu ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Berotu ") PREHEAT_2_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Berotu ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Berotu ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Berotu ") PREHEAT_3_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Berotu ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Berotu ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Berotu ") PREHEAT_4_LABEL _UxGT(" Ezarp."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Berotu ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Berotu ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Berotu ") PREHEAT_5_LABEL _UxGT(" Ezarp."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Berotu $ Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Berotu $ Guztia"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Berotu $ Ohea"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Berotu $ Ezarp."); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hoztu"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Energia piztu"); @@ -129,39 +101,13 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Sarea editatu"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea sortu"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea sortu"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sarea balioetsi"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = PREHEAT_1_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = PREHEAT_2_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = PREHEAT_3_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = PREHEAT_4_LABEL _UxGT(" sarea balioetsi"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = PREHEAT_5_LABEL _UxGT(" sarea balioetsi"); - #endif PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Ohe sarea balioetsi"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Sare berdinketa"); PROGMEM Language_Str MSG_UBL_3POINT_MESH_LEVELING = _UxGT("3 puntuko berdinketa"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 4a8a0ef1168f..8166fa3136bd 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -45,7 +45,7 @@ namespace Language_fi { PROGMEM Language_Str MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit"); PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); @@ -53,42 +53,14 @@ namespace Language_fi { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Esilämmitä ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Esilämmitä ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Esilä. ") PREHEAT_2_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Esilämm. ") PREHEAT_2_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Esilämmitä ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Esilämmitä ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Esilä. ") PREHEAT_3_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Esilämm. ") PREHEAT_3_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Esilämmitä ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Esilämmitä ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Esilä. ") PREHEAT_4_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Esilämm. ") PREHEAT_4_LABEL _UxGT(" konf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Esilämmitä ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Esilämmitä ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Esilä. ") PREHEAT_5_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Esilämm. ") PREHEAT_5_LABEL _UxGT(" konf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Esilä. $Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Esilä. $ Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Esilä. $ Alusta"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Esilämm. $ konf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Jäähdytä"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Virta päälle"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index ca1fd112cd5c..72cbfcf3c137 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -70,7 +70,7 @@ namespace Language_fr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Régl. décal origine"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); @@ -78,42 +78,14 @@ namespace Language_fr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Préchauffage ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Préchauffage ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Préch. ") PREHEAT_2_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Régler préch. ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Préchauffage ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Préchauffage ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Préch. ") PREHEAT_3_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Régler préch. ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Préchauffage ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Préchauffage ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Préch. ") PREHEAT_4_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Régler préch. ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Préchauffage ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Préchauffage ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Préch. ") PREHEAT_5_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Régler préch. ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Préch. $ buse ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Préch. $ Tout"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Préch. $ lit"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Régler préch. $"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Préchauf. perso"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Refroidir"); @@ -177,41 +149,15 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Créer grille ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Créer grille ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Créer grille ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Créer grille ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Créer grille ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajuster haut. couche"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Hauteur (x0.1mm)"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Vérifier grille"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Impr. grille ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Impr. grille ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Impr. grille ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Impr. grille ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Impr. grille ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Impr. grille ..."); PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Continuer grille"); PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Niveau par mailles"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 46608b69de93..66187e8a6b72 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -72,7 +72,7 @@ namespace Language_gl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Axustar Desfases"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); @@ -80,42 +80,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Prequentar ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Prequentar ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preque. ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Prequentar ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Prequentar ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preque. ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Prequentar ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Prequentar ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preque. ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Prequentar ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Prequentar ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preque. ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preque. $ Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preque. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preque. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preque. $ conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preque. Personali."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefriar"); @@ -179,40 +151,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fin Edición da Malla"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crear Malla Person."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crear Malla"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crear Malla (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crear Malla (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crear Malla (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crear Malla (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crear Malla (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crear Malla ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validar Malla ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crear Malla Fría"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Axustar Altura Malla"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malla"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validar Malla (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validar Malla (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validar Malla (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validar Malla (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validar Malla (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malla perso."); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Quentando Cama"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Quentando Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 885b7a36ee61..24a1f1dcc701 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -55,7 +55,7 @@ namespace Language_hr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Postavi home offsete"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); @@ -63,42 +63,14 @@ namespace Language_hr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Predgrij ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Predgrij ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Predgrij ") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Predgrij ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Predgrij ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Predgrij ") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Predgrij ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Predgrij ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Predgrij ") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Predgrij ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Predgrij ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Predgrij ") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Predgrij $ Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Predgrij $ Sve"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Predgrij $ Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Predgrij $ conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Hlađenje"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Uključi napajanje"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 3980e80ea693..de38cb52dae6 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -74,7 +74,7 @@ namespace Language_hu { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Kezdöpont eltolás"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); @@ -82,42 +82,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Fütés ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Fütés ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Fütés ") PREHEAT_2_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Fütés ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Fütés ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Fütés ") PREHEAT_3_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Fütés ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Fütés ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Fütés ") PREHEAT_4_LABEL _UxGT(" Beáll"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Fütés ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Fütés ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Fütés ") PREHEAT_5_LABEL _UxGT(" Beáll"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Fütés $ Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Fütés $ Mind"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Fütés $ Ágy"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Fütés $ Beáll"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Egyedi Elömelegítés"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Visszahütés"); @@ -181,40 +153,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Háló Kész"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Egyéni Háló Építés"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Háló Építés"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Háló Építés (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Háló Építés (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Háló Építés (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Háló Építés (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Háló Építés (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Háló Építés ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Háló Elfogadás ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Hideg Háló Építés"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("AHáló Magasság Állítása"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Összmagasság"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Háló Elfogadás"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Háló Elfogadás (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Háló Elfogadás (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Háló Elfogadás (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Háló Elfogadás (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Háló Elfogadás (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Valódi Háló Elfogadása"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Ágy Fűtés"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Fúvóka Fűtés"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index a377051d83d5..30dddbf254c8 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -72,7 +72,7 @@ namespace Language_it { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Imp. offset home"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); @@ -80,42 +80,14 @@ namespace Language_it { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preriscalda ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preriscalda ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preris.") PREHEAT_2_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preriscalda ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preriscalda ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preris.") PREHEAT_3_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preriscalda ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preriscalda ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preris.") PREHEAT_4_LABEL _UxGT(" conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preriscalda ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preriscalda ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preris.") PREHEAT_5_LABEL _UxGT(" conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preris.$ Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preris.$ Tutto"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preris.$ Piatto"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preris.$ conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Prerisc.personal."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Raffredda"); @@ -179,40 +151,14 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Modif.Mesh fatta"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Crea Mesh ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Crea Mesh ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Crea Mesh ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Crea Mesh ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Crea Mesh ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Altezza"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Valida Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Valida Mesh ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Valida Mesh ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Valida Mesh ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Valida Mesh ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Valida Mesh ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 riscald.letto"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 riscald.ugello"); PROGMEM Language_Str MSG_G26_MANUAL_PRIME = _UxGT("Priming manuale..."); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 4050d862c955..8a74dcabba8d 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -63,7 +63,7 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("キジュンオフセットセッテイ"); // "Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" @@ -71,42 +71,14 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ ヨネツセッテイ"); // " conf" #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("カネツテイシ"); // "Cooldown" PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("デンゲン オン"); // "Switch power on" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 88700e862987..7627a7d15565 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -55,35 +55,16 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("누르면 시작합니다"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("예열하기 - ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("예열하기 - ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("예열하기 - ") PREHEAT_2_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("예열하기 - ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("예열하기 - ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("예열하기 - ") PREHEAT_3_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("예열하기 - ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("예열하기 - ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("예열하기 - ") PREHEAT_4_LABEL _UxGT(" 노즐 ~"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("예열하기 - ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("예열하기 - ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("예열하기 - ") PREHEAT_5_LABEL _UxGT(" 노즐 ~"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("예열하기 - $ 노즐 ~"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Custom 예열"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("식히기"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 65aeef8833f7..701f861217a6 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -55,7 +55,7 @@ namespace Language_nl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Zet home offsets"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); @@ -63,42 +63,14 @@ namespace Language_nl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = PREHEAT_2_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_2_H = PREHEAT_2_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_2_END = PREHEAT_2_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = PREHEAT_2_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = PREHEAT_2_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = PREHEAT_2_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = PREHEAT_2_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = PREHEAT_3_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_3_H = PREHEAT_3_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_3_END = PREHEAT_3_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = PREHEAT_3_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = PREHEAT_3_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = PREHEAT_3_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = PREHEAT_3_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = PREHEAT_4_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_4_H = PREHEAT_4_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_4_END = PREHEAT_4_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = PREHEAT_4_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = PREHEAT_4_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = PREHEAT_4_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = PREHEAT_4_LABEL _UxGT(" verw. conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = PREHEAT_5_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_5_H = PREHEAT_5_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_5_END = PREHEAT_5_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = PREHEAT_5_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = PREHEAT_5_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = PREHEAT_5_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = PREHEAT_5_LABEL _UxGT(" verw. conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("$ voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("$ verw. conf"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Afkoelen"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Stroom aan"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index ef25128caf6c..9e77eb92d1c5 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -70,7 +70,7 @@ namespace Language_pl { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ust. poz. zer."); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); @@ -78,42 +78,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Rozgrzej ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Rozgrzej ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_2_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Rozgrzej ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Rozgrzej ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_3_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Rozgrzej ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Rozgrzej ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_4_LABEL _UxGT(" ustaw."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Rozgrzej ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Rozgrzej ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_5_LABEL _UxGT(" ustaw."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Rozgrzej $ Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Rozgrzej $ wsz."); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Rozgrzej $ stół"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Rozgrzej $ ustaw."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Rozgrzej własne ust."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Chłodzenie"); @@ -176,40 +148,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec edycji siati"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Buduj własna siatkę"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Buduj siatkę"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Buduj siatkę (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Buduj siatkę (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Buduj siatkę (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Buduj siatkę (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Buduj siatkę (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Buduj siatkę ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Sprawdzenie siatki ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Buduj siatkę na zimno"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Dostrojenie wysokości siatki"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Wartość wysokości"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Sprawdzenie siatki"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Sprawdzenie siatki (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Sprawdzenie siatki (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Sprawdzenie siatki (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Sprawdzenie siatki (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Sprawdzenie siatki (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Sprawdzenie własnej siatki"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Nagrzewanie stołu"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Nagrzewanie dyszy"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 25d7aae1c10d..41bfdc741494 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -54,7 +54,7 @@ namespace Language_pt { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Definir desvio"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); @@ -62,42 +62,14 @@ namespace Language_pt { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_2_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Definições ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_3_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Definições ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_4_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Definições ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_5_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Definições ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Pre-aquecer $ Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq. $ Tudo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq. $ ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Definições $"); #endif PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Arrefecer"); PROGMEM Language_Str MSG_SWITCH_PS_ON = _UxGT("Ligar"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 69e076f12876..49a336ce3ff1 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -69,7 +69,7 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Compensar origem"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; @@ -77,42 +77,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Pre-aquecer ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Extrusora ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Extrusora ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ajustar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Pre-aquecer ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Extrusora ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Extrusora ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ajustar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Pre-aquecer ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Extrusora ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Extrusora ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ajustar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Pre-aquecer ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Extrusora ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Extrusora ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ajustar ") PREHEAT_5_LABEL; + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Extrusora $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Pre-aq.Todo $"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Pre-aq.Mesa $"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ajustar $"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Customizar Pre-aq."); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Esfriar"); @@ -163,40 +135,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Fim da Edição"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Montar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Montar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Montar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Montar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Montar ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Quant. de Altura"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validar Malha"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Checar ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Checar ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Checar ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Checar ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Checar ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validar Malha Custom"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Aquecendo Mesa"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Aquecendo Ext."); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index eb184eea949b..51f1a00101f1 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -70,7 +70,7 @@ namespace Language_ro { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Seteaza Originea"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul"); @@ -78,42 +78,14 @@ namespace Language_ro { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Tot"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Patul"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Preincalzeste ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Preincalzeste ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_2_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Preincalzeste ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Preincalzeste ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_3_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Preincalzeste ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Preincalzeste ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_4_LABEL _UxGT(" Conf"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Preincalzeste ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Preincalzeste ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Capatul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Patul"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Preincalzeste ") PREHEAT_5_LABEL _UxGT(" Conf"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preincalzeste $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preincalzeste $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preincalzeste $ Capatul"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Preincalzeste $ Capatul ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Preincalzeste $ Tot"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Preincalzeste $ Patul"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Preincalzeste $ Conf"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Preincalzeste Personalizat"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Racire"); @@ -177,40 +149,14 @@ namespace Language_ro { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Done Editing Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Build Custom Mesh"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Build Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Build Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Build Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Build Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Build Mesh (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Build Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Build Cold Mesh"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Adjust Mesh Height"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Height Amount"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Validate Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Validate Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Validate Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Validate Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Validate Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Validate Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Validate Custom Mesh"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Heating Bed"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Heating Nozzle"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 75d5be91880d..15d23e1326ed 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -78,7 +78,7 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); @@ -86,42 +86,14 @@ namespace Language_ru { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Преднагрев ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрев ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрев ") PREHEAT_2_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Преднагрев ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрев ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрев ") PREHEAT_3_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Преднагрев ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрев ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрев ") PREHEAT_4_LABEL _UxGT(" правка"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Преднагрев ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрев ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрев ") PREHEAT_5_LABEL _UxGT(" правка"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Нагрев $ сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Нагрев $ всё"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Нагрев $ стол"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Нагрев $ правка"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрев Свой"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Охлаждение"); @@ -215,20 +187,8 @@ namespace Language_ru { #endif PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Построить сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Построить сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Построить сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Построить сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Построить сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); @@ -239,37 +199,13 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Высота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Проверить сетку"); #if LCD_WIDTH > 21 - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Проверить сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Проверить сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Проверить сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Проверить сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Проверить сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Проверить сетку $"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Проверить свою сетку"); #else - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Провер. сетку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Провер. сетку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Провер. сетку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Провер. сетку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Провер. сетку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Провер. сетку $"); #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Провер. свою сетку"); #endif diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index d88c8e4541d7..a4c47951f1b5 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -74,7 +74,7 @@ namespace Language_sk { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Nastaviť ofsety"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); @@ -82,42 +82,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Zahriať ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Zahriať ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Zahriať ") PREHEAT_2_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Zahriať ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Zahriať ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Zahriať ") PREHEAT_3_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Zahriať ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Zahriať ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Zahriať ") PREHEAT_4_LABEL _UxGT(" nast."); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Zahriať ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Zahriať ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Zahriať ") PREHEAT_5_LABEL _UxGT(" nast."); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Zahriať $ hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Zahriať $ všetko"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Zahriať $ podlož"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Zahriať $ nast."); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Vlastná teplota"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Schladiť"); @@ -181,40 +153,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Koniec úprav siete"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Sieť bodov ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Sieť bodov ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Skontrolovať sieť"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Kontrola siete ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Kontrola siete ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Kontrola siete ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Kontrola siete ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Kontrola siete ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Kontrola vlast.siete"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 ohrev podlž."); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 ohrev trysky"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index f4083ae128e6..9ff62d70d636 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -75,7 +75,7 @@ namespace Language_tr { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Ofset Ayarla"); PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); @@ -83,42 +83,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Ön Isınma ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Ön Isınma ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_2_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Ön Isınma ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Ön Isınma ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_3_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Ön Isınma ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Ön Isınma ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_4_LABEL _UxGT(" Ayarlar"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Ön Isınma ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Ön Isınma ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_5_LABEL _UxGT(" Ayarlar"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Ön Isınma $ Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Ön Isınma $ Tüm"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Ön Isınma $ Tabla"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Ön Isınma $ Ayarlar"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Özel Ön Isınma"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Soğut/(Durdur)"); @@ -181,40 +153,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Mesh Düzenleme Tamam"); PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Özel Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Mesh Oluştur"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Mesh Oluştur (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Mesh Oluştur (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Mesh Oluştur (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Mesh Oluştur (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Mesh Oluştur (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Mesh Oluştur ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Doğrulama Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Soğuk Mesh Oluştur"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Mesh Yükseklik Ayarı"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Yükseklik miktarı"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Doğrulama Mesh"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Doğrulama Mesh (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Doğrulama Mesh (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Doğrulama Mesh (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Doğrulama Mesh (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Doğrulama Mesh (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Özel Mesh Doğrulama"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 Isıtma Tablası"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 Isıtma Memesi"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 95f19746a58c..55e0eb4d3f9c 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -80,7 +80,7 @@ namespace Language_uk { #endif PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); @@ -88,42 +88,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Нагрів ") PREHEAT_2_LABEL; - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Нагрів ") PREHEAT_2_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Нагрів ") PREHEAT_2_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Нагрів ") PREHEAT_3_LABEL; - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Нагрів ") PREHEAT_3_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Нагрів ") PREHEAT_3_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Нагрів ") PREHEAT_4_LABEL; - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Нагрів ") PREHEAT_4_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Нагрів ") PREHEAT_4_LABEL _UxGT(" налашт"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Нагрів ") PREHEAT_5_LABEL; - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Нагрів ") PREHEAT_5_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Нагрів ") PREHEAT_5_LABEL _UxGT(" налашт"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Нагрів $ сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Нагрів $ все"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Нагрів $ стіл"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Нагрів $ налашт"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Нагрів Свій"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Вимкнути нагрів"); @@ -216,40 +188,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_MESH_EDIT = _UxGT("Редагування сітки"); PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Будувати сітку ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Будувати сітку ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Будувати сітку ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Будувати сітку ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Будувати сітку ") PREHEAT_5_LABEL; + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Висота"); PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Підтвердити сітку"); - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Підтвердити ") PREHEAT_1_LABEL; - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Підтвердити ") PREHEAT_2_LABEL; - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Підтвердити ") PREHEAT_3_LABEL; - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Підтвердити ") PREHEAT_4_LABEL; - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Підтвердити ") PREHEAT_5_LABEL; - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Підтвердити свою"); PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 нагрів столу"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 нагрів сопла"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 99988bf885fa..9d0ba7e21346 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -65,7 +65,7 @@ namespace Language_vi { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Đặt bù đắp nhà"); // Set home offsets PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); @@ -73,42 +73,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("Làm nóng ") PREHEAT_2_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("Làm nóng ") PREHEAT_3_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("Làm nóng ") PREHEAT_4_LABEL _UxGT(" Cấu hình"); // conf - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("Làm nóng ") PREHEAT_5_LABEL _UxGT(" Cấu hình"); // conf + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Làm nóng $ Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Làm nóng $ Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Làm nóng $ Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Làm nóng $ Cấu hình"); // conf #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Sự nóng trước tự chọn"); // Preheat Custom PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Nguội xuống"); // Cooldown @@ -155,40 +127,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Chỉnh sửa xong lưới"); // Done Editing Mesh PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Xây dựng lưới tự chọn"); // Build Custom Mesh PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Xây dựng lưới"); // Build Mesh - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("Xây dựng lưới (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("Xây dựng lưới (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("Xây dựng lưới (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("Xây dựng lưới (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("Xây dựng lưới (") PREHEAT_5_LABEL _UxGT(")"); + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Xây dựng lưới ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Thẩm tra lưới ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Xây dựng lưới lạnh"); // Build cold mesh PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Điều chỉnh chiều cao lưới"); // Adjust Mesh Height PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Số lượng chiều cao"); // Height Amount PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("Thẩm tra lưới"); // Validate Mesh - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("Thẩm tra lưới (") PREHEAT_1_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("Thẩm tra lưới (") PREHEAT_2_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("Thẩm tra lưới (") PREHEAT_3_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("Thẩm tra lưới (") PREHEAT_4_LABEL _UxGT(")"); - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("Thẩm tra lưới (") PREHEAT_5_LABEL _UxGT(")"); - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("Thẩm tra lưới tự chọn"); // validate custom mesh PROGMEM Language_Str MSG_UBL_CONTINUE_MESH = _UxGT("Tiếp tục xây lưới bàn"); // Continue Bed Mesh PROGMEM Language_Str MSG_UBL_MESH_LEVELING = _UxGT("Đang san lấp lưới"); // Mesh Leveling diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 18797055dea9..512d77aa2211 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -69,7 +69,7 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("设置原点偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " @@ -77,42 +77,14 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("预热 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("预热 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 热床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("预热 ") PREHEAT_2_LABEL _UxGT(" 设置"); //MSG_PREHEAT_2 " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("预热 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("预热 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 热床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("预热 ") PREHEAT_3_LABEL _UxGT(" 设置"); //MSG_PREHEAT_3 " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("预热 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("预热 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 热床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("预热 ") PREHEAT_4_LABEL _UxGT(" 设置"); //MSG_PREHEAT_4 " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("预热 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("预热 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 热床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("预热 ") PREHEAT_5_LABEL _UxGT(" 设置"); //MSG_PREHEAT_5 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -176,40 +148,14 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("创设 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Build PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("创设 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Build PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("创设 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Build PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("创设 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Build PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("创设 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Build PREHEAT_5_LABEL Mesh" + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合计"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准网格"); // "Validate Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 网格"); // "Validate PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 网格"); // "Validate PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 网格"); // "Validate PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 网格"); // "Validate PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 网格"); // "Validate PREHEAT_5_LABEL Mesh" - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客户网格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26加热热床"); PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26加热喷嘴"); diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 0f37bcd30e09..efc9b570bbcb 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -68,7 +68,7 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("設置原點偏移"); //"Set home offsets" PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" - #ifdef PREHEAT_1_LABEL + #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " @@ -76,42 +76,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_PREHEAT_2 = _UxGT("預熱 ") PREHEAT_2_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_H = _UxGT("預熱 ") PREHEAT_2_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_2_END = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_END_E = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_2 " " - PROGMEM Language_Str MSG_PREHEAT_2_ALL = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 全部"); //MSG_PREHEAT_2 " All" - PROGMEM Language_Str MSG_PREHEAT_2_BEDONLY = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_2 " Bed" - PROGMEM Language_Str MSG_PREHEAT_2_SETTINGS = _UxGT("預熱 ") PREHEAT_2_LABEL _UxGT(" 設置"); //MSG_PREHEAT_2 " conf" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_PREHEAT_3 = _UxGT("預熱 ") PREHEAT_3_LABEL; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_H = _UxGT("預熱 ") PREHEAT_3_LABEL " ~"; //"Preheat PREHEAT_3_LABEL" - PROGMEM Language_Str MSG_PREHEAT_3_END = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_END_E = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_3 " " - PROGMEM Language_Str MSG_PREHEAT_3_ALL = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 全部"); //MSG_PREHEAT_3 " All" - PROGMEM Language_Str MSG_PREHEAT_3_BEDONLY = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_3 " Bed" - PROGMEM Language_Str MSG_PREHEAT_3_SETTINGS = _UxGT("預熱 ") PREHEAT_3_LABEL _UxGT(" 設置"); //MSG_PREHEAT_3 " conf" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_PREHEAT_4 = _UxGT("預熱 ") PREHEAT_4_LABEL; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_H = _UxGT("預熱 ") PREHEAT_4_LABEL " ~"; //"Preheat PREHEAT_4_LABEL" - PROGMEM Language_Str MSG_PREHEAT_4_END = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_END_E = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_4 " " - PROGMEM Language_Str MSG_PREHEAT_4_ALL = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 全部"); //MSG_PREHEAT_4 " All" - PROGMEM Language_Str MSG_PREHEAT_4_BEDONLY = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_4 " Bed" - PROGMEM Language_Str MSG_PREHEAT_4_SETTINGS = _UxGT("預熱 ") PREHEAT_4_LABEL _UxGT(" 設置"); //MSG_PREHEAT_4 " conf" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_PREHEAT_5 = _UxGT("預熱 ") PREHEAT_5_LABEL; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_H = _UxGT("預熱 ") PREHEAT_5_LABEL " ~"; //"Preheat PREHEAT_5_LABEL" - PROGMEM Language_Str MSG_PREHEAT_5_END = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_END_E = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_5 " " - PROGMEM Language_Str MSG_PREHEAT_5_ALL = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 全部"); //MSG_PREHEAT_5 " All" - PROGMEM Language_Str MSG_PREHEAT_5_BEDONLY = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_5 " Bed" - PROGMEM Language_Str MSG_PREHEAT_5_SETTINGS = _UxGT("預熱 ") PREHEAT_5_LABEL _UxGT(" 設置"); //MSG_PREHEAT_5 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("預熱 $ 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("預熱 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("預熱 $ 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("預熱 $ 設置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("自定預熱"); //"Preheat Custom" PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降溫"); //"Cooldown" @@ -174,40 +146,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("完成編輯網格"); // "Done Editing Mesh" PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("創設客戶網格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("創設網格"); // "Build Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M1 = _UxGT("創設 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Build PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M2 = _UxGT("創設 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Build PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M3 = _UxGT("創設 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Build PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M4 = _UxGT("創設 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Build PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M5 = _UxGT("創設 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Build PREHEAT_5_LABEL Mesh" + #if PREHEAT_COUNT + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("創設 $ 網格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 網格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("創設冷網格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("調整網格高度"); // "Adjust Mesh Height" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("高度合計"); // "Height Amount" PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_MENU = _UxGT("批准網格"); // "Validate Mesh" - #ifdef PREHEAT_1_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M1 = _UxGT("批准 ") PREHEAT_1_LABEL _UxGT(" 網格"); // "Validate PREHEAT_1_LABEL Mesh" - #endif - #ifdef PREHEAT_2_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M2 = _UxGT("批准 ") PREHEAT_2_LABEL _UxGT(" 網格"); // "Validate PREHEAT_2_LABEL Mesh" - #endif - #ifdef PREHEAT_3_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M3 = _UxGT("批准 ") PREHEAT_3_LABEL _UxGT(" 網格"); // "Validate PREHEAT_3_LABEL Mesh" - #endif - #ifdef PREHEAT_4_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M4 = _UxGT("批准 ") PREHEAT_4_LABEL _UxGT(" 網格"); // "Validate PREHEAT_4_LABEL Mesh" - #endif - #ifdef PREHEAT_5_LABEL - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M5 = _UxGT("批准 ") PREHEAT_5_LABEL _UxGT(" 網格"); // "Validate PREHEAT_5_LABEL Mesh" - #endif PROGMEM Language_Str MSG_UBL_VALIDATE_CUSTOM_MESH = _UxGT("批准客戶網格"); // "Validate Custom Mesh" PROGMEM Language_Str MSG_G26_HEATING_BED = _UxGT("G26 加熱熱床"); //"G26 Heating Bed" PROGMEM Language_Str MSG_G26_HEATING_NOZZLE = _UxGT("G26 加熱噴嘴"); //"G26 Heating Nozzle" diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index d1c0c02cdb75..771bd86b9d3f 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -35,7 +35,7 @@ * lcd_put_u8str_ind_P * Print a string with an index substituted within it */ -lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen/*=LCD_WIDTH*/) { +lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) { uint8_t *p = (uint8_t*)pstr; lcd_uint_t n = maxlen; for (; n; n--) { @@ -57,6 +57,9 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uin if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n); break; } + else if (ch == '$') + n -= lcd_put_u8str_max_P(inStr, n); + lcd_put_wchar(ch); } return n; diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h index ba938b52d752..5dca046011b4 100644 --- a/Marlin/src/lcd/lcdprint.h +++ b/Marlin/src/lcd/lcdprint.h @@ -71,10 +71,10 @@ inline int lcd_put_u8str_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P con return lcd_put_u8str_P(pstr); } -lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH); -inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, const lcd_uint_t maxlen=LCD_WIDTH) { +lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH); +inline lcd_uint_t lcd_put_u8str_ind_P(const lcd_uint_t col, const lcd_uint_t row, PGM_P const pstr, const int8_t ind, PGM_P const inStr=nullptr, const lcd_uint_t maxlen=LCD_WIDTH) { lcd_moveto(col, row); - return lcd_put_u8str_ind_P(pstr, ind, maxlen); + return lcd_put_u8str_ind_P(pstr, ind, inStr, maxlen); } inline int lcd_put_u8str(const char* str) { return lcd_put_u8str_max(str, PIXEL_LEN_NOLIMIT); } diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp index 7c384f161847..676b2d0a430b 100644 --- a/Marlin/src/lcd/menu/menu.cpp +++ b/Marlin/src/lcd/menu/menu.cpp @@ -62,6 +62,7 @@ menuPosition screen_history[6]; uint8_t screen_history_depth = 0; int8_t MenuItemBase::itemIndex; // Index number for draw and action +PGM_P MenuItemBase::itemString; // A PSTR for substitution chimera_t editable; // Value Editing // Menu Edit Items diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index 6e916898b999..9d045d33e365 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -63,12 +63,14 @@ typedef void (*selectFunc_t)(); class MenuItemBase { public: - // An index to interject in the item label and for - // use by the action + // Index to interject in the item label and/or for use by its action. static int8_t itemIndex; + // An optional pointer for use in display or by the action + static PGM_P itemString; + // Store the index of the item ahead of use by indexed items - FORCE_INLINE static void init(const int8_t ind) { itemIndex = ind; } + FORCE_INLINE static void init(const int8_t ind=0, PGM_P const pstr=nullptr) { itemIndex = ind; itemString = pstr; } // Draw an item either selected (pre_char) or not (space) with post_char static void _draw(const bool sel, const uint8_t row, PGM_P const pstr, const char pre_char, const char post_char); @@ -221,7 +223,7 @@ class MenuEditItemBase : public MenuItemBase { public: // Implemented for HD44780 and DOGM // Draw the current item at specified row with edit data - static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const data, const bool pgm=false); + static void draw(const bool sel, const uint8_t row, PGM_P const pstr, const char* const inStr, const bool pgm=false); // Implemented for HD44780 and DOGM // This low-level method is good to draw from anywhere @@ -403,15 +405,15 @@ class MenuItem_bool : public MenuEditItemBase { */ #define _MENU_INNER_P(TYPE, USE_MULTIPLIER, PLABEL, V...) do { \ - PGM_P const plabel = PLABEL; \ - if (encoderLine == _thisItemNr && ui.use_click()) { \ - _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \ - MenuItem_##TYPE::action(plabel, ##V); \ - if (ui.screen_changed) return; \ - } \ - if (ui.should_draw()) \ - MenuItem_##TYPE::draw \ - (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \ + PGM_P const plabel = PLABEL; \ + if (encoderLine == _thisItemNr && ui.use_click()) { \ + _MENU_ITEM_MULTIPLIER_CHECK(USE_MULTIPLIER); \ + MenuItem_##TYPE::action(plabel, ##V); \ + if (ui.screen_changed) return; \ + } \ + if (ui.should_draw()) \ + MenuItem_##TYPE::draw \ + (encoderLine == _thisItemNr, _lcdLineNr, plabel, ##V); \ }while(0) #define _MENU_ITEM_P(TYPE, V...) do { \ @@ -421,11 +423,31 @@ class MenuItem_bool : public MenuEditItemBase { NEXT_ITEM(); \ }while(0) +// Indexed items set a global index value and optional data +#define _MENU_ITEM_N_S_P(TYPE, N, S, V...) do{ \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::init(N, S); \ + _MENU_INNER_P(TYPE, ##V); \ + } \ + NEXT_ITEM(); \ +}while(0) + // Indexed items set a global index value #define _MENU_ITEM_N_P(TYPE, N, V...) do{ \ _skipStatic = false; \ if (_menuLineNr == _thisItemNr) { \ - MenuItemBase::init(N); \ + MenuItemBase::itemIndex = N; \ + _MENU_INNER_P(TYPE, ##V); \ + } \ + NEXT_ITEM(); \ +}while(0) + +// Items with a unique string +#define _MENU_ITEM_S_P(TYPE, S, V...) do{ \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::itemString = S; \ _MENU_INNER_P(TYPE, ##V); \ } \ NEXT_ITEM(); \ @@ -457,72 +479,91 @@ class MenuItem_bool : public MenuEditItemBase { NEXT_ITEM(); \ }while(0) -#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P( GET_TEXT(LABEL), ##V) -#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) - -#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) -#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - -#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V) -#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) - -#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) - -#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION) -#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) - -#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION) -#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION) - -#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES) -#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES) - -#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES) -#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES) - -#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) -#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) - -#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) -#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) - -#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) -#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) -#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) -#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) - -#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) -#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V) +#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) + +#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) +#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) + +#define MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, PLABEL, ##V) +#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, GET_TEXT(LABEL), ##V) +#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, 0, S, false, PLABEL, ##V) +#define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V) +#define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) + +#define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) + +#define ACTION_ITEM_N_S_P(N, S, PLABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, PLABEL, ACTION) +#define ACTION_ITEM_N_S(N, S, LABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_S_P(S, PLABEL, ACTION) MENU_ITEM_S_P(function, S, PLABEL, ACTION) +#define ACTION_ITEM_S(S, LABEL, ACTION) MENU_ITEM_S_P(function, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION) +#define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION) +#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) + +#define GCODES_ITEM_N_S_P(N, S, PLABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, PLABEL, GCODES) +#define GCODES_ITEM_N_S(N, S, LABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_S_P(S, PLABEL, GCODES) MENU_ITEM_S_P(gcode, S, PLABEL, GCODES) +#define GCODES_ITEM_S(S, LABEL, GCODES) GCODES_ITEM_S_P(S, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES) +#define GCODES_ITEM_N(N, LABEL, GCODES) GCODES_ITEM_N_P(N, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_P(PLABEL, GCODES) MENU_ITEM_P(gcode, PLABEL, GCODES) +#define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES) + +#define SUBMENU_N_S_P(N, S, PLABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST) +#define SUBMENU_N_S(N, S, LABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, GET_TEXT(LABEL), DEST) +#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) +#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) +#define SUBMENU_S_P(S, PLABEL, DEST) MENU_ITEM_S_P(submenu, S, PLABEL, DEST) +#define SUBMENU_S(S, LABEL, DEST) SUBMENU_S_P(S, GET_TEXT(LABEL), DEST) +#define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) +#define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) + +#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) +#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) + +#define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V) +#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) +#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) + +#define EDIT_ITEM_FAST_N_S_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N_S(TYPE, N, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) +#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) + +#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \ + if (encoderLine == _thisItemNr && ui.use_click()) { \ + ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \ + return; \ + } \ + if (ui.should_draw()) MenuItem_confirm::draw \ + (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \ +}while(0) -#define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \ - if (encoderLine == _thisItemNr && ui.use_click()) { \ - ui.goto_screen([]{MenuItem_confirm::select_screen(V);}); \ - return; \ - } \ - if (ui.should_draw()) MenuItem_confirm::draw \ - (encoderLine == _thisItemNr, _lcdLineNr, PLABEL, ##V); \ +// Indexed items set a global index value and optional data +#define _CONFIRM_ITEM_P(PLABEL, V...) do { \ + _skipStatic = false; \ + if (_menuLineNr == _thisItemNr) \ + _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \ + NEXT_ITEM(); \ }while(0) -#define _CONFIRM_ITEM_P(PLABEL, V...) do { \ +// Indexed items set a global index value +#define _CONFIRM_ITEM_N_S_P(N, S, V...) do{ \ _skipStatic = false; \ - if (_menuLineNr == _thisItemNr) \ - _CONFIRM_ITEM_INNER_P(PLABEL, ##V); \ + if (_menuLineNr == _thisItemNr) { \ + MenuItemBase::init(N, S); \ + _CONFIRM_ITEM_INNER_P(TYPE, ##V); \ + } \ NEXT_ITEM(); \ }while(0) // Indexed items set a global index value -#define _CONFIRM_ITEM_N_P(N, V...) do{ \ - _skipStatic = false; \ - if (_menuLineNr == _thisItemNr) { \ - MenuItemBase::init(N); \ - _CONFIRM_ITEM_INNER_P(TYPE, ##V); \ - } \ - NEXT_ITEM(); \ -}while(0) +#define _CONFIRM_ITEM_N_P(N, V...) _CONFIRM_ITEM_N_S_P(N, nullptr, V) #define CONFIRM_ITEM_P(PLABEL,A,B,V...) _CONFIRM_ITEM_P(PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM(LABEL, V...) CONFIRM_ITEM_P(GET_TEXT(LABEL), ##V) @@ -530,9 +571,11 @@ class MenuItem_bool : public MenuEditItemBase { #define YESNO_ITEM_P(PLABEL, V...) _CONFIRM_ITEM_P(PLABEL, ##V) #define YESNO_ITEM(LABEL, V...) YESNO_ITEM_P(GET_TEXT(LABEL), ##V) +#define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) #define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V) +#define YESNO_ITEM_N_S_P(N,S,PLABEL, V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, ##V) #define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V) #define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V) diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp index 6865140cb155..e87158fbd08c 100644 --- a/Marlin/src/lcd/menu/menu_configuration.cpp +++ b/Marlin/src/lcd/menu/menu_configuration.cpp @@ -300,11 +300,12 @@ void menu_advanced_settings(); #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) - void _menu_configuration_preheat_settings(const uint8_t m) { + void _menu_configuration_preheat_settings() { #define _MINTEMP_ITEM(N) HEATER_##N##_MINTEMP, #define _MAXTEMP_ITEM(N) HEATER_##N##_MAXTEMP, #define MINTEMP_ALL _MIN(REPEAT(HOTENDS, _MINTEMP_ITEM) 999) #define MAXTEMP_ALL _MAX(REPEAT(HOTENDS, _MAXTEMP_ITEM) 0) + const uint8_t m = MenuItemBase::itemIndex; START_MENU(); BACK_ITEM(MSG_CONFIGURATION); #if HAS_FAN @@ -323,20 +324,6 @@ void menu_advanced_settings(); END_MENU(); } - void menu_preheat_material1_settings() { _menu_configuration_preheat_settings(1-1); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_material2_settings() { _menu_configuration_preheat_settings(2-1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_material3_settings() { _menu_configuration_preheat_settings(3-1); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_material4_settings() { _menu_configuration_preheat_settings(4-1); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_material5_settings() { _menu_configuration_preheat_settings(5-1); } - #endif - #endif - #endif - #endif - #endif void menu_configuration() { @@ -416,19 +403,8 @@ void menu_configuration() { // Preheat configurations #if PREHEAT_COUNT && DISABLED(SLIM_LCD_MENUS) - SUBMENU(MSG_PREHEAT_1_SETTINGS, menu_preheat_material1_settings); - #if PREHEAT_COUNT >= 2 - SUBMENU(MSG_PREHEAT_2_SETTINGS, menu_preheat_material2_settings); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3_SETTINGS, menu_preheat_material3_settings); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4_SETTINGS, menu_preheat_material4_settings); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5_SETTINGS, menu_preheat_material5_settings); - #endif - #endif - #endif - #endif + LOOP_L_N(m, PREHEAT_COUNT) + SUBMENU_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M_SETTINGS, _menu_configuration_preheat_settings); #endif #if ENABLED(EEPROM_SETTINGS) diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp index 1c7abba6d4ce..90639c3af521 100644 --- a/Marlin/src/lcd/menu/menu_filament.cpp +++ b/Marlin/src/lcd/menu/menu_filament.cpp @@ -55,13 +55,21 @@ inline PGM_P _change_filament_command() { } // Initiate Filament Load/Unload/Change at the specified temperature -static void _change_filament(const uint16_t celsius) { +static void _change_filament_with_temp(const uint16_t celsius) { char cmd[11]; sprintf_P(cmd, _change_filament_command(), _change_filament_extruder); thermalManager.setTargetHotend(celsius, _change_filament_extruder); queue.inject(cmd); } +static void _change_filament_with_preset() { + _change_filament_with_temp(ui.material_preset[MenuItemBase::itemIndex].hotend_temp); +} + +static void _change_filament_with_custom() { + _change_filament_with_temp(thermalManager.temp_hotend[MenuItemBase::itemIndex].target); +} + // // Menu to choose the temperature and start Filament Change // @@ -81,11 +89,14 @@ void _menu_temp_filament_op(const PauseMode mode, const int8_t extruder) { START_MENU(); if (LCD_HEIGHT >= 4) STATIC_ITEM_P(change_filament_header(mode), SS_CENTER|SS_INVERT); BACK_ITEM(MSG_BACK); - ACTION_ITEM(MSG_PREHEAT_1, []{ _change_filament(ui.material_preset[0].hotend_temp); }); - ACTION_ITEM(MSG_PREHEAT_2, []{ _change_filament(ui.material_preset[1].hotend_temp); }); - EDIT_ITEM_FAST(int3, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[_change_filament_extruder].target, EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, []{ - _change_filament(thermalManager.temp_hotend[_change_filament_extruder].target); - }); + #if PREHEAT_COUNT + LOOP_L_N(m, PREHEAT_COUNT) + ACTION_ITEM_N_S(m, ui.get_preheat_label(m), MSG_PREHEAT_M, _change_filament_with_preset); + #endif + EDIT_ITEM_FAST_N(int3, extruder, MSG_PREHEAT_CUSTOM, &thermalManager.temp_hotend[extruder].target, + EXTRUDE_MINTEMP, thermalManager.heater_maxtemp[extruder] - HOTEND_OVERSHOOT, + _change_filament_with_custom + ); END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp index 90a3ad240201..46f48e22fa52 100644 --- a/Marlin/src/lcd/menu/menu_temperature.cpp +++ b/Marlin/src/lcd/menu/menu_temperature.cpp @@ -82,81 +82,56 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i // Indexed "Preheat ABC" and "Heat Bed" items #define PREHEAT_ITEMS(M,E) do{ \ - ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_both(M, MenuItemBase::itemIndex); }); \ - ACTION_ITEM_N_P(E, msg_preheat_end_e[M], []{ _preheat_end(M, MenuItemBase::itemIndex); }); \ + ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_both(M, MenuItemBase::itemIndex); }); \ + ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_END_E, []{ _preheat_end(M, MenuItemBase::itemIndex); }); \ }while(0) #elif HAS_MULTI_HOTEND // No heated bed, so just indexed "Preheat ABC" items - #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_P(E, msg_preheat_h[M], []{ _preheat_end(M, MenuItemBase::itemIndex); }) + #define PREHEAT_ITEMS(M,E) ACTION_ITEM_N_S(E, ui.get_preheat_label(M), MSG_PREHEAT_M_H, []{ _preheat_end(M, MenuItemBase::itemIndex); }) #endif - void menu_preheat_m(const uint8_t m) { + void do_preheat_end_m() { _preheat_end(editable.int8, 0); } - #if HOTENDS == 1 - PGM_P msg_preheat[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1), GET_TEXT(MSG_PREHEAT_2), GET_TEXT(MSG_PREHEAT_3), GET_TEXT(MSG_PREHEAT_4), GET_TEXT(MSG_PREHEAT_5)); - #if HAS_HEATED_BED - PGM_P msg_preheat_end[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END), GET_TEXT(MSG_PREHEAT_2_END), GET_TEXT(MSG_PREHEAT_3_END), GET_TEXT(MSG_PREHEAT_4_END), GET_TEXT(MSG_PREHEAT_5_END)); - #endif - #elif HAS_MULTI_HOTEND - PGM_P msg_preheat_all[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_ALL), GET_TEXT(MSG_PREHEAT_2_ALL), GET_TEXT(MSG_PREHEAT_3_ALL), GET_TEXT(MSG_PREHEAT_4_ALL), GET_TEXT(MSG_PREHEAT_5_ALL)); - #endif - - #if HAS_TEMP_HOTEND && HAS_HEATED_BED && HAS_MULTI_HOTEND - PGM_P msg_preheat_end_e[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_END_E), GET_TEXT(MSG_PREHEAT_2_END_E), GET_TEXT(MSG_PREHEAT_3_END_E), GET_TEXT(MSG_PREHEAT_4_END_E), GET_TEXT(MSG_PREHEAT_5_END_E)); - #endif + #if HAS_MULTI_HOTEND || HAS_HEATED_BED - #if HAS_MULTI_HOTEND - PGM_P msg_preheat_h[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_H), GET_TEXT(MSG_PREHEAT_2_H), GET_TEXT(MSG_PREHEAT_3_H), GET_TEXT(MSG_PREHEAT_4_H), GET_TEXT(MSG_PREHEAT_5_H)); - #endif + // Set editable.int8 to the Material index before entering this menu + // because MenuItemBase::itemIndex will be re-used by PREHEAT_ITEMS + void menu_preheat_m() { + const uint8_t m = editable.int8; // Don't re-use 'editable' in this menu - MenuItemBase::itemIndex = m; + START_MENU(); + BACK_ITEM(MSG_TEMPERATURE); - START_MENU(); - BACK_ITEM(MSG_TEMPERATURE); + #if HOTENDS == 1 - #if HOTENDS == 1 + #if HAS_HEATED_BED + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, []{ _preheat_both(editable.int8, 0); }); + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_END, do_preheat_end_m); + #else + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m); + #endif - #if HAS_HEATED_BED - ACTION_ITEM_P(msg_preheat[m], []{ _preheat_both(MenuItemBase::itemIndex, 0); }); - ACTION_ITEM_P(msg_preheat_end[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); }); - #else - ACTION_ITEM_P(msg_preheat[m], []{ _preheat_end(MenuItemBase::itemIndex, 0); }); - #endif + #elif HAS_MULTI_HOTEND - #elif HAS_MULTI_HOTEND + HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e); + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() { + TERN_(HAS_HEATED_BED, []{ _preheat_bed(editable.int8); }); + HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[editable.int8].hotend_temp, e); + }); - LOOP_S_L_N(n, 0, HOTENDS) PREHEAT_ITEMS(MenuItemBase::itemIndex, n); - ACTION_ITEM_P(msg_preheat_all[m], []() { - TERN_(HAS_HEATED_BED, _preheat_bed(MenuItemBase::itemIndex)); - HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[MenuItemBase::itemIndex].hotend_temp, e); - }); + #endif - #endif + #if HAS_HEATED_BED + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_BEDONLY, []{ _preheat_bed(editable.int8); }); + #endif - #if HAS_HEATED_BED - PGM_P msg_preheat_bed[] = ARRAY_N(PREHEAT_COUNT, GET_TEXT(MSG_PREHEAT_1_BEDONLY), GET_TEXT(MSG_PREHEAT_2_BEDONLY), GET_TEXT(MSG_PREHEAT_3_BEDONLY), GET_TEXT(MSG_PREHEAT_4_BEDONLY), GET_TEXT(MSG_PREHEAT_5_BEDONLY)); - ACTION_ITEM_P(msg_preheat_bed[m], []{ _preheat_bed(MenuItemBase::itemIndex); }); - #endif + END_MENU(); + } - END_MENU(); - } - - void menu_preheat_m1() { menu_preheat_m(0); } - #if PREHEAT_COUNT >= 2 - void menu_preheat_m2() { menu_preheat_m(1); } - #if PREHEAT_COUNT >= 3 - void menu_preheat_m3() { menu_preheat_m(2); } - #if PREHEAT_COUNT >= 4 - void menu_preheat_m4() { menu_preheat_m(3); } - #if PREHEAT_COUNT >= 5 - void menu_preheat_m5() { menu_preheat_m(4); } - #endif - #endif - #endif - #endif + #endif // HAS_MULTI_HOTEND || HAS_HEATED_BED #endif // PREHEAT_COUNT @@ -171,9 +146,11 @@ void Temperature::lcd_preheat(const int16_t e, const int8_t indh, const int8_t i #endif // HAS_TEMP_HOTEND || HAS_HEATED_BED void menu_temperature() { - #if HAS_TEMP_HOTEND + #if HAS_TEMP_HOTEND || HAS_HEATED_BED bool has_heat = false; - HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; } + #if HAS_TEMP_HOTEND + HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; } + #endif #endif START_MENU(); @@ -285,48 +262,27 @@ void menu_temperature() { #endif // HAS_FAN - // - // Preheat for Materials 1 to 5 - // - #ifdef PREHEAT_COUNT - - #if HOTENDS > 1 || HAS_HEATED_BED - SUBMENU(MSG_PREHEAT_1, menu_preheat_m1); - #if PREHEAT_COUNT >= 2 - SUBMENU(MSG_PREHEAT_2, menu_preheat_m2); - #if PREHEAT_COUNT >= 3 - SUBMENU(MSG_PREHEAT_3, menu_preheat_m3); - #if PREHEAT_COUNT >= 4 - SUBMENU(MSG_PREHEAT_4, menu_preheat_m4); - #if PREHEAT_COUNT >= 5 - SUBMENU(MSG_PREHEAT_5, menu_preheat_m5); - #endif - #endif - #endif - #endif - #else - ACTION_ITEM(MSG_PREHEAT_1, []{ _preheat_end(1-1, 0); }); - #if PREHEAT_COUNT >= 2 - ACTION_ITEM(MSG_PREHEAT_2, []{ _preheat_end(2-1, 0); }); - #if PREHEAT_COUNT >= 3 - ACTION_ITEM(MSG_PREHEAT_3, []{ _preheat_end(3-1, 0); }); - #if PREHEAT_COUNT >= 4 - ACTION_ITEM(MSG_PREHEAT_4, []{ _preheat_end(4-1, 0); }); - #if PREHEAT_COUNT >= 5 - ACTION_ITEM(MSG_PREHEAT_5, []{ _preheat_end(5-1, 0); }); - #endif - #endif - #endif + #if PREHEAT_COUNT + // + // Preheat for Materials 1 to 5 + // + LOOP_L_N(m, PREHEAT_COUNT) { + editable.int8 = m; + #if HOTENDS > 1 || HAS_HEATED_BED + SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m); + #else + ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m); #endif - #endif + } + #endif + #if HAS_TEMP_HOTEND || HAS_HEATED_BED // // Cooldown // if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true; if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown); - - #endif // PREHEAT_COUNT + #endif END_MENU(); } diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp index 9e9fd8ee2842..3eeee14d4de9 100644 --- a/Marlin/src/lcd/menu/menu_ubl.cpp +++ b/Marlin/src/lcd/menu/menu_ubl.cpp @@ -206,21 +206,21 @@ void _lcd_ubl_edit_mesh() { #if PREHEAT_COUNT #if HAS_HEATED_BED #define VALIDATE_MESH_GCODE_ITEM(M) \ - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P I" STRINGIFY(DECREMENT(M)))) + GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P I" STRINGIFY(M))) #else #define VALIDATE_MESH_GCODE_ITEM(M) \ - GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M##M, PSTR("G28\nG26 C P B0 I" STRINGIFY(DECREMENT(M)))) + GCODES_ITEM_N_S(M, ui.get_preheat_label(M), MSG_UBL_VALIDATE_MESH_M, PSTR("G28\nG26 C P B0 I" STRINGIFY(M))) #endif - VALIDATE_MESH_GCODE_ITEM(1); - #if PREHEAT_COUNT >= 2 - VALIDATE_MESH_GCODE_ITEM(2); - #if PREHEAT_COUNT >= 3 - VALIDATE_MESH_GCODE_ITEM(3); - #if PREHEAT_COUNT >= 4 - VALIDATE_MESH_GCODE_ITEM(4); - #if PREHEAT_COUNT >= 5 - VALIDATE_MESH_GCODE_ITEM(5); + VALIDATE_MESH_GCODE_ITEM(0); + #if PREHEAT_COUNT > 1 + VALIDATE_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT > 2 + VALIDATE_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT > 3 + VALIDATE_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT > 4 + VALIDATE_MESH_GCODE_ITEM(4); #endif #endif #endif @@ -321,37 +321,34 @@ void _lcd_ubl_build_mesh() { BACK_ITEM(MSG_UBL_TOOLS); #if PREHEAT_COUNT #if HAS_HEATED_BED - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ - "G28\n" \ - "M190 I" STRINGIFY(DECREMENT(M)) "\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ - "G29 P1\n" \ - "M104 S0\n" \ - "M140 S0" \ - )) + #define PREHEAT_BED_GCODE(M) "M190 I" STRINGIFY(M) "\n" #else - #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM(MSG_UBL_BUILD_MESH_M##M, PSTR( \ - "G28\n" \ - "M109 I" STRINGIFY(DECREMENT(M)) "\n" \ - "G29 P1\n" \ - "M104 S0" \ - )) + #define PREHEAT_BED_GCODE(M) "" #endif - - BUILD_MESH_GCODE_ITEM(1); - #if PREHEAT_COUNT >= 2 - BUILD_MESH_GCODE_ITEM(2); - #if PREHEAT_COUNT >= 3 - BUILD_MESH_GCODE_ITEM(3); - #if PREHEAT_COUNT >= 4 - BUILD_MESH_GCODE_ITEM(4); - #if PREHEAT_COUNT >= 5 - BUILD_MESH_GCODE_ITEM(5); + #define BUILD_MESH_GCODE_ITEM(M) GCODES_ITEM_S(ui.get_preheat_label(M), MSG_UBL_BUILD_MESH_M, \ + PSTR( \ + "G28\n" \ + PREHEAT_BED_GCODE(M) \ + "M109 I" STRINGIFY(M) "\n" \ + "G29 P1\n" \ + "M104 S0\n" \ + "M140 S0" \ + ) ) + BUILD_MESH_GCODE_ITEM(0); + #if PREHEAT_COUNT > 1 + BUILD_MESH_GCODE_ITEM(1); + #if PREHEAT_COUNT > 2 + BUILD_MESH_GCODE_ITEM(2); + #if PREHEAT_COUNT > 3 + BUILD_MESH_GCODE_ITEM(3); + #if PREHEAT_COUNT > 4 + BUILD_MESH_GCODE_ITEM(4); #endif #endif #endif #endif #endif // PREHEAT_COUNT + SUBMENU(MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh); GCODES_ITEM(MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1")); SUBMENU(MSG_UBL_FILLIN_MESH, _menu_ubl_fillin); diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index d2033018a627..3f3406f358ff 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -86,10 +86,6 @@ MarlinUI ui; } #endif -#if PREHEAT_COUNT - preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load() -#endif - #if HAS_SPI_LCD #if HAS_GRAPHICAL_LCD @@ -153,6 +149,33 @@ millis_t MarlinUI::next_button_update_ms; // = 0 volatile int8_t encoderDiff; // Updated in update_buttons, added to encoderPosition every LCD update #endif +#if PREHEAT_COUNT + preheat_t MarlinUI::material_preset[PREHEAT_COUNT]; // Initialized by settings.load() + + PGM_P MarlinUI::get_preheat_label(const uint8_t m) { + #ifdef PREHEAT_1_LABEL + static PGMSTR(preheat_0_label, PREHEAT_1_LABEL); + #endif + #ifdef PREHEAT_2_LABEL + static PGMSTR(preheat_1_label, PREHEAT_2_LABEL); + #endif + #ifdef PREHEAT_3_LABEL + static PGMSTR(preheat_2_label, PREHEAT_3_LABEL); + #endif + #ifdef PREHEAT_4_LABEL + static PGMSTR(preheat_3_label, PREHEAT_4_LABEL); + #endif + #ifdef PREHEAT_5_LABEL + static PGMSTR(preheat_4_label, PREHEAT_5_LABEL); + #endif + + #define _PLBL(N) preheat_##N##_label, + static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = ARRAY_N(PREHEAT_COUNT, REPEAT(PREHEAT_COUNT, _PLBL)); + + return (PGM_P)pgm_read_ptr(&preheat_labels[m]); + } +#endif + #if ENABLED(SDSUPPORT) #include "../sd/cardreader.h" diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 6ebd43a37dd3..f46403c03a82 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -505,6 +505,7 @@ class MarlinUI { #if PREHEAT_COUNT static preheat_t material_preset[PREHEAT_COUNT]; + static PGM_P get_preheat_label(const uint8_t m); #endif #if HAS_LCD_MENU From 601fc3b5b16cc2ea4af2a5fa82bb72f6d2acc91e Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 10:53:03 +0200 Subject: [PATCH 45/55] Remove unused messages --- Marlin/src/inc/Conditionals_post.h | 2 +- Marlin/src/lcd/language/language_an.h | 8 ------- Marlin/src/lcd/language/language_bg.h | 8 ------- Marlin/src/lcd/language/language_ca.h | 8 ------- Marlin/src/lcd/language/language_cz.h | 12 ++-------- Marlin/src/lcd/language/language_da.h | 8 ------- Marlin/src/lcd/language/language_de.h | 14 +++--------- Marlin/src/lcd/language/language_el.h | 8 ------- Marlin/src/lcd/language/language_el_gr.h | 8 ------- Marlin/src/lcd/language/language_en.h | 8 ------- Marlin/src/lcd/language/language_es.h | 22 ++++++------------ Marlin/src/lcd/language/language_eu.h | 12 ++-------- Marlin/src/lcd/language/language_fi.h | 8 ------- Marlin/src/lcd/language/language_fr.h | 12 ++-------- Marlin/src/lcd/language/language_gl.h | 8 ------- Marlin/src/lcd/language/language_hr.h | 8 ------- Marlin/src/lcd/language/language_hu.h | 8 ------- Marlin/src/lcd/language/language_it.h | 12 ++-------- Marlin/src/lcd/language/language_jp_kana.h | 12 ++-------- Marlin/src/lcd/language/language_ko_KR.h | 5 ----- Marlin/src/lcd/language/language_nl.h | 8 ------- Marlin/src/lcd/language/language_pl.h | 8 ------- Marlin/src/lcd/language/language_pt.h | 8 ------- Marlin/src/lcd/language/language_pt_br.h | 12 ++-------- Marlin/src/lcd/language/language_ru.h | 10 +-------- Marlin/src/lcd/language/language_sk.h | 12 ++-------- Marlin/src/lcd/language/language_tr.h | 8 ------- Marlin/src/lcd/language/language_uk.h | 12 ++-------- Marlin/src/lcd/language/language_vi.h | 8 ------- Marlin/src/lcd/language/language_zh_CN.h | 26 ++++++++-------------- Marlin/src/lcd/language/language_zh_TW.h | 8 ------- 31 files changed, 37 insertions(+), 274 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 7b89c27e597e..6d9998b69290 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2128,7 +2128,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 324c5b2c0109..e691a5bc721a 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,14 +57,6 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index e7c497e7eb3c..f48281498554 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,14 +47,6 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 3eed7933c55d..3ccdda35c24c 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,14 +55,6 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 3796284f4ee5..8c204d99ea3c 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,14 +80,6 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); @@ -160,8 +152,8 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index fc69aa55c334..f6b667bd3391 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,14 +50,6 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 465f4c63845b..472f8f5bbdee 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,16 +65,8 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); @@ -144,8 +136,8 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index eb288ba8ab4b..30d3e94f8b95 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,14 +55,6 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index c79bca37d429..7b9782cc65c8 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,14 +56,6 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index d70b007c6e9e..3b7de3864066 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,14 +75,6 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index bd63e6479e52..6afcd05e6d79 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,21 +70,13 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. $ Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 35c4717a4057..0c926a170a60 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,14 +59,6 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); @@ -102,8 +94,8 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 8166fa3136bd..f5ca4c67f1c4 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,14 +46,6 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 72cbfcf3c137..e9fd8d154020 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,14 +71,6 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); @@ -150,8 +142,8 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 66187e8a6b72..ee77c0d8b23f 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,14 +73,6 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 24a1f1dcc701..edaf4fc2598b 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,14 +56,6 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index de38cb52dae6..807d7812dbab 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,14 +75,6 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 30dddbf254c8..bd6918fb63aa 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,14 +73,6 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); @@ -152,8 +144,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 8a74dcabba8d..3d1db604b60a 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,16 +64,8 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_n_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_n_LABEL PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index 7627a7d15565..e57c4c4acecb 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -56,11 +56,6 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 701f861217a6..4ac6defbdcb6 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,14 +56,6 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); - PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 9e77eb92d1c5..0d9aee31c245 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,14 +71,6 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 41bfdc741494..5ca9678671df 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,14 +55,6 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 49a336ce3ff1..d4c5836befa1 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,14 +70,6 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); @@ -136,8 +128,8 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 15d23e1326ed..2594e11faaa5 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,14 +79,6 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); @@ -188,7 +180,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку ($)"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index a4c47951f1b5..ba566733c63b 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,14 +75,6 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); @@ -154,8 +146,8 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 9ff62d70d636..8700f081c333 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,14 +76,6 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index 55e0eb4d3f9c..fb7632bd5aff 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,14 +81,6 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); @@ -189,8 +181,8 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index 9d0ba7e21346..e782f2c1f1c4 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,14 +66,6 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 512d77aa2211..b243538cc2db 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,21 +70,13 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" - - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_n_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_n_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_n " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_n " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_n " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_n " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_n " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -149,8 +141,8 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_n_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_n_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index efc9b570bbcb..2f44a925b9b6 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,14 +69,6 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" - PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " - PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" - PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" - PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " From 04ca1b82e587a1d4902b43a520f4331ac7c7e098 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:49:07 +0200 Subject: [PATCH 46/55] Revert "Remove unused messages" This reverts commit 1936c7f7db0d8e146f2075c62ec5b395ddb1a666. --- Marlin/src/inc/Conditionals_post.h | 2 +- Marlin/src/lcd/language/language_an.h | 8 +++++++ Marlin/src/lcd/language/language_bg.h | 8 +++++++ Marlin/src/lcd/language/language_ca.h | 8 +++++++ Marlin/src/lcd/language/language_cz.h | 12 ++++++++-- Marlin/src/lcd/language/language_da.h | 8 +++++++ Marlin/src/lcd/language/language_de.h | 14 +++++++++--- Marlin/src/lcd/language/language_el.h | 8 +++++++ Marlin/src/lcd/language/language_el_gr.h | 8 +++++++ Marlin/src/lcd/language/language_en.h | 8 +++++++ Marlin/src/lcd/language/language_es.h | 22 ++++++++++++------ Marlin/src/lcd/language/language_eu.h | 12 ++++++++-- Marlin/src/lcd/language/language_fi.h | 8 +++++++ Marlin/src/lcd/language/language_fr.h | 12 ++++++++-- Marlin/src/lcd/language/language_gl.h | 8 +++++++ Marlin/src/lcd/language/language_hr.h | 8 +++++++ Marlin/src/lcd/language/language_hu.h | 8 +++++++ Marlin/src/lcd/language/language_it.h | 12 ++++++++-- Marlin/src/lcd/language/language_jp_kana.h | 12 ++++++++-- Marlin/src/lcd/language/language_ko_KR.h | 5 +++++ Marlin/src/lcd/language/language_nl.h | 8 +++++++ Marlin/src/lcd/language/language_pl.h | 8 +++++++ Marlin/src/lcd/language/language_pt.h | 8 +++++++ Marlin/src/lcd/language/language_pt_br.h | 12 ++++++++-- Marlin/src/lcd/language/language_ru.h | 10 ++++++++- Marlin/src/lcd/language/language_sk.h | 12 ++++++++-- Marlin/src/lcd/language/language_tr.h | 8 +++++++ Marlin/src/lcd/language/language_uk.h | 12 ++++++++-- Marlin/src/lcd/language/language_vi.h | 8 +++++++ Marlin/src/lcd/language/language_zh_CN.h | 26 ++++++++++++++-------- Marlin/src/lcd/language/language_zh_TW.h | 8 +++++++ 31 files changed, 274 insertions(+), 37 deletions(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 6d9998b69290..7b89c27e597e 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2128,7 +2128,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index e691a5bc721a..324c5b2c0109 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -57,6 +57,14 @@ namespace Language_an { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establir orichen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precalentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index f48281498554..e7c497e7eb3c 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -47,6 +47,14 @@ namespace Language_bg { PROGMEM Language_Str MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Изходна точка"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Подгряване $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index 3ccdda35c24c..3eed7933c55d 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -55,6 +55,14 @@ namespace Language_ca { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Estableix origen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preescalfa $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 8c204d99ea3c..3796284f4ee5 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -80,6 +80,14 @@ namespace Language_cz { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastavit počátek"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahřát $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahřát $ end"); @@ -152,8 +160,8 @@ namespace Language_cz { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index f6b667bd3391..fc69aa55c334 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -50,6 +50,14 @@ namespace Language_da { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sæt origin"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end") + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Forvarm $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Forvarm $ end") diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 472f8f5bbdee..465f4c63845b 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -65,8 +65,16 @@ namespace Language_de { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Homeversatz aktiv"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" Bett Vorwärmen"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" Einstellungen"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen ~"); + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ Vorwärmen") " ~"; PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ Alles Vorwärmen"); @@ -136,8 +144,8 @@ namespace Language_de { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Eigenes Netz erst."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Netz erstellen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) Netz erstellen"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) Netz validieren"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ Netz erstellen"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ Netz validieren"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Netz erstellen kalt"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Netzhöhe einst."); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 30d3e94f8b95..eb288ba8ab4b 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -55,6 +55,14 @@ namespace Language_el { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); //SHORTEN PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" bed"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); //SHORTEN + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 7b9782cc65c8..c79bca37d429 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -56,6 +56,14 @@ namespace Language_el_gr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Εφαρμόστηκαν οι μετατοπίσεις"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ορισμός προέλευσης"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" όλα"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" κλίνη"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Προθέρμανση ") PREHEAT_1_LABEL _UxGT(" επιβεβαίωση"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Προθέρμανση $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Προθέρμανση $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Προθέρμανση $ End"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 3b7de3864066..d70b007c6e9e 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -75,6 +75,14 @@ namespace Language_en { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets Applied"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Set Origin"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preheat ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preheat ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" End ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" All"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preheat ") PREHEAT_1_LABEL _UxGT(" Conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preheat $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preheat $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preheat $ End"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 6afcd05e6d79..bd63e6479e52 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -70,13 +70,21 @@ namespace Language_es { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Establecer origen"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. $"); - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. $ ~"); - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. $ Fusor"); - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Fusor ~"); - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. $ Todo"); - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. $ Cama"); - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. $ Ajuste"); + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Precal. $"); + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Precal. $ ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Precal. $ Fusor"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Precal. $ Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Precal. $ Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Precal. $ Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Precal. $ Ajuste"); + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Precal. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Precal. ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor"); + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Fusor ~"); + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Ajuste"); #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("Precal. manual"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("Enfriar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 0c926a170a60..35c4717a4057 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -59,6 +59,14 @@ namespace Language_eu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsetak ezarrita"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Hasiera ipini"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Berotu ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Berotu ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Amaia ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Guztia"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ohea"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Berotu ") PREHEAT_1_LABEL _UxGT(" Ezarp."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Berotu $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Berotu $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Berotu $ Amaia"); @@ -94,8 +102,8 @@ namespace Language_eu { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Sarea editatzea eginda"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Sarea sortu"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("($) sarea sortu"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("($) sarea balioetsi"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("$ sarea sortu"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("$ sarea balioetsi"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Sare hotza sortu"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Sarearen altuera doitu"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index f5ca4c67f1c4..8166fa3136bd 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -46,6 +46,14 @@ namespace Language_fi { PROGMEM Language_Str MSG_AUTO_HOME = _UxGT("Aja referenssiin"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Aseta origo"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Esilämmitä ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Esilämmitä ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT("Suutin ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Kaikki"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Esilä. ") PREHEAT_1_LABEL _UxGT(" Alusta"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Esilämm. ") PREHEAT_1_LABEL _UxGT(" konf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Esilämmitä $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Esilämmitä $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Esilä. $Suutin"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index e9fd8d154020..72cbfcf3c137 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -71,6 +71,14 @@ namespace Language_fr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Régler origine"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" Tout"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" lit"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Régler préch. ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Préchauffage $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Préchauffage $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Préch. $ buse"); @@ -142,8 +150,8 @@ namespace Language_fr { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Créer grille ..."); PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Mesure à froid"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index ee77c0d8b23f..66187e8a6b72 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -73,6 +73,14 @@ namespace Language_gl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfases aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Fixar orixe"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Prequentar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Prequentar ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Todo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" Cama"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preque. ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Prequentar $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Prequentar $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preque. $ Bico"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index edaf4fc2598b..24a1f1dcc701 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -56,6 +56,14 @@ namespace Language_hr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets postavljeni"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Postavi ishodište"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Predgrij ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Predgrij ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Dizna ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Sve"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Predgrij ") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Predgrij $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Predgrij $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Predgrij $ Dizna"); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index 807d7812dbab..de38cb52dae6 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -75,6 +75,14 @@ namespace Language_hu { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Eltolás beállítva."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Eredeti Be"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Fütés ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Fütés ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Fej ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Mind"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Ágy"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Fütés ") PREHEAT_1_LABEL _UxGT(" Beáll"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Fütés $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Fütés $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Fütés $ Fej"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index bd6918fb63aa..30dddbf254c8 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -73,6 +73,14 @@ namespace Language_it { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Imposta Origine"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Preriscalda ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Preriscalda ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Ugello ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Tutto"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" Piatto"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Preris.") PREHEAT_1_LABEL _UxGT(" conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Preriscalda $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Preriscalda $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Preris.$ Ugello"); @@ -144,8 +152,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index 3d1db604b60a..8a74dcabba8d 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -64,8 +64,16 @@ namespace Language_jp_kana { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("オフセットガテキヨウサレマシタ"); // "Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("キジュンセット"); // "Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_n_LABEL - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_n_LABEL + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" ヨネツノズル"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" ヨネツノズル ~"); // " Nozzle" + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" スベテヨネツ"); // " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" ベッドヨネツ"); // " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" ヨネツセッテイ"); // " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ ヨネツ"); // "Preheat " PREHEAT_1_LABEL + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ ヨネツ ~"); // "Preheat " PREHEAT_1_LABEL PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ ヨネツノズル"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("$ ヨネツノズル ~"); // " Nozzle" PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("$ スベテヨネツ"); // " All" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index e57c4c4acecb..7627a7d15565 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -56,6 +56,11 @@ namespace Language_ko_KR { PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("다음 Point"); PROGMEM Language_Str MSG_LEVEL_BED_DONE = _UxGT("레벨링 완료!"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("예열하기 - ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("예열하기 - ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("예열하기 - ") PREHEAT_1_LABEL _UxGT(" 노즐 ~"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("예열하기 - $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("예열하기 - $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("예열하기 - $ 노즐"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index 4ac6defbdcb6..701f861217a6 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -56,6 +56,14 @@ namespace Language_nl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("H offset toegep."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nulpunt instellen"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" voorverwarmen"); + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" voorverw. ~"); + PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" voorverw. Einde"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" voorverw. Einde ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" voorverw. aan"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = PREHEAT_1_LABEL _UxGT(" voorverw. Bed"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = PREHEAT_1_LABEL _UxGT(" verw. conf"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("$ voorverwarmen"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("$ voorverw. ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("$ voorverw. Einde"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 0d9aee31c245..9e77eb92d1c5 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -71,6 +71,14 @@ namespace Language_pl { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Poz. zerowa ust."); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ustaw punkt zero"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Rozgrzej ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Rozgrzej ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" Dysza ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" wsz."); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" stół"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Rozgrzej ") PREHEAT_1_LABEL _UxGT(" ustaw."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Rozgrzej $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Rozgrzej $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Rozgrzej $ Dysza"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 5ca9678671df..41bfdc741494 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -55,6 +55,14 @@ namespace Language_pt { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Offsets aplicados"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Definir origem"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL _UxGT(" Bico ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" Tudo"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq. ") PREHEAT_1_LABEL _UxGT(" ") LCD_STR_THERMOMETER _UxGT("Base"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Definições ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Pre-aquecer $ Bico"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index d4c5836befa1..49a336ce3ff1 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -70,6 +70,14 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Alteração aplicada"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Ajustar Origem"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Pre-aquecer ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Extrusora ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Extrusora ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Pre-aq.Todo ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Pre-aq.Mesa ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ajustar ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Pre-aquecer $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Pre-aquecer $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Extrusora $"); @@ -128,8 +136,8 @@ namespace Language_pt_br { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Montar Malha Custom"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Montar "); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Montar $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Checar $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Montar Malha fria"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Ajustar Altura"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 2594e11faaa5..15d23e1326ed 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -79,6 +79,14 @@ namespace Language_ru { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Смещения применены"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Установить ноль"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Преднагрев ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрев ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" всё"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" стол"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрев ") PREHEAT_1_LABEL _UxGT(" правка"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Преднагрев $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрев $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрев $ сопло"); @@ -180,7 +188,7 @@ namespace Language_ru { PROGMEM Language_Str MSG_UBL_FINE_TUNE_MESH = _UxGT("Точная правка сетки"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Построить сетку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Построить сетку $"); #endif #if LCD_WIDTH > 21 PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Построить холодную сетку"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index ba566733c63b..a4c47951f1b5 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -75,6 +75,14 @@ namespace Language_sk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastavené"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Nastaviť začiatok"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Zahriať ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Zahriať ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" hotend ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" všetko"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" podlož"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Zahriať ") PREHEAT_1_LABEL _UxGT(" nast."); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Zahriať $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Zahriať $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Zahriať $ hotend"); @@ -146,8 +154,8 @@ namespace Language_sk { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastná sieť"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvoriť sieť"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Sieť bodov $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola siete $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená sieť bodov"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upraviť výšku siete"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 8700f081c333..9ff62d70d636 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -76,6 +76,14 @@ namespace Language_tr { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofset Tamam"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Sıfır Belirle"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Ön Isınma ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Ön Isınma ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Nozul ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tüm"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Tabla"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Ön Isınma ") PREHEAT_1_LABEL _UxGT(" Ayarlar"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Ön Isınma $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Ön Isınma $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Ön Isınma $ Nozul"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index fb7632bd5aff..55e0eb4d3f9c 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -81,6 +81,14 @@ namespace Language_uk { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Зміщення прийняті"); PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Встановити ноль"); #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Нагрів ") PREHEAT_1_LABEL; + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Нагрів ") PREHEAT_1_LABEL " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" сопло ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" все"); + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" стіл"); + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Нагрів ") PREHEAT_1_LABEL _UxGT(" налашт"); + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Нагрів $"); PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Нагрів $ ~"); PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Нагрів $ сопло"); @@ -181,8 +189,8 @@ namespace Language_uk { PROGMEM Language_Str MSG_UBL_DONE_EDITING_MESH = _UxGT("Сітка побудована"); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Будувати сітку"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку ($)"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити ($)"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Будувати сітку $"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Підтвердити $"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Буд. холодну сітку"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Встан.висоту сітки"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index e782f2c1f1c4..9d0ba7e21346 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -66,6 +66,14 @@ namespace Language_vi { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("Bù đắp được áp dụng"); // Offsets applied PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Đặt nguồn gốc"); // Set origin #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" trước ~"); // Preheat + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu"); + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Đầu ~"); + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Tất cả"); // all + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Bàn"); // bed -- using vietnamese term for 'table' instead + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("Làm nóng ") PREHEAT_1_LABEL _UxGT(" Cấu hình"); // conf + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("Làm nóng $ trước"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("Làm nóng $ trước ~"); // Preheat PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("Làm nóng $ Đầu"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index b243538cc2db..512d77aa2211 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -70,13 +70,21 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("设置原点"); //"Set origin" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_n_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_n_LABEL" - PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_n " " - PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_n " " - PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_n " All" - PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_n " Bed" - PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_n " conf" + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 设置"); //MSG_PREHEAT_1 " conf" + + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("预热 $"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("预热 $ ~"); //"Preheat PREHEAT_2_LABEL" + PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("预热 $ 喷嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_END_E = _UxGT("预热 $ 喷嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_M_ALL = _UxGT("预热 $ 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_M_BEDONLY = _UxGT("预热 $ 热床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_M_SETTINGS = _UxGT("预热 $ 设置"); //MSG_PREHEAT_1 " conf" #endif PROGMEM Language_Str MSG_PREHEAT_CUSTOM = _UxGT("预热自定义"); PROGMEM Language_Str MSG_COOLDOWN = _UxGT("降温"); //"Cooldown" @@ -141,8 +149,8 @@ namespace Language_zh_CN { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh" PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh" #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_n_LABEL Mesh" - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_n_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh" + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh" #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("创设冷网格"); // "Build Cold Mesh" PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("调整网格高度"); // "Adjust Mesh Height" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 2f44a925b9b6..efc9b570bbcb 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -69,6 +69,14 @@ namespace Language_zh_TW { PROGMEM Language_Str MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已啟用"); //"Offsets applied" PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("設置原點"); //"Set origin" #if PREHEAT_COUNT + PROGMEM Language_Str MSG_PREHEAT_1 = _UxGT("預熱 ") PREHEAT_1_LABEL; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_H = _UxGT("預熱 ") PREHEAT_1_LABEL " ~"; //"Preheat PREHEAT_1_LABEL" + PROGMEM Language_Str MSG_PREHEAT_1_END = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_END_E = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 噴嘴 ~"); //MSG_PREHEAT_1 " " + PROGMEM Language_Str MSG_PREHEAT_1_ALL = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 全部"); //MSG_PREHEAT_1 " All" + PROGMEM Language_Str MSG_PREHEAT_1_BEDONLY = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 熱床"); //MSG_PREHEAT_1 " Bed" + PROGMEM Language_Str MSG_PREHEAT_1_SETTINGS = _UxGT("預熱 ") PREHEAT_1_LABEL _UxGT(" 設置"); //MSG_PREHEAT_1 " conf" + PROGMEM Language_Str MSG_PREHEAT_M = _UxGT("預熱 $"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_H = _UxGT("預熱 $ ~"); //"Preheat PREHEAT_1_LABEL" PROGMEM Language_Str MSG_PREHEAT_M_END = _UxGT("預熱 $ 噴嘴"); //MSG_PREHEAT_1 " " From fb0a68d6dfd4e8e9a63685c22f63b134bf16dc30 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:50:24 +0200 Subject: [PATCH 47/55] Remove duplicated if test --- Marlin/src/inc/Conditionals_post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 7b89c27e597e..6d9998b69290 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2128,7 +2128,7 @@ #define HAS_TEMPERATURE 1 #endif -#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) && defined(PREHEAT_1_LABEL) +#if HAS_TEMPERATURE && EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD) #ifdef PREHEAT_5_LABEL #define PREHEAT_COUNT 5 #elif defined(PREHEAT_4_LABEL) From 5a7b91d18e097922ebcb53646ee0c8389daf10b5 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 11:52:10 +0200 Subject: [PATCH 48/55] Update some languages --- Marlin/src/lcd/language/language_de.h | 2 +- Marlin/src/lcd/language/language_it.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 465f4c63845b..2d14f47b16db 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -66,7 +66,7 @@ namespace Language_de { PROGMEM Language_Str MSG_SET_ORIGIN = _UxGT("Setze Nullpunkte"); //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #if PREHEAT_COUNT PROGMEM Language_Str MSG_PREHEAT_1 = PREHEAT_1_LABEL _UxGT(" Vorwärmen"); - PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen") " ~"; + PROGMEM Language_Str MSG_PREHEAT_1_H = PREHEAT_1_LABEL _UxGT(" Vorwärmen ~"); PROGMEM Language_Str MSG_PREHEAT_1_END = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärmen"); PROGMEM Language_Str MSG_PREHEAT_1_END_E = PREHEAT_1_LABEL _UxGT(" Extr. Vorwärm. ~"); PROGMEM Language_Str MSG_PREHEAT_1_ALL = PREHEAT_1_LABEL _UxGT(" Alles Vorwärmen"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 30dddbf254c8..264e7bd0531b 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -152,8 +152,8 @@ namespace Language_it { PROGMEM Language_Str MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Crea Mesh personal."); PROGMEM Language_Str MSG_UBL_BUILD_MESH_MENU = _UxGT("Crea Mesh"); #if PREHEAT_COUNT - PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh $"); - PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh $"); + PROGMEM Language_Str MSG_UBL_BUILD_MESH_M = _UxGT("Crea Mesh ($)"); + PROGMEM Language_Str MSG_UBL_VALIDATE_MESH_M = _UxGT("Valida Mesh ($)"); #endif PROGMEM Language_Str MSG_UBL_BUILD_COLD_MESH = _UxGT("Crea Mesh a freddo"); PROGMEM Language_Str MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Aggiusta Alt. Mesh"); From 301e05b8d68b491d894127286eb7345b6658eae2 Mon Sep 17 00:00:00 2001 From: GMagician Date: Wed, 8 Jul 2020 19:14:44 +0200 Subject: [PATCH 49/55] Fix new messages display --- Marlin/src/lcd/lcdprint.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index 771bd86b9d3f..dba48bee195a 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -29,6 +29,7 @@ #if HAS_SPI_LCD #include "../inc/MarlinConfig.h" +#include "dogm/ultralcd_DOGM.h" #include "lcdprint.h" /** @@ -46,19 +47,20 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i // lcd_put_int(ind); n--; if (ind >= 10) n--; if (ind >= 0) { if (ch == '*') { lcd_put_wchar('E'); n--; } - lcd_put_wchar(ind + ((ch == '=') ? '0' : LCD_FIRST_TOOL)); - n--; + if (n) { lcd_put_wchar(ind + ((ch == '=') ? '0' : LCD_FIRST_TOOL)); n--; } } else { PGM_P const b = ind == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED); lcd_put_u8str_P(b); n -= utf8_strlen_P(b); } - if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n); - break; + if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH); + continue; + } + else if (ch == '$') { + n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH); + continue; } - else if (ch == '$') - n -= lcd_put_u8str_max_P(inStr, n); lcd_put_wchar(ch); } From 45e6f45a2c9f1c886ab8f728812223426b637538 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 18:06:50 -0500 Subject: [PATCH 50/55] Simpler array --- Marlin/src/lcd/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 0eb9e04d96c7..77b08680c78a 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -170,7 +170,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0 #endif #define _PLBL(N) preheat_##N##_label, - static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = ARRAY_N(PREHEAT_COUNT, REPEAT(PREHEAT_COUNT, _PLBL)); + static PGM_P const preheat_labels[PREHEAT_COUNT] PROGMEM = { REPEAT(PREHEAT_COUNT, _PLBL) }; return (PGM_P)pgm_read_ptr(&preheat_labels[m]); } From 09a6b2f0aaee386f339514df33750ed418cdddd8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 18:16:23 -0500 Subject: [PATCH 51/55] Prevent endless loop, add continue --- Marlin/src/lcd/lcdprint.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index 82d9f9ca2eb7..6aea75006af2 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -38,8 +38,8 @@ */ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const inStr/*=nullptr*/, const lcd_uint_t maxlen/*=LCD_WIDTH*/) { uint8_t *p = (uint8_t*)pstr; - lcd_uint_t n = maxlen; - for (; n; n--) { + int8_t n = maxlen; + for (; n > 0; n--) { wchar_t ch; p = get_utf8_value_cb(p, read_byte_rom, &ch); if (!ch) break; @@ -57,8 +57,10 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i if (n) n -= lcd_put_u8str_max_P((PGM_P)p, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH); continue; } - else if (ch == '$') + else if (ch == '$' && inStr) { n -= lcd_put_u8str_max_P(inStr, n * (MENU_FONT_WIDTH)) / (MENU_FONT_WIDTH); + continue; + } lcd_put_wchar(ch); } From d71e1372cc32f664db519c58070489e55cd201a1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 18:34:36 -0500 Subject: [PATCH 52/55] Patch and clean up macros --- Marlin/src/lcd/menu/menu.h | 43 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index 9d045d33e365..a5667e2e31e0 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -482,28 +482,28 @@ class MenuItem_bool : public MenuEditItemBase { #define STATIC_ITEM(LABEL, V...) STATIC_ITEM_P(GET_TEXT(LABEL), ##V) #define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_P(GET_TEXT(LABEL), ##V) -#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) -#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - #define MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, PLABEL, ##V) -#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, false, GET_TEXT(LABEL), ##V) -#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, 0, S, false, PLABEL, ##V) +#define MENU_ITEM_N_S(TYPE, N, S, LABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) +#define MENU_ITEM_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_S_P(TYPE, S, false, PLABEL, ##V) +#define MENU_ITEM_S(TYPE, S, LABEL, V...) MENU_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V) #define MENU_ITEM_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, false, PLABEL, ##V) #define MENU_ITEM_N(TYPE, N, LABEL, V...) MENU_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define MENU_ITEM_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, false, PLABEL, ##V) +#define MENU_ITEM(TYPE, LABEL, V...) MENU_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) #define BACK_ITEM(LABEL) MENU_ITEM(back, LABEL) #define ACTION_ITEM_N_S_P(N, S, PLABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, PLABEL, ACTION) -#define ACTION_ITEM_N_S(N, S, LABEL, ACTION) MENU_ITEM_N_S_P(function, N, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_N_S(N, S, LABEL, ACTION) ACTION_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ACTION) #define ACTION_ITEM_S_P(S, PLABEL, ACTION) MENU_ITEM_S_P(function, S, PLABEL, ACTION) -#define ACTION_ITEM_S(S, LABEL, ACTION) MENU_ITEM_S_P(function, S, GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM_S(S, LABEL, ACTION) ACTION_ITEM_S_P(S, GET_TEXT(LABEL), ACTION) #define ACTION_ITEM_N_P(N, PLABEL, ACTION) MENU_ITEM_N_P(function, N, PLABEL, ACTION) #define ACTION_ITEM_N(N, LABEL, ACTION) ACTION_ITEM_N_P(N, GET_TEXT(LABEL), ACTION) #define ACTION_ITEM_P(PLABEL, ACTION) MENU_ITEM_P(function, PLABEL, ACTION) -#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) +#define ACTION_ITEM(LABEL, ACTION) ACTION_ITEM_P(GET_TEXT(LABEL), ACTION) #define GCODES_ITEM_N_S_P(N, S, PLABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, PLABEL, GCODES) -#define GCODES_ITEM_N_S(N, S, LABEL, GCODES) MENU_ITEM_N_S_P(gcode, N, S, GET_TEXT(LABEL), GCODES) +#define GCODES_ITEM_N_S(N, S, LABEL, GCODES) GCODES_ITEM_N_S_P(N, S, GET_TEXT(LABEL), GCODES) #define GCODES_ITEM_S_P(S, PLABEL, GCODES) MENU_ITEM_S_P(gcode, S, PLABEL, GCODES) #define GCODES_ITEM_S(S, LABEL, GCODES) GCODES_ITEM_S_P(S, GET_TEXT(LABEL), GCODES) #define GCODES_ITEM_N_P(N, PLABEL, GCODES) MENU_ITEM_N_P(gcode, N, PLABEL, GCODES) @@ -512,7 +512,7 @@ class MenuItem_bool : public MenuEditItemBase { #define GCODES_ITEM(LABEL, GCODES) GCODES_ITEM_P(GET_TEXT(LABEL), GCODES) #define SUBMENU_N_S_P(N, S, PLABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST) -#define SUBMENU_N_S(N, S, LABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, GET_TEXT(LABEL), DEST) +#define SUBMENU_N_S(N, S, LABEL, DEST) SUBMENU_N_S_P(N, S, GET_TEXT(LABEL), DEST) #define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) #define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) #define SUBMENU_S_P(S, PLABEL, DEST) MENU_ITEM_S_P(submenu, S, PLABEL, DEST) @@ -520,20 +520,23 @@ class MenuItem_bool : public MenuEditItemBase { #define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) #define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) -#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) -#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) - #define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V) -#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) #define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_S_P(TYPE, S, PLABEL, V...) MENU_ITEM_S_P(TYPE, S, PLABEL, ##V) +#define EDIT_ITEM_S(TYPE, S, LABEL, V...) EDIT_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) +#define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) -#define EDIT_ITEM_FAST_N_S_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V) -#define EDIT_ITEM_FAST_N_S(TYPE, N, LABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V) -#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) -#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) -#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) -#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_FAST_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...) EDIT_ITEM_FAST_S_P(TYPE, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_S_P(TYPE, S, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) +#define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) #define _CONFIRM_ITEM_INNER_P(PLABEL, V...) do { \ if (encoderLine == _thisItemNr && ui.use_click()) { \ From 9be26d72bfd9249ebbc42c9cfca5ea983bc21b84 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 18:59:53 -0500 Subject: [PATCH 53/55] Move fonts info to lcdprint.h, with dummy --- Marlin/src/lcd/dogm/ultralcd_DOGM.h | 36 ------------------- Marlin/src/lcd/lcdprint.cpp | 2 -- Marlin/src/lcd/lcdprint.h | 54 +++++++++++++++++++++++++++++ Marlin/src/lcd/menu/menu_addon.h | 3 -- Marlin/src/lcd/ultralcd.h | 8 ----- 5 files changed, 54 insertions(+), 49 deletions(-) diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h index b83a175589c2..61a0a94abcfe 100644 --- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h +++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h @@ -230,42 +230,6 @@ #define PAGE_UNDER(yb) ((yb) >= u8g.getU8g()->current_page.y0) // Does the current page precede a region bottom? #define PAGE_CONTAINS(ya, yb) ((yb) >= u8g.getU8g()->current_page.y0 && (ya) <= u8g.getU8g()->current_page.y1) // Do two vertical regions overlap? -// Only Western languages support big / small fonts -#if DISABLED(DISPLAY_CHARSET_ISO10646_1) - #undef USE_BIG_EDIT_FONT - #undef USE_SMALL_INFOFONT -#endif - -#define MENU_FONT_NAME ISO10646_1_5x7 -#define MENU_FONT_WIDTH 6 -#define MENU_FONT_ASCENT 10 -#define MENU_FONT_DESCENT 2 -#define MENU_FONT_HEIGHT (MENU_FONT_ASCENT + MENU_FONT_DESCENT) - -#if ENABLED(USE_BIG_EDIT_FONT) - #define EDIT_FONT_NAME u8g_font_9x18 - #define EDIT_FONT_WIDTH 9 - #define EDIT_FONT_ASCENT 10 - #define EDIT_FONT_DESCENT 3 -#else - #define EDIT_FONT_NAME MENU_FONT_NAME - #define EDIT_FONT_WIDTH MENU_FONT_WIDTH - #define EDIT_FONT_ASCENT MENU_FONT_ASCENT - #define EDIT_FONT_DESCENT MENU_FONT_DESCENT -#endif -#define EDIT_FONT_HEIGHT (EDIT_FONT_ASCENT + EDIT_FONT_DESCENT) - -// Get the Ascent, Descent, and total Height for the Info Screen font -#if ENABLED(USE_SMALL_INFOFONT) - extern const u8g_fntpgm_uint8_t u8g_font_6x9[]; - #define INFO_FONT_ASCENT 7 -#else - #define INFO_FONT_ASCENT 8 -#endif -#define INFO_FONT_DESCENT 2 -#define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT) -#define INFO_FONT_WIDTH 6 - #ifndef FSMC_UPSCALE #define FSMC_UPSCALE 2 #endif diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp index 6aea75006af2..4290bcbb1256 100644 --- a/Marlin/src/lcd/lcdprint.cpp +++ b/Marlin/src/lcd/lcdprint.cpp @@ -28,8 +28,6 @@ #if HAS_SPI_LCD -#include "../inc/MarlinConfig.h" -#include "dogm/ultralcd_DOGM.h" #include "lcdprint.h" /** diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h index 5dca046011b4..f58b99a35dfc 100644 --- a/Marlin/src/lcd/lcdprint.h +++ b/Marlin/src/lcd/lcdprint.h @@ -13,13 +13,67 @@ #include "../inc/MarlinConfig.h" #if HAS_GRAPHICAL_LCD + #include "dogm/u8g_fontutf8.h" typedef u8g_uint_t lcd_uint_t; + typedef u8g_int_t lcd_int_t; + + // Only Western languages support big / small fonts + #if DISABLED(DISPLAY_CHARSET_ISO10646_1) + #undef USE_BIG_EDIT_FONT + #undef USE_SMALL_INFOFONT + #endif + + #define MENU_FONT_NAME ISO10646_1_5x7 + #define MENU_FONT_WIDTH 6 + #define MENU_FONT_ASCENT 10 + #define MENU_FONT_DESCENT 2 + #define MENU_FONT_HEIGHT (MENU_FONT_ASCENT + MENU_FONT_DESCENT) + + #if ENABLED(USE_BIG_EDIT_FONT) + #define EDIT_FONT_NAME u8g_font_9x18 + #define EDIT_FONT_WIDTH 9 + #define EDIT_FONT_ASCENT 10 + #define EDIT_FONT_DESCENT 3 + #else + #define EDIT_FONT_NAME MENU_FONT_NAME + #define EDIT_FONT_WIDTH MENU_FONT_WIDTH + #define EDIT_FONT_ASCENT MENU_FONT_ASCENT + #define EDIT_FONT_DESCENT MENU_FONT_DESCENT + #endif + #define EDIT_FONT_HEIGHT (EDIT_FONT_ASCENT + EDIT_FONT_DESCENT) + + // Get the Ascent, Descent, and total Height for the Info Screen font + #if ENABLED(USE_SMALL_INFOFONT) + extern const u8g_fntpgm_uint8_t u8g_font_6x9[]; + #define INFO_FONT_ASCENT 7 + #else + #define INFO_FONT_ASCENT 8 + #endif + #define INFO_FONT_DESCENT 2 + #define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT) + #define INFO_FONT_WIDTH 6 + #else + #define _UxGT(a) a typedef uint8_t lcd_uint_t; + typedef int8_t lcd_int_t; + + #define MENU_FONT_WIDTH 1 + #define MENU_FONT_HEIGHT 1 + #define EDIT_FONT_WIDTH 1 + #define EDIT_FONT_HEIGHT 1 + #define INFO_FONT_WIDTH 1 + #define INFO_FONT_HEIGHT 1 + #define LCD_PIXEL_WIDTH LCD_WIDTH + #define LCD_PIXEL_HEIGHT LCD_HEIGHT + #endif +#define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) +#define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) + #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) int lcd_glyph_height(); diff --git a/Marlin/src/lcd/menu/menu_addon.h b/Marlin/src/lcd/menu/menu_addon.h index 5f338c571abf..e66a19409f1e 100644 --- a/Marlin/src/lcd/menu/menu_addon.h +++ b/Marlin/src/lcd/menu/menu_addon.h @@ -22,9 +22,6 @@ #pragma once #include "../lcdprint.h" -#if HAS_GRAPHICAL_LCD - #include "../dogm/ultralcd_DOGM.h" -#endif #define MENU_ITEM_ADDON_START(X) do{ \ if (ui.should_draw() && _menuLineNr == _thisItemNr - 1) { \ diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index f46403c03a82..2b9efab359e1 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -78,14 +78,6 @@ #if HAS_LCD_MENU - #if HAS_GRAPHICAL_LCD - #define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) - #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) - #else - #define SETCURSOR(col, row) lcd_moveto(col, row) - #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_WIDTH - (len), row) - #endif - #include "lcdprint.h" void _wrap_string(uint8_t &col, uint8_t &row, const char * const string, read_byte_cb_t cb_read_byte, const bool wordwrap=false); From ae9504d20e7926703ab3f8ea60118182fe3a98c6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 19:02:46 -0500 Subject: [PATCH 54/55] char char center char --- Marlin/src/lcd/lcdprint.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h index f58b99a35dfc..341cc4f5c21c 100644 --- a/Marlin/src/lcd/lcdprint.h +++ b/Marlin/src/lcd/lcdprint.h @@ -54,6 +54,9 @@ #define INFO_FONT_HEIGHT (INFO_FONT_ASCENT + INFO_FONT_DESCENT) #define INFO_FONT_WIDTH 6 + #define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) + #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) + #else #define _UxGT(a) a @@ -69,10 +72,10 @@ #define LCD_PIXEL_WIDTH LCD_WIDTH #define LCD_PIXEL_HEIGHT LCD_HEIGHT -#endif + #define SETCURSOR(col, row) lcd_moveto(col, row) + #define SETCURSOR_RJ(len, row) lcd_moveto(LCD_WIDTH - (len), row) -#define SETCURSOR(col, row) lcd_moveto(col * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) -#define SETCURSOR_RJ(len, row) lcd_moveto(LCD_PIXEL_WIDTH - (len) * (MENU_FONT_WIDTH), (row + 1) * (MENU_FONT_HEIGHT)) +#endif #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) From 74378f5372f8c828aad1a16df12c6bc740a0a455 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 21:59:57 -0500 Subject: [PATCH 55/55] More macro cleanup --- Marlin/src/lcd/menu/menu.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h index a5667e2e31e0..699324d2668e 100644 --- a/Marlin/src/lcd/menu/menu.h +++ b/Marlin/src/lcd/menu/menu.h @@ -513,27 +513,27 @@ class MenuItem_bool : public MenuEditItemBase { #define SUBMENU_N_S_P(N, S, PLABEL, DEST) MENU_ITEM_N_S_P(submenu, N, S, PLABEL, DEST) #define SUBMENU_N_S(N, S, LABEL, DEST) SUBMENU_N_S_P(N, S, GET_TEXT(LABEL), DEST) -#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) -#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) #define SUBMENU_S_P(S, PLABEL, DEST) MENU_ITEM_S_P(submenu, S, PLABEL, DEST) #define SUBMENU_S(S, LABEL, DEST) SUBMENU_S_P(S, GET_TEXT(LABEL), DEST) +#define SUBMENU_N_P(N, PLABEL, DEST) MENU_ITEM_N_P(submenu, N, PLABEL, DEST) +#define SUBMENU_N(N, LABEL, DEST) SUBMENU_N_P(N, GET_TEXT(LABEL), DEST) #define SUBMENU_P(PLABEL, DEST) MENU_ITEM_P(submenu, PLABEL, DEST) #define SUBMENU(LABEL, DEST) SUBMENU_P(GET_TEXT(LABEL), DEST) #define EDIT_ITEM_N_S_P(TYPE, N, S, PLABEL, V...) MENU_ITEM_N_S_P(TYPE, N, S, PLABEL, ##V) #define EDIT_ITEM_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_N_S_P(TYPE, N, S, GET_TEXT(LABEL), ##V) -#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) -#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_S_P(TYPE, S, PLABEL, V...) MENU_ITEM_S_P(TYPE, S, PLABEL, ##V) #define EDIT_ITEM_S(TYPE, S, LABEL, V...) EDIT_ITEM_S_P(TYPE, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_N_P(TYPE, N, PLABEL, V...) MENU_ITEM_N_P(TYPE, N, PLABEL, ##V) +#define EDIT_ITEM_N(TYPE, N, LABEL, V...) EDIT_ITEM_N_P(TYPE, N, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_P(TYPE, PLABEL, V...) MENU_ITEM_P(TYPE, PLABEL, ##V) #define EDIT_ITEM(TYPE, LABEL, V...) EDIT_ITEM_P(TYPE, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_FAST_N_S_P(TYPE, N, S, PLABEL, V...) _MENU_ITEM_N_S_P(TYPE, N, S, true, PLABEL, ##V) #define EDIT_ITEM_FAST_N_S(TYPE, N, S, LABEL, V...) EDIT_ITEM_FAST_N_S_P(TYPE, N, S, true, GET_TEXT(LABEL), ##V) -#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) -#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...) EDIT_ITEM_FAST_S_P(TYPE, S, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_FAST_S_P(TYPE, S, PLABEL, V...) _MENU_ITEM_S_P(TYPE, S, true, PLABEL, ##V) +#define EDIT_ITEM_FAST_S(TYPE, S, LABEL, V...) EDIT_ITEM_FAST_S_P(TYPE, S, GET_TEXT(LABEL), ##V) +#define EDIT_ITEM_FAST_N_P(TYPE, N, PLABEL, V...) _MENU_ITEM_N_P(TYPE, N, true, PLABEL, ##V) #define EDIT_ITEM_FAST_N(TYPE, N, LABEL, V...) EDIT_ITEM_FAST_N_P(TYPE, N, GET_TEXT(LABEL), ##V) #define EDIT_ITEM_FAST_P(TYPE, PLABEL, V...) _MENU_ITEM_P(TYPE, true, PLABEL, ##V) #define EDIT_ITEM_FAST(TYPE, LABEL, V...) EDIT_ITEM_FAST_P(TYPE, GET_TEXT(LABEL), ##V) @@ -575,12 +575,14 @@ class MenuItem_bool : public MenuEditItemBase { #define YESNO_ITEM(LABEL, V...) YESNO_ITEM_P(GET_TEXT(LABEL), ##V) #define CONFIRM_ITEM_N_S_P(N,S,PLABEL,A,B,V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) -#define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) -#define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V) +#define CONFIRM_ITEM_N_S(N,S,LABEL,V...) CONFIRM_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V) +#define CONFIRM_ITEM_N_P(N,PLABEL,A,B,V...) _CONFIRM_ITEM_N_P(N, PLABEL, GET_TEXT(A), GET_TEXT(B), ##V) +#define CONFIRM_ITEM_N(N,LABEL, V...) CONFIRM_ITEM_N_P(N, GET_TEXT(LABEL), ##V) #define YESNO_ITEM_N_S_P(N,S,PLABEL, V...) _CONFIRM_ITEM_N_S_P(N, S, PLABEL, ##V) -#define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V) -#define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V) +#define YESNO_ITEM_N_S(N,S,LABEL, V...) YESNO_ITEM_N_S_P(N, S, GET_TEXT(LABEL), ##V) +#define YESNO_ITEM_N_P(N,PLABEL, V...) _CONFIRM_ITEM_N_P(N, PLABEL, ##V) +#define YESNO_ITEM_N(N,LABEL, V...) YESNO_ITEM_N_P(N, GET_TEXT(LABEL), ##V) //////////////////////////////////////////// /////////////// Menu Screens ///////////////