3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-19 16:16:13 +00:00
Code Issues Releases Wiki Activity

🌐 Replace '=' with '{' for substitution

Browse source
This commit is contained in:
Scott Lahteine 2023-04-24 00:24:40 -05:00
parent 743903b96f
commit 2954bf2697
23 changed files with 110 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
View file

@ -44,7 +44,7 @@ uint8_t read_byte(const uint8_t *byte) { return *byte; }
* Add a string, applying substitutions for the following characters:
*
* $ displays the clipped string given by fstr or cstr
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -57,9 +57,9 @@ void DWIN_String::add(const char *tpl, const int8_t index, const char *cstr/*=nu
if (wc > 255) wc |= 0x0080;
const uint8_t ch = uint8_t(wc & 0x00FF);
if (ch == '=' || ch == '~' || ch == '*') {
if (ch == '{' || ch == '~' || ch == '*') {
if (index >= 0) {
int8_t inum = index + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
int8_t inum = index + ((ch == '{') ? 0 : LCD_FIRST_TOOL);
if (ch == '*') add_character('E');
if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
add_character('0' + inum);

4
Marlin/src/lcd/language/language_cz.h
View file

@ -334,7 +334,7 @@ namespace Language_cz {
LSTR MSG_STOP_PRINT = _UxGT("Zastavit tisk");
LSTR MSG_PRINTING_OBJECT = _UxGT("Tisk objektu");
LSTR MSG_CANCEL_OBJECT = _UxGT("Zrušit objekt");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušit objekt =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušit objekt {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Obnova výpadku");
LSTR MSG_MEDIA_MENU = _UxGT("Tisknout z SD");
LSTR MSG_NO_MEDIA = _UxGT("Žádná SD karta");
@ -512,7 +512,7 @@ namespace Language_cz {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Vytáhněte, klikněte");
LSTR MSG_MIX = _UxGT("Mix");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponenta =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponenta {");
LSTR MSG_MIXER = _UxGT("Mixér");
LSTR MSG_GRADIENT = _UxGT("Přechod");
LSTR MSG_FULL_GRADIENT = _UxGT("Celý přechod");

6
Marlin/src/lcd/language/language_de.h
View file

@ -277,7 +277,7 @@ namespace Language_de {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Violett");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Weiß");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Standard");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal {");
LSTR MSG_LEDS2 = _UxGT("Lichter #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Licht #2 Voreinst.");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Helligkeit");
@ -461,7 +461,7 @@ namespace Language_de {
LSTR MSG_END_LOOPS = _UxGT("Wiederholung beenden");
LSTR MSG_PRINTING_OBJECT = _UxGT("Objekt drucken");
LSTR MSG_CANCEL_OBJECT = _UxGT("Objekt abbrechen");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Objekt abbrechen =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Objekt abbrechen {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Wiederh. n. Stroma.");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Druckauftrag fortset.");
LSTR MSG_MEDIA_MENU = _UxGT("Druck vom Medium");
@ -692,7 +692,7 @@ namespace Language_de {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Entfernen, klicken");
LSTR MSG_MIX = _UxGT("Mix");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponente =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponente {");
LSTR MSG_MIXER = _UxGT("Mixer");
LSTR MSG_GRADIENT = _UxGT("Gradient"); // equal Farbverlauf
LSTR MSG_FULL_GRADIENT = _UxGT("Volle Gradient");

10
Marlin/src/lcd/language/language_en.h
View file

@ -30,7 +30,7 @@
* Substitutions are applied for the following characters when used in menu items titles:
*
* $ displays an inserted string
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -298,7 +298,7 @@ namespace Language_en {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Violet");
LSTR MSG_SET_LEDS_WHITE = _UxGT("White");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Default");
LSTR MSG_LED_CHANNEL_N = _UxGT("Channel =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Channel {");
LSTR MSG_LEDS2 = _UxGT("Lights #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Light #2 Presets");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Brightness");
@ -505,7 +505,7 @@ namespace Language_en {
LSTR MSG_HOST_START_PRINT = _UxGT("Start Host Print");
LSTR MSG_PRINTING_OBJECT = _UxGT("Printing Object");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancel Object");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Object =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Object {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Continue Print Job");
LSTR MSG_MEDIA_MENU = _UxGT("Print from ") MEDIA_TYPE_EN;
LSTR MSG_TURN_OFF = _UxGT("Turn off the printer");
@ -514,7 +514,7 @@ namespace Language_en {
LSTR MSG_HOST_START_PRINT = _UxGT("Host Start");
LSTR MSG_PRINTING_OBJECT = _UxGT("Print Obj");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancel Obj");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Obj =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Obj {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Continue Job");
LSTR MSG_MEDIA_MENU = MEDIA_TYPE_EN _UxGT(" Print");
LSTR MSG_TURN_OFF = _UxGT("Turn off now");
@ -757,7 +757,7 @@ namespace Language_en {
LSTR MSG_MMU2_REMOVE_AND_CLICK = _UxGT("Remove and click...");
LSTR MSG_MIX = _UxGT("Mix");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Component =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Component {");
LSTR MSG_MIXER = _UxGT("Mixer");
LSTR MSG_GRADIENT = _UxGT("Gradient");
LSTR MSG_FULL_GRADIENT = _UxGT("Full Gradient");

4
Marlin/src/lcd/language/language_es.h
View file

@ -338,7 +338,7 @@ namespace Language_es {
LSTR MSG_STOP_PRINT = _UxGT("Detener impresión");
LSTR MSG_PRINTING_OBJECT = _UxGT("Imprimiendo Objeto");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancelar Objeto");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Objeto =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Objeto {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Rec. Fallo electrico");
LSTR MSG_MEDIA_MENU = _UxGT("Imprim. desde SD/FD");
LSTR MSG_NO_MEDIA = _UxGT("SD/FD no presente");
@ -510,7 +510,7 @@ namespace Language_es {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Retirar, y pulsar");
LSTR MSG_MIX = _UxGT("Mezcla");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Componente =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Componente {");
LSTR MSG_MIXER = _UxGT("Miezclador");
LSTR MSG_GRADIENT = _UxGT("Degradado");
LSTR MSG_FULL_GRADIENT = _UxGT("Degradado Total");

4
Marlin/src/lcd/language/language_fr.h
View file

@ -353,7 +353,7 @@ namespace Language_fr {
LSTR MSG_STOP_PRINT = _UxGT("Arrêter impr.");
LSTR MSG_PRINTING_OBJECT = _UxGT("Impression objet");
LSTR MSG_CANCEL_OBJECT = _UxGT("Annuler objet");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Annuler objet =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Annuler objet {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Récup. coup.");
LSTR MSG_MEDIA_MENU = _UxGT("Impression SD");
LSTR MSG_NO_MEDIA = _UxGT("Pas de média");
@ -540,7 +540,7 @@ namespace Language_fr {
LSTR MSG_MMU2_RESETTING = _UxGT("Réinit. MMU...");
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Retrait, click");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Composante =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Composante {");
LSTR MSG_MIXER = _UxGT("Mixeur");
LSTR MSG_GRADIENT = _UxGT("Dégradé");
LSTR MSG_FULL_GRADIENT = _UxGT("Dégradé complet");

4
Marlin/src/lcd/language/language_fr_na.h
View file

@ -353,7 +353,7 @@ namespace Language_fr_na {
LSTR MSG_STOP_PRINT = _UxGT("Arreter impr.");
LSTR MSG_PRINTING_OBJECT = _UxGT("Impression objet");
LSTR MSG_CANCEL_OBJECT = _UxGT("Annuler objet");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Annuler objet =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Annuler objet {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Recup. coup.");
LSTR MSG_MEDIA_MENU = _UxGT("Impression SD");
LSTR MSG_NO_MEDIA = _UxGT("Pas de media");
@ -543,7 +543,7 @@ namespace Language_fr_na {
LSTR MSG_MMU2_RESETTING = _UxGT("Reinit. MMU...");
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Retrait, click");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Composante =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Composante {");
LSTR MSG_MIXER = _UxGT("Mixeur");
LSTR MSG_GRADIENT = _UxGT("Degrade");
LSTR MSG_FULL_GRADIENT = _UxGT("Degrade complet");

6
Marlin/src/lcd/language/language_gl.h
View file

@ -22,7 +22,7 @@
#pragma once
/**
* Galician language (ISO "gl")
* Galician language
*
* LCD Menu Messages
* See also https://marlinfw.org/docs/development/lcd_language.html
@ -342,7 +342,7 @@ namespace Language_gl {
LSTR MSG_STOP_PRINT = _UxGT("Deter impresión");
LSTR MSG_PRINTING_OBJECT = _UxGT("Imprimindo Obxecto");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancelar Obxecto");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Obxecto =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Obxecto {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Recuperar Impresión");
LSTR MSG_MEDIA_MENU = _UxGT("Tarxeta SD");
LSTR MSG_NO_MEDIA = _UxGT("Sen tarxeta SD");
@ -525,7 +525,7 @@ namespace Language_gl {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Expulsar, premer");
LSTR MSG_MIX = _UxGT("Mestura");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Compoñente =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Compoñente {");
LSTR MSG_MIXER = _UxGT("Mesturadora");
LSTR MSG_GRADIENT = _UxGT("Degradado");
LSTR MSG_FULL_GRADIENT = _UxGT("Degradado Total");

12
Marlin/src/lcd/language/language_hu.h
View file

@ -240,7 +240,7 @@ namespace Language_hu {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Viola");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Fehér");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Alapérték");
LSTR MSG_LED_CHANNEL_N = _UxGT("Csatorna =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Csatorna {");
LSTR MSG_LEDS2 = _UxGT("LED-ek #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Fény #2 megadott");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Fényerö");
@ -284,10 +284,10 @@ namespace Language_hu {
LSTR MSG_FLOWMETER_SAFETY = _UxGT("Áramlásbiztonság");
LSTR MSG_LASER = _UxGT("Lézer");
LSTR MSG_FAN_SPEED = _UxGT("Hütés sebesség");
LSTR MSG_FAN_SPEED_N = _UxGT("Hütés sebesség =");
LSTR MSG_STORED_FAN_N = _UxGT("Tárolt hütés =");
LSTR MSG_FAN_SPEED_N = _UxGT("Hütés sebesség {");
LSTR MSG_STORED_FAN_N = _UxGT("Tárolt hütés {");
LSTR MSG_EXTRA_FAN_SPEED = _UxGT("Extra hütés sebesség");
LSTR MSG_EXTRA_FAN_SPEED_N = _UxGT("Extra hütés sebesség =");
LSTR MSG_EXTRA_FAN_SPEED_N = _UxGT("Extra hütés sebesség {");
LSTR MSG_CONTROLLER_FAN = _UxGT("Hütésvezérlés");
LSTR MSG_CONTROLLER_FAN_IDLE_SPEED = _UxGT("Alapjárat");
LSTR MSG_CONTROLLER_FAN_AUTO_ON = _UxGT("Automatikus mód");
@ -396,7 +396,7 @@ namespace Language_hu {
LSTR MSG_END_LOOPS = _UxGT("Hurok ismétlés vége");
LSTR MSG_PRINTING_OBJECT = _UxGT("Objektum nyomtatása");
LSTR MSG_CANCEL_OBJECT = _UxGT("Objektum törlése");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Objektum törlése =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Objektum törlése {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Kiesés helyreáll.");
LSTR MSG_MEDIA_MENU = _UxGT("Nyomtatás tárolóról");
LSTR MSG_NO_MEDIA = _UxGT("Nincs tároló");
@ -587,7 +587,7 @@ namespace Language_hu {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Kidob, kattint");
LSTR MSG_MIX = _UxGT("Kever");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Összetevö =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Összetevö {");
LSTR MSG_MIXER = _UxGT("Keverö");
LSTR MSG_GRADIENT = _UxGT("Színátm.");
LSTR MSG_FULL_GRADIENT = _UxGT("Teljes színátm.");

8
Marlin/src/lcd/language/language_it.h
View file

@ -30,7 +30,7 @@
* Substitutions are applied for the following characters when used in menu items titles:
*
* $ displays an inserted string
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -293,7 +293,7 @@ namespace Language_it {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Viola");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Bianco");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Predefinito");
LSTR MSG_LED_CHANNEL_N = _UxGT("Canale =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Canale {");
LSTR MSG_LEDS2 = _UxGT("Luci #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Presets luce #2");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Luminosità");
@ -498,7 +498,7 @@ namespace Language_it {
LSTR MSG_END_LOOPS = _UxGT("Fine cicli di rip.");
LSTR MSG_PRINTING_OBJECT = _UxGT("Stampa Oggetto");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancella Oggetto");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Canc. Oggetto =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Canc. Oggetto {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Ripresa da PowerLoss");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Cont.proc.stampa");
LSTR MSG_MEDIA_MENU = _UxGT("Stampa da media");
@ -734,7 +734,7 @@ namespace Language_it {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Rimuovi, click");
LSTR MSG_MIX = _UxGT("Miscela");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Componente =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Componente {");
LSTR MSG_MIXER = _UxGT("Miscelatore");
LSTR MSG_GRADIENT = _UxGT("Gradiente");
LSTR MSG_FULL_GRADIENT = _UxGT("Gradiente pieno");

8
Marlin/src/lcd/language/language_pl.h
View file

@ -30,7 +30,7 @@
* Substitutions are applied for the following characters when used in menu items titles:
*
* $ displays an inserted string
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -221,7 +221,7 @@ namespace Language_pl {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Fioletowy");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Biały");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Domyślny");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanał =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanał {");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Jasność");
LSTR MSG_CUSTOM_LEDS = _UxGT("Własne światła");
LSTR MSG_INTENSITY_R = _UxGT("Czerwony");
@ -330,7 +330,7 @@ namespace Language_pl {
LSTR MSG_STOP_PRINT = _UxGT("Stop");
LSTR MSG_PRINTING_OBJECT = _UxGT("Drukowanie obiektu");
LSTR MSG_CANCEL_OBJECT = _UxGT("Anunuj obiekt");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Anunuj obiekt =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Anunuj obiekt {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Odzyskiwanie po awarii");
LSTR MSG_MEDIA_MENU = _UxGT("Karta SD");
LSTR MSG_NO_MEDIA = _UxGT("Brak karty");
@ -474,7 +474,7 @@ namespace Language_pl {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Usuń, kliknij");
LSTR MSG_MIX = _UxGT("Miks");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponent =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponent {");
LSTR MSG_MIXER = _UxGT("Mikser");
LSTR MSG_FULL_GRADIENT = _UxGT("Pełny gradient");
LSTR MSG_TOGGLE_MIX = _UxGT("Przełacz miks");

2
Marlin/src/lcd/language/language_pt_br.h
View file

@ -293,7 +293,7 @@ namespace Language_pt_br {
LSTR MSG_STOP_PRINT = _UxGT("Parar impressão");
LSTR MSG_PRINTING_OBJECT = _UxGT("Imprimindo objeto");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancelar Objeto");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Objeto =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancelar Objeto {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Recuperar Impressão");
LSTR MSG_MEDIA_MENU = _UxGT("Imprimir do SD");
LSTR MSG_NO_MEDIA = _UxGT("Sem cartão SD");

4
Marlin/src/lcd/language/language_ro.h
View file

@ -348,7 +348,7 @@ namespace Language_ro {
LSTR MSG_STOP_PRINT = _UxGT("Stop Print");
LSTR MSG_PRINTING_OBJECT = _UxGT("Printing Object");
LSTR MSG_CANCEL_OBJECT = _UxGT("Cancel Object");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Object =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Cancel Object {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Outage Recovery");
LSTR MSG_MEDIA_MENU = _UxGT("Print from Media");
LSTR MSG_NO_MEDIA = _UxGT("No Media");
@ -532,7 +532,7 @@ namespace Language_ro {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Remove, click");
LSTR MSG_MIX = _UxGT("Mix");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Component =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Component {");
LSTR MSG_MIXER = _UxGT("Mixer");
LSTR MSG_GRADIENT = _UxGT("Gradient");
LSTR MSG_FULL_GRADIENT = _UxGT("Full Gradient");

6
Marlin/src/lcd/language/language_ru.h
View file

@ -310,7 +310,7 @@ namespace Language_ru {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Фиолетовый");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Белый");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Свет по умолчанию");
LSTR MSG_LED_CHANNEL_N = _UxGT("Канал =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Канал {");
LSTR MSG_LEDS2 = _UxGT("Свет #2");
#if LCD_WIDTH > 21 || HAS_DWIN_E3V2
LSTR MSG_NEO2_PRESETS = _UxGT("Свет #2 предустановки");
@ -485,7 +485,7 @@ namespace Language_ru {
LSTR MSG_STOP_PRINT = _UxGT("Остановить печать");
LSTR MSG_PRINTING_OBJECT = _UxGT("Печать объекта");
LSTR MSG_CANCEL_OBJECT = _UxGT("Завершить объект");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Завершить объект =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Завершить объект {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Восстановение сбоя");
LSTR MSG_MEDIA_MENU = _UxGT("Печать с SD карты");
LSTR MSG_NO_MEDIA = _UxGT("Нет SD карты");
@ -734,7 +734,7 @@ namespace Language_ru {
#else
LSTR MSG_MIX = _UxGT("Смешив.");
#endif
LSTR MSG_MIX_COMPONENT_N = _UxGT("Компонент =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Компонент {");
LSTR MSG_MIXER = _UxGT("Смеситель");
LSTR MSG_GRADIENT = _UxGT("Градиент");
LSTR MSG_FULL_GRADIENT = _UxGT("Полный градиент");

8
Marlin/src/lcd/language/language_sk.h
View file

@ -34,7 +34,7 @@
* Substitutions are applied for the following characters when used in menu items titles:
*
* $ displays an inserted string
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -294,7 +294,7 @@ namespace Language_sk {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Fialová");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Biela");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Obnoviť nastavenie");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanál =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanál {");
LSTR MSG_LEDS2 = _UxGT("Svetlo #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Predvolby svetla #2");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Jas");
@ -500,7 +500,7 @@ namespace Language_sk {
LSTR MSG_HOST_START_PRINT = _UxGT("Spustiť z hosta");
LSTR MSG_PRINTING_OBJECT = _UxGT("Tlačím objekt");
LSTR MSG_CANCEL_OBJECT = _UxGT("Zrušiť objekt");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušiť objekt =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušiť objekt {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Pokračovať v úlohe");
LSTR MSG_MEDIA_MENU = _UxGT("Vytlačiť z karty");
LSTR MSG_TURN_OFF = _UxGT("Vypnite tlačiareň");
@ -509,7 +509,7 @@ namespace Language_sk {
LSTR MSG_HOST_START_PRINT = _UxGT("Spustiť z hosta");
LSTR MSG_PRINTING_OBJECT = _UxGT("Tlačím obj.");
LSTR MSG_CANCEL_OBJECT = _UxGT("Zrušiť obj.");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušiť obj. =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Zrušiť obj. {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Pokrač. v úlohe");
LSTR MSG_MEDIA_MENU = _UxGT("Tlač z karty");
LSTR MSG_TURN_OFF = _UxGT("Vypnit. teraz");

6
Marlin/src/lcd/language/language_sv.h
View file

@ -233,7 +233,7 @@ namespace Language_sv {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Violet");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Vitt");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Standard");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal {");
LSTR MSG_LEDS2 = _UxGT("Ljus #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Ljus #2 Förinställd");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Ljusstyrka");
@ -381,7 +381,7 @@ namespace Language_sv {
LSTR MSG_END_LOOPS = _UxGT("Slut Upprepningsloop");
LSTR MSG_PRINTING_OBJECT = _UxGT("Skriver Objekt");
LSTR MSG_CANCEL_OBJECT = _UxGT("Avbryt Objekt");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Avbryt Objekt =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Avbryt Objekt {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Ström Avbrott");
LSTR MSG_MEDIA_MENU = _UxGT("Skriv fråm Media");
LSTR MSG_NO_MEDIA = _UxGT("Inget Media");
@ -569,7 +569,7 @@ namespace Language_sv {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Ta bort, Klicka");
LSTR MSG_MIX = _UxGT("Mixa");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponent =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Komponent {");
LSTR MSG_MIXER = _UxGT("Mixer");
LSTR MSG_GRADIENT = _UxGT("Gradient");
LSTR MSG_FULL_GRADIENT = _UxGT("Full Gradient");

8
Marlin/src/lcd/language/language_tr.h
View file

@ -280,7 +280,7 @@ namespace Language_tr {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Menekşe");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Beyaz");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("Varsayılan");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Kanal {");
LSTR MSG_LEDS2 = _UxGT("Işıklar #2");
LSTR MSG_NEO2_PRESETS = _UxGT("Işık #2 Ön Ayarları");
LSTR MSG_NEO2_BRIGHTNESS = _UxGT("Parlaklık");
@ -479,7 +479,7 @@ namespace Language_tr {
LSTR MSG_HOST_START_PRINT = _UxGT("Host Baskıyı başlat");
LSTR MSG_PRINTING_OBJECT = _UxGT("Yazdırma Nesnesi");
LSTR MSG_CANCEL_OBJECT = _UxGT("Nesneyi İptal Et");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Nesneyi İptal Et =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Nesneyi İptal Et {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("Yazdırmaya Devam Et");
LSTR MSG_MEDIA_MENU = _UxGT("SD Karttan Yazdır");
LSTR MSG_TURN_OFF = _UxGT("Yazıcıyı kapat");
@ -488,7 +488,7 @@ namespace Language_tr {
LSTR MSG_HOST_START_PRINT = _UxGT("Host Başlatma");
LSTR MSG_PRINTING_OBJECT = _UxGT("Nesneyi Yazdır");
LSTR MSG_CANCEL_OBJECT = _UxGT("Nesneyi İptal Et");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Nesneyi İptal Et =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Nesneyi İptal Et {");
LSTR MSG_CONTINUE_PRINT_JOB = _UxGT("İşe Devam Et");
LSTR MSG_MEDIA_MENU = MEDIA_TYPE_EN _UxGT(" Yazdır");
LSTR MSG_TURN_OFF = _UxGT("Şimdi kapat");
@ -720,7 +720,7 @@ namespace Language_tr {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("Kaldır, tıkla");
LSTR MSG_MIX = _UxGT("Karışım");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Bileşen =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Bileşen {");
LSTR MSG_MIXER = _UxGT("Karıştırıcı");
LSTR MSG_GRADIENT = _UxGT("Gradyan");
LSTR MSG_FULL_GRADIENT = _UxGT("Tam Gradyan");

6
Marlin/src/lcd/language/language_uk.h
View file

@ -313,7 +313,7 @@ namespace Language_uk {
LSTR MSG_SET_LEDS_VIOLET = _UxGT("Фіолетовий");
LSTR MSG_SET_LEDS_WHITE = _UxGT("Білий");
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("За умовчанням");
LSTR MSG_LED_CHANNEL_N = _UxGT("Канал =");
LSTR MSG_LED_CHANNEL_N = _UxGT("Канал {");
LSTR MSG_LEDS2 = _UxGT("Світло #2");
#if LCD_WIDTH > 21 || HAS_DWIN_E3V2
LSTR MSG_NEO2_PRESETS = _UxGT("Передустановка світла #2");
@ -507,7 +507,7 @@ namespace Language_uk {
LSTR MSG_END_LOOPS = _UxGT("End Repeat Loops"); // needs translation
LSTR MSG_PRINTING_OBJECT = _UxGT("Друк об'єкта");
LSTR MSG_CANCEL_OBJECT = _UxGT("Завершити об'єкт");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Завершити об'єкт =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("Завершити об'єкт {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("Віднов. після збою");
LSTR MSG_MEDIA_MENU = _UxGT("Друкувати з SD");
LSTR MSG_NO_MEDIA = _UxGT("SD-картки немає");
@ -780,7 +780,7 @@ namespace Language_uk {
#else
LSTR MSG_MIX = _UxGT("Змішув.");
#endif
LSTR MSG_MIX_COMPONENT_N = _UxGT("Компонент =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("Компонент {");
LSTR MSG_MIXER = _UxGT("Змішувач");
LSTR MSG_GRADIENT = _UxGT("Градієнт");
LSTR MSG_FULL_GRADIENT = _UxGT("Повний градієнт");

44
Marlin/src/lcd/language/language_zh_CN.h
View file

@ -198,27 +198,27 @@ namespace Language_zh_CN {
LSTR MSG_UBL_6_FINE_TUNE_ALL = _UxGT("6. 细调所有的");
LSTR MSG_UBL_7_SAVE_MESH = _UxGT("7. 保存热床网格");
LSTR MSG_LED_CONTROL = _UxGT("LED控制"); // "LED Control")
LSTR MSG_LEDS = _UxGT("灯"); // "Lights")
LSTR MSG_LED_PRESETS = _UxGT("灯预置"); // "Light Presets")
LSTR MSG_SET_LEDS_RED = _UxGT("红"); // "Red")
LSTR MSG_SET_LEDS_ORANGE = _UxGT("橙"); // "Orange")
LSTR MSG_SET_LEDS_YELLOW = _UxGT("黄"); // "Yellow")
LSTR MSG_SET_LEDS_GREEN = _UxGT("绿"); // "Green")
LSTR MSG_SET_LEDS_BLUE = _UxGT("蓝"); // "Blue")
LSTR MSG_SET_LEDS_INDIGO = _UxGT("青"); // "Indigo")
LSTR MSG_SET_LEDS_VIOLET = _UxGT("紫"); // "Violet")
LSTR MSG_SET_LEDS_WHITE = _UxGT("白"); // "White")
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("缺省"); // "Default")
LSTR MSG_CUSTOM_LEDS = _UxGT("定制灯"); // "Custom Lights")
LSTR MSG_INTENSITY_R = _UxGT("红饱和度"); // "Red Intensity")
LSTR MSG_INTENSITY_G = _UxGT("绿饱和度"); // "Green Intensity")
LSTR MSG_INTENSITY_B = _UxGT("蓝饱和度"); // "Blue Intensity")
LSTR MSG_INTENSITY_W = _UxGT("白饱和度"); // "White Intensity")
LSTR MSG_LED_BRIGHTNESS = _UxGT("亮度"); // "Brightness")
LSTR MSG_LED_CONTROL = _UxGT("LED控制"); // "LED Control"
LSTR MSG_LEDS = _UxGT("灯"); // "Lights"
LSTR MSG_LED_PRESETS = _UxGT("灯预置"); // "Light Presets"
LSTR MSG_SET_LEDS_RED = _UxGT("红"); // "Red"
LSTR MSG_SET_LEDS_ORANGE = _UxGT("橙"); // "Orange"
LSTR MSG_SET_LEDS_YELLOW = _UxGT("黄"); // "Yellow"
LSTR MSG_SET_LEDS_GREEN = _UxGT("绿"); // "Green"
LSTR MSG_SET_LEDS_BLUE = _UxGT("蓝"); // "Blue"
LSTR MSG_SET_LEDS_INDIGO = _UxGT("青"); // "Indigo"
LSTR MSG_SET_LEDS_VIOLET = _UxGT("紫"); // "Violet"
LSTR MSG_SET_LEDS_WHITE = _UxGT("白"); // "White"
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("缺省"); // "Default"
LSTR MSG_CUSTOM_LEDS = _UxGT("定制灯"); // "Custom Lights"
LSTR MSG_INTENSITY_R = _UxGT("红饱和度"); // "Red Intensity"
LSTR MSG_INTENSITY_G = _UxGT("绿饱和度"); // "Green Intensity"
LSTR MSG_INTENSITY_B = _UxGT("蓝饱和度"); // "Blue Intensity"
LSTR MSG_INTENSITY_W = _UxGT("白饱和度"); // "White Intensity"
LSTR MSG_LED_BRIGHTNESS = _UxGT("亮度"); // "Brightness"
LSTR MSG_MOVING = _UxGT("移动..."); // "Moving...")
LSTR MSG_FREE_XY = _UxGT("释放 XY"); // "Free XY")
LSTR MSG_MOVING = _UxGT("移动..."); // "Moving..."
LSTR MSG_FREE_XY = _UxGT("释放 XY"); // "Free XY"
LSTR MSG_MOVE_X = _UxGT("移动X"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("移动Y"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("移动Z"); // "Move Z"
@ -348,7 +348,7 @@ namespace Language_zh_CN {
LSTR MSG_STOP_PRINT = _UxGT("停止打印"); // "Stop print"
LSTR MSG_PRINTING_OBJECT = _UxGT("打印物体");
LSTR MSG_CANCEL_OBJECT = _UxGT("取消物体");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("取消物体 =");
LSTR MSG_CANCEL_OBJECT_N = _UxGT("取消物体 {");
LSTR MSG_OUTAGE_RECOVERY = _UxGT("中断恢复");
LSTR MSG_MEDIA_MENU = _UxGT("从存储卡上打印"); // "Print from SD"
LSTR MSG_NO_MEDIA = _UxGT("无存储卡"); // "No SD card"
@ -532,7 +532,7 @@ namespace Language_zh_CN {
LSTR MSG_MMU2_EJECT_RECOVER = _UxGT("移出, 按下");
LSTR MSG_MIX = _UxGT("混合");
LSTR MSG_MIX_COMPONENT_N = _UxGT("器件 =");
LSTR MSG_MIX_COMPONENT_N = _UxGT("器件 {");
LSTR MSG_MIXER = _UxGT("混合器");
LSTR MSG_GRADIENT = _UxGT("梯度");
LSTR MSG_FULL_GRADIENT = _UxGT("全梯度");

50
Marlin/src/lcd/language/language_zh_TW.h
View file

@ -129,7 +129,7 @@ namespace Language_zh_TW {
LSTR MSG_UBL_ACTIVATE_MESH = _UxGT("啟動UBL"); // "Activate UBL"
LSTR MSG_UBL_DEACTIVATE_MESH = _UxGT("關閉UBL"); // "Deactivate UBL"
LSTR MSG_UBL_SET_TEMP_BED = _UxGT("置設熱床溫度"); // "Bed Temp"
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("置設熱床溫度"); // "Bed Temp")
LSTR MSG_UBL_BED_TEMP_CUSTOM = _UxGT("置設熱床溫度"); // "Bed Temp"
LSTR MSG_UBL_SET_TEMP_HOTEND = _UxGT("置設噴嘴溫度"); // "Hotend Temp"
LSTR MSG_UBL_HOTEND_TEMP_CUSTOM = _UxGT("熱端溫度"); // "Hotend Temp"
LSTR MSG_UBL_MESH_EDIT = _UxGT("網格編輯"); // "Mesh Edit"
@ -194,27 +194,27 @@ namespace Language_zh_TW {
LSTR MSG_UBL_6_FINE_TUNE_ALL = _UxGT("6. 細調所有的");
LSTR MSG_UBL_7_SAVE_MESH = _UxGT("7. 保存熱床網格");
LSTR MSG_LED_CONTROL = _UxGT("燈管控制"); // "LED Control")
LSTR MSG_LEDS = _UxGT("燈"); // "Lights")
LSTR MSG_LED_PRESETS = _UxGT("燈預置"); // "Light Presets")
LSTR MSG_SET_LEDS_RED = _UxGT("红"); // "Red")
LSTR MSG_SET_LEDS_ORANGE = _UxGT("橙"); // "Orange")
LSTR MSG_SET_LEDS_YELLOW = _UxGT("黃"); // "Yellow")
LSTR MSG_SET_LEDS_GREEN = _UxGT("綠"); // "Green")
LSTR MSG_SET_LEDS_BLUE = _UxGT("藍"); // "Blue")
LSTR MSG_SET_LEDS_INDIGO = _UxGT("青"); // "Indigo")
LSTR MSG_SET_LEDS_VIOLET = _UxGT("紫"); // "Violet")
LSTR MSG_SET_LEDS_WHITE = _UxGT("白"); // "White")
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("復歸"); // "Default")
LSTR MSG_CUSTOM_LEDS = _UxGT("定制燈"); // "Custom Lights")
LSTR MSG_INTENSITY_R = _UxGT("紅飽和度"); // "Red Intensity")
LSTR MSG_INTENSITY_G = _UxGT("綠飽和度"); // "Green Intensity")
LSTR MSG_INTENSITY_B = _UxGT("藍飽和度"); // "Blue Intensity")
LSTR MSG_INTENSITY_W = _UxGT("白飽和度"); // "White Intensity")
LSTR MSG_LED_BRIGHTNESS = _UxGT("亮度"); // "Brightness")
LSTR MSG_LED_CONTROL = _UxGT("燈管控制"); // "LED Control"
LSTR MSG_LEDS = _UxGT("燈"); // "Lights"
LSTR MSG_LED_PRESETS = _UxGT("燈預置"); // "Light Presets"
LSTR MSG_SET_LEDS_RED = _UxGT("红"); // "Red"
LSTR MSG_SET_LEDS_ORANGE = _UxGT("橙"); // "Orange"
LSTR MSG_SET_LEDS_YELLOW = _UxGT("黃"); // "Yellow"
LSTR MSG_SET_LEDS_GREEN = _UxGT("綠"); // "Green"
LSTR MSG_SET_LEDS_BLUE = _UxGT("藍"); // "Blue"
LSTR MSG_SET_LEDS_INDIGO = _UxGT("青"); // "Indigo"
LSTR MSG_SET_LEDS_VIOLET = _UxGT("紫"); // "Violet"
LSTR MSG_SET_LEDS_WHITE = _UxGT("白"); // "White"
LSTR MSG_SET_LEDS_DEFAULT = _UxGT("復歸"); // "Default"
LSTR MSG_CUSTOM_LEDS = _UxGT("定制燈"); // "Custom Lights"
LSTR MSG_INTENSITY_R = _UxGT("紅飽和度"); // "Red Intensity"
LSTR MSG_INTENSITY_G = _UxGT("綠飽和度"); // "Green Intensity"
LSTR MSG_INTENSITY_B = _UxGT("藍飽和度"); // "Blue Intensity"
LSTR MSG_INTENSITY_W = _UxGT("白飽和度"); // "White Intensity"
LSTR MSG_LED_BRIGHTNESS = _UxGT("亮度"); // "Brightness"
LSTR MSG_MOVING = _UxGT("移動 ..."); // "Moving...")
LSTR MSG_FREE_XY = _UxGT("釋放 XY"); // "Free XY")
LSTR MSG_MOVING = _UxGT("移動 ..."); // "Moving..."
LSTR MSG_FREE_XY = _UxGT("釋放 XY"); // "Free XY"
LSTR MSG_MOVE_X = _UxGT("移動X"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("移動Y"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("移動Z"); // "Move Z"
@ -235,10 +235,10 @@ namespace Language_zh_TW {
LSTR MSG_BED = " " LCD_STR_THERMOMETER _UxGT(" 熱床"); // "Bed"
LSTR MSG_CHAMBER = _UxGT("Enclosure");
LSTR MSG_FAN_SPEED = _UxGT("風扇速率"); // "Fan speed"
LSTR MSG_FAN_SPEED_N = _UxGT("風扇速率 =");
LSTR MSG_STORED_FAN_N = _UxGT("Stored Fan =");
LSTR MSG_FAN_SPEED_N = _UxGT("風扇速率 {");
LSTR MSG_STORED_FAN_N = _UxGT("Stored Fan {");
LSTR MSG_EXTRA_FAN_SPEED = _UxGT("額外風扇速率"); // "Extra fan speed"
LSTR MSG_EXTRA_FAN_SPEED_N = _UxGT("額外風扇速率 =");
LSTR MSG_EXTRA_FAN_SPEED_N = _UxGT("額外風扇速率 {");
LSTR MSG_FLOW = _UxGT("擠出速率");
LSTR MSG_FLOW_N = _UxGT("擠出速率 ~"); // "Flow"
LSTR MSG_CONTROL = _UxGT("控制"); // "Control"
@ -322,7 +322,7 @@ namespace Language_zh_TW {
LSTR MSG_STOP_PRINT = _UxGT("停止列印"); // "Stop print"
LSTR MSG_PRINTING_OBJECT = _UxGT("列印物件"); // "Printing Object"
LSTR MSG_CANCEL_OBJECT = _UxGT("中止物件"); // "Cancel Object"
LSTR MSG_CANCEL_OBJECT_N = _UxGT("中止物件 ="); // "Cancel Object ="
LSTR MSG_CANCEL_OBJECT_N = _UxGT("中止物件 {"); // "Cancel Object {"
LSTR MSG_OUTAGE_RECOVERY = _UxGT("中斷恢復"); // "Outage Recovery"
LSTR MSG_MEDIA_MENU = _UxGT("從記憶卡上列印"); // "Print from SD"
LSTR MSG_NO_MEDIA = _UxGT("無記憶卡"); // "No SD card"

6
Marlin/src/lcd/lcdprint.cpp
View file

@ -37,7 +37,7 @@
* Print a string with optional substitutions:
*
* $ displays the clipped string given by fstr or cstr
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -50,11 +50,11 @@ lcd_uint_t lcd_put_u8str_P(PGM_P const ptpl, const int8_t ind, const char *cstr/
lchar_t wc;
p = get_utf8_value_cb(p, read_byte_rom, wc);
if (!wc) break;
if (wc == '=' || wc == '~' || wc == '*') {
if (wc == '{' || wc == '~' || wc == '*') {
if (ind >= 0) {
if (wc == '*') { lcd_put_u8str(F("E")); n--; }
if (n) {
int8_t inum = ind + ((wc == '=') ? 0 : LCD_FIRST_TOOL);
int8_t inum = ind + ((wc == '{') ? 0 : LCD_FIRST_TOOL);
if (inum >= 10) {
lcd_put_lchar('0' + (inum / 10)); n--;
inum %= 10;

2
Marlin/src/lcd/lcdprint.h
View file

@ -209,7 +209,7 @@ inline int lcd_put_u8str(const lcd_uint_t col, const lcd_uint_t row, FSTR_P cons
* @brief Draw a string with optional substitution
* @details Print a string with optional substitutions:
* $ displays the clipped string given by fstr or cstr
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder

6
Marlin/src/lcd/tft/tft_string.cpp
View file

@ -179,7 +179,7 @@ void TFT_String::set() {
* Add a string, applying substitutions for the following characters:
*
* $ displays the string given by fstr or cstr
* = displays '0'....'10' for indexes 0 - 10
* { displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
@ -191,9 +191,9 @@ void TFT_String::add(const char *tpl, const int8_t index, const char *cstr/*=nul
tpl = get_utf8_value_cb(tpl, read_byte_ram, wc);
const uint16_t ch = uint16_t(wc);
if (ch == '=' || ch == '~' || ch == '*') {
if (ch == '{' || ch == '~' || ch == '*') {
if (index >= 0) {
int8_t inum = index + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
int8_t inum = index + ((ch == '{') ? 0 : LCD_FIRST_TOOL);
if (ch == '*') add_character('E');
if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
add_character('0' + inum);