Skip to content

Commit c0cd8b9

Browse files
thisiskeithbthisiskeithb
authored
🩹 Update KEDI / GODI LCD_PINS_EN pin (#25886)
1 parent ef93b40 commit c0cd8b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+953
-811
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ marlin_config.json
2727
mczip.h
2828
language*.csv
2929
csv-out/
30+
language-out/
3031
*.gen
3132
*.sublime-workspace
3233

‎Marlin/src/feature/pause.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,11 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
548548

549549
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_HEATER_TIMEOUT), GET_TEXT_F(MSG_REHEAT)));
550550

551-
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_HEATER_TIMEOUT)));
551+
#if ENABLED(TOUCH_UI_FTDI_EVE)
552+
ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_FTDI_HEATER_TIMEOUT));
553+
#elif ENABLED(EXTENSIBLE_UI)
554+
ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_HEATER_TIMEOUT));
555+
#endif
552556

553557
TERN_(HAS_RESUME_CONTINUE, wait_for_user_response(0, true)); // Wait for LCD click or M108
554558

‎Marlin/src/lcd/e3v2/proui/dwin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3068,7 +3068,7 @@ void Draw_Tramming_Menu() {
30683068
MENU_ITEM(ICON_Axis, MSG_LEVBED_FR, onDrawMenuItem, TramFR);
30693069
MENU_ITEM(ICON_Axis, MSG_LEVBED_BR, onDrawMenuItem, TramBR);
30703070
MENU_ITEM(ICON_Axis, MSG_LEVBED_BL, onDrawMenuItem, TramBL);
3071-
MENU_ITEM(ICON_Axis, MSG_LEVBED_C, onDrawMenuItem, TramC );
3071+
MENU_ITEM(ICON_Axis, MSG_LEVBED_C, onDrawMenuItem, TramC );
30723072
}
30733073
UpdateMenu(TrammingMenu);
30743074
}

‎Marlin/src/lcd/e3v2/proui/dwin.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ namespace GET_LANG(LCD_LANGUAGE) {
4747
#define _MSG_PREHEAT(N) \
4848
LSTR MSG_PREHEAT_##N = _UxGT("Preheat ") PREHEAT_## N ##_LABEL; \
4949
LSTR MSG_PREHEAT_## N ##_SETTINGS = _UxGT("Preheat ") PREHEAT_## N ##_LABEL _UxGT(" Conf");
50-
#if PREHEAT_COUNT > 3
51-
REPEAT_S(4, PREHEAT_COUNT, _MSG_PREHEAT)
50+
#if PREHEAT_COUNT > 1
51+
REPEAT_S(2, INCREMENT(PREHEAT_COUNT), _MSG_PREHEAT)
5252
#endif
5353
}
5454

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/config.h

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,4 @@
2323

2424
// Configure this display with options in Configuration_adv.h
2525
#include "../../../inc/MarlinConfigPre.h"
26-
#if ENABLED(TOUCH_UI_FTDI_EVE)
27-
2826
#include "compat.h"
29-
30-
#endif

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h

