From 3cdf78a79f336ea0a6234b2ed4c36604e3a5e7ac Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 16 Apr 2017 23:00:08 -0500 Subject: [PATCH] MSG_VOLUMETRIC => MSG_FILAMENT --- Marlin/language_an.h | 2 +- Marlin/language_bg.h | 2 +- Marlin/language_ca.h | 2 +- Marlin/language_cn.h | 2 +- Marlin/language_cz.h | 2 +- Marlin/language_da.h | 2 +- Marlin/language_de.h | 2 +- Marlin/language_el-gr.h | 2 +- Marlin/language_el.h | 2 +- Marlin/language_en.h | 7 +++++-- Marlin/language_es.h | 2 +- Marlin/language_eu.h | 2 +- Marlin/language_fi.h | 2 +- Marlin/language_fr.h | 2 +- Marlin/language_gl.h | 2 +- Marlin/language_hr.h | 2 +- Marlin/language_it.h | 2 +- Marlin/language_kana.h | 2 +- Marlin/language_kana_utf8.h | 2 +- Marlin/language_nl.h | 2 +- Marlin/language_pl.h | 2 +- Marlin/language_pt-br.h | 2 +- Marlin/language_pt-br_utf8.h | 2 +- Marlin/language_pt.h | 2 +- Marlin/language_pt_utf8.h | 2 +- Marlin/language_ru.h | 2 +- Marlin/language_test.h | 6 +++--- Marlin/language_tr.h | 2 +- Marlin/language_uk.h | 2 +- Marlin/language_zh_CN.h | 2 +- Marlin/language_zh_TW.h | 2 +- Marlin/ultralcd.cpp | 2 +- 32 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index bf10b8543..d4983591d 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("E5 trangos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimiento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("Contraste") diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index 4c6db482d..fedb8ca7c 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -116,7 +116,7 @@ #define MSG_E5STEPS _UxGT("E5 стъпки/mm") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Движение") -#define MSG_VOLUMETRIC _UxGT("Нишка") +#define MSG_FILAMENT _UxGT("Нишка") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Диам. нишка") #define MSG_CONTRAST _UxGT("LCD контраст") diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index 699706f48..8502e1cac 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -120,7 +120,7 @@ #define MSG_E5STEPS _UxGT("E5passos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Moviment") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E en mm3") #define MSG_FILAMENT_DIAM _UxGT("Diam. Fil.") #define MSG_CONTRAST _UxGT("Contrast de LCD") diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index d1b59e820..228044568 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -108,7 +108,7 @@ #define MSG_E5STEPS "E5steps/mm" #define MSG_TEMPERATURE "\xc9\xd2" #define MSG_MOTION "\xdf\xb2" -#define MSG_VOLUMETRIC "Filament" +#define MSG_FILAMENT "Filament" #define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "LCD contrast" diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 77f9ac21d..ab7b86a89 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -119,7 +119,7 @@ #define MSG_E5STEPS _UxGT("E5kroku/mm") #define MSG_TEMPERATURE _UxGT("Teplota") #define MSG_MOTION _UxGT("Pohyb") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E na mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Prum.") #define MSG_CONTRAST _UxGT("Kontrast LCD") diff --git a/Marlin/language_da.h b/Marlin/language_da.h index abe1a775e..9b8c45ecd 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -117,7 +117,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatur") #define MSG_MOTION _UxGT("Bevægelse") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E i mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("LCD kontrast") diff --git a/Marlin/language_de.h b/Marlin/language_de.h index b0b50c2ae..535836fb8 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -121,7 +121,7 @@ #define MSG_E5STEPS _UxGT("E5 Steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatur") #define MSG_MOTION _UxGT("Bewegung") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm³") #define MSG_FILAMENT_DIAM _UxGT("D Fil.") #define MSG_CONTRAST _UxGT("LCD Kontrast") diff --git a/Marlin/language_el-gr.h b/Marlin/language_el-gr.h index 2a8298852..e26405a9d 100644 --- a/Marlin/language_el-gr.h +++ b/Marlin/language_el-gr.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("Bήματα Ε5 ανά μμ") #define MSG_TEMPERATURE _UxGT("Θερμοκρασία") #define MSG_MOTION _UxGT("Κίνηση") -#define MSG_VOLUMETRIC _UxGT("Νήμα") +#define MSG_FILAMENT _UxGT("Νήμα") #define MSG_VOLUMETRIC_ENABLED _UxGT("Ε σε μμ3") #define MSG_FILAMENT_DIAM _UxGT("Διάμετρος νήματος") #define MSG_CONTRAST _UxGT("Κοντράστ LCD") diff --git a/Marlin/language_el.h b/Marlin/language_el.h index 832b4c6c7..ab915f14c 100644 --- a/Marlin/language_el.h +++ b/Marlin/language_el.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("Bήματα Ε5 ανά μμ") #define MSG_TEMPERATURE _UxGT("Θερμοκρασία") #define MSG_MOTION _UxGT("Κίνηση") -#define MSG_VOLUMETRIC _UxGT("Νήμα") +#define MSG_FILAMENT _UxGT("Νήμα") #define MSG_VOLUMETRIC_ENABLED _UxGT("Ε σε μμ3") #define MSG_FILAMENT_DIAM _UxGT("Διάμετρος νήματος") #define MSG_CONTRAST _UxGT("Κοντράστ LCD") diff --git a/Marlin/language_en.h b/Marlin/language_en.h index ffa0d6694..cbc54d954 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -300,8 +300,8 @@ #ifndef MSG_MOTION #define MSG_MOTION _UxGT("Motion") #endif -#ifndef MSG_VOLUMETRIC - #define MSG_VOLUMETRIC _UxGT("Filament") +#ifndef MSG_FILAMENT + #define MSG_FILAMENT _UxGT("Filament") #endif #ifndef MSG_VOLUMETRIC_ENABLED #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") @@ -309,6 +309,9 @@ #ifndef MSG_FILAMENT_DIAM #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #endif +#ifndef MSG_ADVANCE_K + #define MSG_ADVANCE_K _UxGT("Advance K") +#endif #ifndef MSG_CONTRAST #define MSG_CONTRAST _UxGT("LCD contrast") #endif diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 7c4da00c7..10765f2b6 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -119,7 +119,7 @@ #define MSG_E5STEPS _UxGT("E5 pasos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimiento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("Contraste") diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 9c9cd0eca..063d161b4 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -106,7 +106,7 @@ #define MSG_E5STEPS _UxGT("E5 pausoak/mm") #define MSG_TEMPERATURE _UxGT("Tenperatura") #define MSG_MOTION _UxGT("Mugimendua") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("LCD kontrastea") diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index f604752a6..ad19a9b9f 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -107,7 +107,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") #define MSG_TEMPERATURE _UxGT("Lämpötila") #define MSG_MOTION _UxGT("Liike") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm³") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("LCD kontrasti") diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index c58d43943..bb8975f12 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -120,7 +120,7 @@ #define MSG_E5STEPS _UxGT("E5pas/mm") #define MSG_TEMPERATURE _UxGT("Tempzrature") #define MSG_MOTION _UxGT("Mouvement") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E en mm3") #define MSG_FILAMENT_DIAM _UxGT("Diam. Fil.") #define MSG_CONTRAST _UxGT("Contraste LCD") diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index f1a69aee4..a3dcac180 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -116,7 +116,7 @@ #define MSG_E5STEPS _UxGT("E5pasos/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movemento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("E en mm3") #define MSG_FILAMENT_DIAM _UxGT("Diam. fil.") #define MSG_CONTRAST _UxGT("Constraste LCD") diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h index 4f7eac9d7..0d5bae21b 100644 --- a/Marlin/language_hr.h +++ b/Marlin/language_hr.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") #define MSG_TEMPERATURE _UxGT("Temperature") #define MSG_MOTION _UxGT("Gibanje") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("Kontrast LCD-a") diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 70016cce6..92724e183 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -123,7 +123,7 @@ #define MSG_E5STEPS _UxGT("E5passi/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Diam. filo") #define MSG_CONTRAST _UxGT("Contrasto LCD") diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 2752ca5b4..da2e18a8a 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -151,7 +151,7 @@ #endif #define MSG_TEMPERATURE "\xb5\xdd\xc4\xde" // "ｵﾝﾄﾞ" ("Temperature") #define MSG_MOTION "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2" // "ｳｺﾞｷｾｯﾃｲ" ("Motion") -#define MSG_VOLUMETRIC "\xcc\xa8\xd7\xd2\xdd\xc4" // "ﾌｨﾗﾒﾝﾄ" ("Filament") +#define MSG_FILAMENT "\xcc\xa8\xd7\xd2\xdd\xc4" // "ﾌｨﾗﾒﾝﾄ" ("Filament") #define MSG_VOLUMETRIC_ENABLED "E in mm3" #if LCD_WIDTH >= 20 #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xc1\xae\xaf\xb9\xb2" // "ﾌｨﾗﾒﾝﾄﾁｮｯｹｲ" ("Fil. Dia.") diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index a21b1e3a7..01b393df7 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -125,7 +125,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") #define MSG_TEMPERATURE _UxGT("オンド") // "Temperature" #define MSG_MOTION _UxGT("ウゴキセッテイ") // "Motion" -#define MSG_VOLUMETRIC _UxGT("フィラメント") // "Filament" +#define MSG_FILAMENT _UxGT("フィラメント") // "Filament" #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("フィラメントチョッケイ") // "Fil. Dia." #define MSG_CONTRAST _UxGT("LCDコントラスト") // "LCD contrast" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index c75145b9b..5f25f491e 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") #define MSG_TEMPERATURE _UxGT("Temperatuur") #define MSG_MOTION _UxGT("Beweging") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Dia.") #define MSG_CONTRAST _UxGT("LCD contrast") diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 49b53b005..a7806a2ae 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -115,7 +115,7 @@ #define MSG_E5STEPS _UxGT("krokiE5/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Ruch") -#define MSG_VOLUMETRIC _UxGT("Filament") +#define MSG_FILAMENT _UxGT("Filament") #define MSG_VOLUMETRIC_ENABLED _UxGT("E w mm3") #define MSG_FILAMENT_DIAM _UxGT("Sr. fil.") #define MSG_CONTRAST _UxGT("Kontrast LCD") diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index e1d0ed4b1..f71bb92e1 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -108,7 +108,7 @@ #define MSG_E5STEPS "E5/mm" #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Movimento" -#define MSG_VOLUMETRIC "Filamento" +#define MSG_FILAMENT "Filamento" #define MSG_VOLUMETRIC_ENABLED "Extr. em mm3" #define MSG_FILAMENT_DIAM "Diametro Fil." #define MSG_CONTRAST "Contraste" diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index 2b34886a0..a2f6deaad 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -108,7 +108,7 @@ #define MSG_E5STEPS _UxGT("E5/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("Extr. em mm3") #define MSG_FILAMENT_DIAM _UxGT("Diametro Fil.") #define MSG_CONTRAST _UxGT("Contraste") diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 2682da58e..ba17986bf 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -112,7 +112,7 @@ #define MSG_E5STEPS "E5 passo/mm" #define MSG_TEMPERATURE "Temperatura" #define MSG_MOTION "Movimento" -#define MSG_VOLUMETRIC "Filamento" +#define MSG_FILAMENT "Filamento" #define MSG_VOLUMETRIC_ENABLED "E em mm3" #define MSG_FILAMENT_DIAM "Fil. Diam." #define MSG_CONTRAST "Contraste" diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index e2aedb50d..b62119b43 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -112,7 +112,7 @@ #define MSG_E5STEPS _UxGT("E5 passo/mm") #define MSG_TEMPERATURE _UxGT("Temperatura") #define MSG_MOTION _UxGT("Movimento") -#define MSG_VOLUMETRIC _UxGT("Filamento") +#define MSG_FILAMENT _UxGT("Filamento") #define MSG_VOLUMETRIC_ENABLED _UxGT("E em mm3") #define MSG_FILAMENT_DIAM _UxGT("Fil. Diam.") #define MSG_CONTRAST _UxGT("Contraste") diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index caa825cc7..a4644928a 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -111,7 +111,7 @@ #define MSG_E4STEPS _UxGT("E4 шаг/мм") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Механика") -#define MSG_VOLUMETRIC _UxGT("Пруток") +#define MSG_FILAMENT _UxGT("Пруток") #define MSG_VOLUMETRIC_ENABLED _UxGT("E в mm3") #define MSG_FILAMENT_DIAM _UxGT("Диаметр прутка") #define MSG_CONTRAST _UxGT("Контраст LCD") diff --git a/Marlin/language_test.h b/Marlin/language_test.h index 25b9c0947..61e04815d 100644 --- a/Marlin/language_test.h +++ b/Marlin/language_test.h @@ -148,7 +148,7 @@ #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 - #define MSG_VOLUMETRIC STRG_OKTAL_5 + #define MSG_FILAMENT STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 @@ -183,7 +183,7 @@ #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 - #define MSG_VOLUMETRIC STRG_OKTAL_5 + #define MSG_FILAMENT STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 @@ -218,7 +218,7 @@ #define MSG_MAIN STRG_OKTAL_2 #define MSG_TEMPERATURE STRG_OKTAL_3 #define MSG_MOTION STRG_OKTAL_4 - #define MSG_VOLUMETRIC STRG_OKTAL_5 + #define MSG_FILAMENT STRG_OKTAL_5 #define MSG_CONTRAST STRG_OKTAL_6 #define MSG_RESTORE_FAILSAFE STRG_OKTAL_7 diff --git a/Marlin/language_tr.h b/Marlin/language_tr.h index 095eedd9d..34f5c6157 100644 --- a/Marlin/language_tr.h +++ b/Marlin/language_tr.h @@ -120,7 +120,7 @@ #define MSG_E5STEPS _UxGT("E5steps/mm") // E4steps/mm #define MSG_TEMPERATURE _UxGT("Sıcaklık") // Sıcaklık #define MSG_MOTION _UxGT("Hareket") // Hareket -#define MSG_VOLUMETRIC _UxGT("Filaman") // Filaman +#define MSG_FILAMENT _UxGT("Filaman") // Filaman #define MSG_VOLUMETRIC_ENABLED _UxGT("E in mm3") // E in mm3 #define MSG_FILAMENT_DIAM _UxGT("Fil. Çap") // Fil. Çap #define MSG_CONTRAST _UxGT("LCD Kontrast") // LCD Kontrast diff --git a/Marlin/language_uk.h b/Marlin/language_uk.h index f36a366fe..774ef2308 100644 --- a/Marlin/language_uk.h +++ b/Marlin/language_uk.h @@ -116,7 +116,7 @@ #define MSG_E5STEPS _UxGT("E5кроків/мм") #define MSG_TEMPERATURE _UxGT("Температура") #define MSG_MOTION _UxGT("Рух") -#define MSG_VOLUMETRIC _UxGT("Волокно") +#define MSG_FILAMENT _UxGT("Волокно") #define MSG_VOLUMETRIC_ENABLED _UxGT("E в мм3") #define MSG_FILAMENT_DIAM _UxGT("Діам. волок.") #define MSG_CONTRAST _UxGT("контраст LCD") diff --git a/Marlin/language_zh_CN.h b/Marlin/language_zh_CN.h index 41982754e..ed9e5c984 100644 --- a/Marlin/language_zh_CN.h +++ b/Marlin/language_zh_CN.h @@ -108,7 +108,7 @@ #define MSG_ESTEPS _UxGT("挤出机步数/mm") //"Esteps/mm" #define MSG_TEMPERATURE _UxGT("温度") //"Temperature" #define MSG_MOTION _UxGT("运动") //"Motion" -#define MSG_VOLUMETRIC _UxGT("丝料测容") //"Filament" lcd_control_volumetric_menu +#define MSG_FILAMENT _UxGT("丝料测容") //"Filament" lcd_control_volumetric_menu #define MSG_VOLUMETRIC_ENABLED _UxGT("测容积mm³") //"E in mm3" volumetric_enabled #define MSG_FILAMENT_DIAM _UxGT("丝料直径") //"Fil. Dia." #define MSG_CONTRAST _UxGT("LCD对比度") //"LCD contrast" diff --git a/Marlin/language_zh_TW.h b/Marlin/language_zh_TW.h index 3d5a03b96..90aaa8200 100644 --- a/Marlin/language_zh_TW.h +++ b/Marlin/language_zh_TW.h @@ -108,7 +108,7 @@ #define MSG_ESTEPS _UxGT("擠出機步數/mm") //"Esteps/mm" #define MSG_TEMPERATURE _UxGT("溫度") //"Temperature" #define MSG_MOTION _UxGT("運動") //"Motion" -#define MSG_VOLUMETRIC _UxGT("絲料測容") //"Filament" lcd_control_volumetric_menu +#define MSG_FILAMENT _UxGT("絲料測容") //"Filament" lcd_control_volumetric_menu #define MSG_VOLUMETRIC_ENABLED _UxGT("測容積mm³") //"E in mm3" volumetric_enabled #define MSG_FILAMENT_DIAM _UxGT("絲料直徑") //"Fil. Dia." #define MSG_CONTRAST _UxGT("LCD對比度") //"LCD contrast" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 264d13549..26fe69dca 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2114,7 +2114,7 @@ void kill_screen(const char* lcd_msg) { MENU_BACK(MSG_MAIN); MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu); MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu); - MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_filament_menu); + MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu); #if HAS_LCD_CONTRAST //MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);