From 488d9d4b3898f1c3bb69be618164daa94c003471 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 28 Apr 2021 18:02:36 +0200 Subject: [PATCH] Remove "Firmware" from translations deleted another unused "Firmware" define in language.h --- Firmware/language.h | 2 -- Firmware/messages.c | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_nl.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 1 insertion(+), 34 deletions(-) diff --git a/Firmware/language.h b/Firmware/language.h index 15cafb787..736d522e3 100644 --- a/Firmware/language.h +++ b/Firmware/language.h @@ -21,8 +21,6 @@ #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" #endif -#define MSG_FW_VERSION "Firmware" - #if (LANG_MODE == 0) //primary language only #define PROGMEM_I2 __attribute__((section(".progmem0"))) #define PROGMEM_I1 __attribute__((section(".progmem1"))) diff --git a/Firmware/messages.c b/Firmware/messages.c index 5f1bba101..fac7bd176 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -131,7 +131,6 @@ const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8 const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8 const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////c=8 const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////c=8 -const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////c=8 const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////c=8 const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5 const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////c=20 r=8 @@ -168,6 +167,7 @@ const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////c=18 #endif //not internationalized messages +const char MSG_FIRMWARE[] PROGMEM_N1 = ISTR("Firmware"); ////c=8 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = ISTR("FlashAir"); ////c=8 const char MSG_PINDA[] PROGMEM_N1 = ISTR("PINDA");////c=5 const char WELCOME_MSG[] PROGMEM_N1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index dfbb7d021..0d404cb2c 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -964,9 +964,6 @@ #MSG_FALSE_TRIGGERING c=20 "False triggering" -#MSG_FIRMWARE c=8 -"Firmware" - #MSG_STRICT c=8 "Strict" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b80feee07..d40108c96 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1286,10 +1286,6 @@ "False triggering" "Falesne spusteni" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Prisne" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 22cc37c58..041ca0044 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1286,10 +1286,6 @@ "False triggering" "Falschtriggerung" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Strikt" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 737353d86..5f6106b52 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1286,10 +1286,6 @@ "False triggering" "Falsa activacion" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Estrict" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 66bde468e..05a04b5f2 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1286,10 +1286,6 @@ "False triggering" "Faux declenchement" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Stricte" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1dbae9fa6..7666e97a5 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1286,10 +1286,6 @@ "False triggering" "Falso innesco" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Esatto" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 0b16a91c5..20defde3e 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1286,10 +1286,6 @@ "False triggering" "Valse triggering" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Strikt" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c53bbe99c..90e6e4dda 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1286,10 +1286,6 @@ "False triggering" "Falszywy alarm" -#MSG_FIRMWARE c=8 -"Firmware" -"\x00" - #MSG_STRICT c=8 "Strict" "Restr."