+2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ namespace Language_en {
147147
LSTR MSG_MOVE_Z_TO_TOP = u8"Raise Z to Top";
148148
LSTR MSG_MAX_SPEED_NO_UNITS = u8"Max Speed";
149149

150+
//LSTR MSG_FTDI_HEATER_TIMEOUT = u8"Idle timeout, temperature decreased. Press Okay to reheat and again to resume.";
151+
150152
#if ENABLED(TOUCH_UI_LULZBOT_BIO)
151153
LSTR MSG_MOVE_TO_HOME = u8"Move to Home";
152154
LSTR MSG_RAISE_PLUNGER = u8"Raise Plunger";

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/screens.h

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
#include "config.h"
2626

27-
#if ENABLED(TOUCH_UI_FTDI_EVE)
28-
2927
#include "ftdi_eve_lib/ftdi_eve_lib.h"
3028
#include "language/language.h"
3129
#include "theme/theme.h"
@@ -46,5 +44,3 @@ extern tiny_timer_t refresh_timer;
4644
#else
4745
#include "generic/screens.h"
4846
#endif
49-
50-
#endif // TOUCH_UI_FTDI_EVE

‎Marlin/src/lcd/language/language_an.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@ namespace Language_an {
5555
LSTR MSG_LEVEL_BED_DONE = _UxGT("Nivelacion feita!");
5656
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases");
5757
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau");
58-
#if HAS_PREHEAT
59-
LSTR MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL;
60-
LSTR MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
61-
LSTR MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
62-
LSTR MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
63-
LSTR MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
64-
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
65-
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
6658

67-
LSTR MSG_PREHEAT_M = _UxGT("Precalentar $");
68-
LSTR MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~");
69-
LSTR MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla");
70-
LSTR MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Boquilla ~");
71-
LSTR MSG_PREHEAT_M_ALL = _UxGT("Precalentar $ Tot");
72-
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Precalentar $ Base");
73-
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Precalentar $ Conf");
74-
#endif
59+
LSTR MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL;
60+
LSTR MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
61+
LSTR MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
62+
LSTR MSG_PREHEAT_1_END_E = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla ~");
63+
LSTR MSG_PREHEAT_1_ALL = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Tot");
64+
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Base");
65+
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Precalentar ") PREHEAT_1_LABEL _UxGT(" Conf");
66+
67+
LSTR MSG_PREHEAT_M = _UxGT("Precalentar $");
68+
LSTR MSG_PREHEAT_M_H = _UxGT("Precalentar $ ~");
69+
LSTR MSG_PREHEAT_M_END = _UxGT("Precal. $ Boquilla");
70+
LSTR MSG_PREHEAT_M_END_E = _UxGT("Precal. $ Boquilla ~");
71+
LSTR MSG_PREHEAT_M_ALL = _UxGT("Precalentar $ Tot");
72+
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Precalentar $ Base");
73+
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Precalentar $ Conf");
74+
7575
LSTR MSG_COOLDOWN = _UxGT("Enfriar");
7676
LSTR MSG_SWITCH_PS_ON = _UxGT("Enchegar Fuent");
7777
LSTR MSG_SWITCH_PS_OFF = _UxGT("Amortar Fuent");

‎Marlin/src/lcd/language/language_bg.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@ namespace Language_bg {
4444
LSTR MSG_DISABLE_STEPPERS = _UxGT("Изкл. двигатели");
4545
LSTR MSG_AUTO_HOME = _UxGT("Паркиране");
4646
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало");
47-
#if HAS_PREHEAT
48-
LSTR MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL;
49-
LSTR MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~";
50-
LSTR MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза");
51-
LSTR MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~");
52-
LSTR MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички");
53-
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло");
54-
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL;
5547

56-
LSTR MSG_PREHEAT_M = _UxGT("Подгряване $");
57-
LSTR MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~");
58-
LSTR MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза");
59-
LSTR MSG_PREHEAT_M_END_E = _UxGT("Подгряване $ Дюза ~");
60-
LSTR MSG_PREHEAT_M_ALL = _UxGT("Подгр. $ Всички");
61-
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Подгр. $ Легло");
62-
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Настройки $");
63-
#endif
48+
LSTR MSG_PREHEAT_1 = _UxGT("Подгряване ") PREHEAT_1_LABEL;
49+
LSTR MSG_PREHEAT_1_H = _UxGT("Подгряване ") PREHEAT_1_LABEL " ~";
50+
LSTR MSG_PREHEAT_1_END = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза");
51+
LSTR MSG_PREHEAT_1_END_E = _UxGT("Подгряване ") PREHEAT_1_LABEL _UxGT(" Дюза ~");
52+
LSTR MSG_PREHEAT_1_ALL = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Всички");
53+
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Подгр. ") PREHEAT_1_LABEL _UxGT(" Легло");
54+
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Настройки ") PREHEAT_1_LABEL;
55+
56+
LSTR MSG_PREHEAT_M = _UxGT("Подгряване $");
57+
LSTR MSG_PREHEAT_M_H = _UxGT("Подгряване $ ~");
58+
LSTR MSG_PREHEAT_M_END = _UxGT("Подгряване $ Дюза");
59+
LSTR MSG_PREHEAT_M_END_E = _UxGT("Подгряване $ Дюза ~");
60+
LSTR MSG_PREHEAT_M_ALL = _UxGT("Подгр. $ Всички");
61+
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Подгр. $ Легло");
62+
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Настройки $");
63+
6464
LSTR MSG_COOLDOWN = _UxGT("Охлаждане");
6565
LSTR MSG_SWITCH_PS_ON = _UxGT("Вкл. захранване");
6666
LSTR MSG_SWITCH_PS_OFF = _UxGT("Изкл. захранване");

‎Marlin/src/lcd/language/language_ca.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@ namespace Language_ca {
5353
LSTR MSG_LEVEL_BED_DONE = _UxGT("Anivellament fet!");
5454
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge");
5555
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat");
56-
#if HAS_PREHEAT
57-
LSTR MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
58-
LSTR MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
59-
LSTR MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
60-
LSTR MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
61-
LSTR MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
62-
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
63-
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
64-
65-
LSTR MSG_PREHEAT_M = _UxGT("Preescalfa $");
66-
LSTR MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~");
67-
LSTR MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End");
68-
LSTR MSG_PREHEAT_M_END_E = _UxGT("Preescalfa $ End ~");
69-
LSTR MSG_PREHEAT_M_ALL = _UxGT("Preescalfa $ Tot");
70-
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Preescalfa $ Llit");
71-
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Preescalfa $ Conf.");
72-
#endif
56+
57+
LSTR MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
58+
LSTR MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
59+
LSTR MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
60+
LSTR MSG_PREHEAT_1_END_E = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End ~");
61+
LSTR MSG_PREHEAT_1_ALL = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Tot");
62+
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Llit");
63+
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" Conf.");
64+
65+
LSTR MSG_PREHEAT_M = _UxGT("Preescalfa $");
66+
LSTR MSG_PREHEAT_M_H = _UxGT("Preescalfa $ ~");
67+
LSTR MSG_PREHEAT_M_END = _UxGT("Preescalfa $ End");
68+
LSTR MSG_PREHEAT_M_END_E = _UxGT("Preescalfa $ End ~");
69+
LSTR MSG_PREHEAT_M_ALL = _UxGT("Preescalfa $ Tot");
70+
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Preescalfa $ Llit");
71+
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Preescalfa $ Conf.");
72+
7373
LSTR MSG_COOLDOWN = _UxGT("Refreda");
7474

7575
LSTR MSG_EXTRUDE = _UxGT("Extrudeix");

‎Marlin/src/lcd/language/language_cz.h

+18-20
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ namespace Language_cz {
7777
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Výška srovnávání");
7878
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Nastavit ofsety");
7979
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Ofsety nastaveny");
80-
#if HAS_PREHEAT
81-
LSTR MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL;
82-
LSTR MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
83-
LSTR MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
84-
LSTR MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
85-
LSTR MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
86-
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
87-
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
8880

89-
LSTR MSG_PREHEAT_M = _UxGT("Zahřát $");
90-
LSTR MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~");
91-
LSTR MSG_PREHEAT_M_END = _UxGT("Zahřát $ end");
92-
LSTR MSG_PREHEAT_M_END_E = _UxGT("Zahřát $ end ~");
93-
LSTR MSG_PREHEAT_M_ALL = _UxGT("Zahřát $ vše");
94-
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Zahřát $ podlož");
95-
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Zahřát $ nast");
96-
#endif
81+
LSTR MSG_PREHEAT_1 = _UxGT("Zahřát ") PREHEAT_1_LABEL;
82+
LSTR MSG_PREHEAT_1_H = _UxGT("Zahřát ") PREHEAT_1_LABEL " ~";
83+
LSTR MSG_PREHEAT_1_END = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end");
84+
LSTR MSG_PREHEAT_1_END_E = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" end ~");
85+
LSTR MSG_PREHEAT_1_ALL = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" vše");
86+
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" podlož");
87+
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Zahřát ") PREHEAT_1_LABEL _UxGT(" nast");
88+
89+
LSTR MSG_PREHEAT_M = _UxGT("Zahřát $");
90+
LSTR MSG_PREHEAT_M_H = _UxGT("Zahřát $ ~");
91+
LSTR MSG_PREHEAT_M_END = _UxGT("Zahřát $ end");
92+
LSTR MSG_PREHEAT_M_END_E = _UxGT("Zahřát $ end ~");
93+
LSTR MSG_PREHEAT_M_ALL = _UxGT("Zahřát $ vše");
94+
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Zahřát $ podlož");
95+
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Zahřát $ nast");
96+
9797
LSTR MSG_PREHEAT_CUSTOM = _UxGT("Zahřát vlastní");
9898
LSTR MSG_COOLDOWN = _UxGT("Zchladit");
9999
LSTR MSG_LASER_MENU = _UxGT("Ovládání laseru");
@@ -152,10 +152,8 @@ namespace Language_cz {
152152
LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Konec úprav sítě");
153153
LSTR MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("Vlastní síť");
154154
LSTR MSG_UBL_BUILD_MESH_MENU = _UxGT("Vytvořit síť");
155-
#if HAS_PREHEAT
156-
LSTR MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $");
157-
LSTR MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $");
158-
#endif
155+
LSTR MSG_UBL_BUILD_MESH_M = _UxGT("Síť bodů $");
156+
LSTR MSG_UBL_VALIDATE_MESH_M = _UxGT("Kontrola sítě $");
159157
LSTR MSG_UBL_BUILD_COLD_MESH = _UxGT("Studená síť bodů");
160158
LSTR MSG_UBL_MESH_HEIGHT_ADJUST = _UxGT("Upravit výšku sítě");
161159
LSTR MSG_UBL_MESH_HEIGHT_AMOUNT = _UxGT("Výška");

‎Marlin/src/lcd/language/language_da.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ namespace Language_da {
4747
LSTR MSG_LEVEL_BED_DONE = _UxGT("Bed level er færdig!");
4848
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Sæt forsk. af home");
4949
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Forsk. er nu aktiv");
50-
#if HAS_PREHEAT
51-
LSTR MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL;
52-
LSTR MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
53-
LSTR MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end");
54-
LSTR MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
55-
LSTR MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
56-
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
57-
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
58-
59-
LSTR MSG_PREHEAT_M = _UxGT("Forvarm $");
60-
LSTR MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~");
61-
LSTR MSG_PREHEAT_M_END = _UxGT("Forvarm $ end");
62-
LSTR MSG_PREHEAT_M_END_E = _UxGT("Forvarm $ end ~");
63-
LSTR MSG_PREHEAT_M_ALL = _UxGT("Forvarm $ Alle");
64-
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Forvarm $ Bed");
65-
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Forvarm $ conf");
66-
#endif
50+
51+
LSTR MSG_PREHEAT_1 = _UxGT("Forvarm ") PREHEAT_1_LABEL;
52+
LSTR MSG_PREHEAT_1_H = _UxGT("Forvarm ") PREHEAT_1_LABEL " ~";
53+
LSTR MSG_PREHEAT_1_END = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end");
54+
LSTR MSG_PREHEAT_1_END_E = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" end ~");
55+
LSTR MSG_PREHEAT_1_ALL = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Alle");
56+
LSTR MSG_PREHEAT_1_BEDONLY = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" Bed");
57+
LSTR MSG_PREHEAT_1_SETTINGS = _UxGT("Forvarm ") PREHEAT_1_LABEL _UxGT(" conf");
58+
59+
LSTR MSG_PREHEAT_M = _UxGT("Forvarm $");
60+
LSTR MSG_PREHEAT_M_H = _UxGT("Forvarm $ ~");
61+
LSTR MSG_PREHEAT_M_END = _UxGT("Forvarm $ end");
62+
LSTR MSG_PREHEAT_M_END_E = _UxGT("Forvarm $ end ~");
63+
LSTR MSG_PREHEAT_M_ALL = _UxGT("Forvarm $ Alle");
64+
LSTR MSG_PREHEAT_M_BEDONLY = _UxGT("Forvarm $ Bed");
65+
LSTR MSG_PREHEAT_M_SETTINGS = _UxGT("Forvarm $ conf");
66+
6767
LSTR MSG_COOLDOWN = _UxGT("Afkøl");
6868
LSTR MSG_SWITCH_PS_ON = _UxGT("Slå strøm til");
6969
LSTR MSG_SWITCH_PS_OFF = _UxGT("Slå strøm fra");

0 commit comments

Comments
 (0)