From fad2a60ce6ad364b7da84623cd9a94966ee3e412 Mon Sep 17 00:00:00 2001 From: Dim3nsioneer Date: Wed, 19 Mar 2014 12:23:35 +0100 Subject: [PATCH] Corrections for preheat extension in language.h --- Marlin/language.h | 89 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index c8b7de8ef8..4082221cad 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -261,7 +261,6 @@ #if LANGUAGE_CHOICE == 2 - // LCD Menu Messages // Please note these are limited to 17 characters! @@ -277,16 +276,16 @@ #define MSG_PREHEAT_PLA0 "Rozgrzej PLA 1" #define MSG_PREHEAT_PLA1 "Rozgrzej PLA 2" #define MSG_PREHEAT_PLA2 "Rozgrzej PLA 3" - #define MSG_PREHEAT_PLA012 "Rozgrzej PLA Wszystko" + #define MSG_PREHEAT_PLA012 "Roz. PLA Wszystko" #define MSG_PREHEAT_PLA_BEDONLY "Rozgrzej PLA Loze" - #define MSG_PREHEAT_PLA_SETTINGS "Ustawienia roz. PLA" + #define MSG_PREHEAT_PLA_SETTINGS "Ustaw. rozg. PLA" #define MSG_PREHEAT_ABS "Rozgrzej ABS" #define MSG_PREHEAT_ABS0 "Rozgrzej ABS 1" #define MSG_PREHEAT_ABS1 "Rozgrzej ABS 2" #define MSG_PREHEAT_ABS2 "Rozgrzej ABS 3" - #define MSG_PREHEAT_ABS012 "Rozgrzej ABS Wszystko" + #define MSG_PREHEAT_ABS012 "Roz. ABS Wszystko" #define MSG_PREHEAT_ABS_BEDONLY "Rozgrzej ABS Loze" - #define MSG_PREHEAT_ABS_SETTINGS "Ustawienia roz. ABS" + #define MSG_PREHEAT_ABS_SETTINGS "Ustaw. rozg. ABS" #define MSG_COOLDOWN "Chlodzenie" #define MSG_SWITCH_PS_ON "Wlacz zasilacz" #define MSG_SWITCH_PS_OFF "Wylacz zasilacz" @@ -473,19 +472,19 @@ #define MSG_AUTO_HOME "Home auto." #define MSG_SET_ORIGIN "Regler origine" #define MSG_PREHEAT_PLA " Prechauffage PLA" - #define MSG_PREHEAT_PLA0 "Prechauffage PLA 1" - #define MSG_PREHEAT_PLA1 "Prechauffage PLA 2" - #define MSG_PREHEAT_PLA2 "Prechauffage PLA 3" - #define MSG_PREHEAT_PLA012 "Prechauffage PLA Tout" - #define MSG_PREHEAT_PLA_BEDONLY "Prechauffage PLA Plateau" - #define MSG_PREHEAT_PLA_SETTINGS " Regl. prechauffe PLA" + #define MSG_PREHEAT_PLA0 "Prechauff. PLA 1" + #define MSG_PREHEAT_PLA1 "Prechauff. PLA 2" + #define MSG_PREHEAT_PLA2 "Prechauff. PLA 3" + #define MSG_PREHEAT_PLA012 "Prech. PLA Tout" + #define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau" + #define MSG_PREHEAT_PLA_SETTINGS "Regl. prech. PLA" #define MSG_PREHEAT_ABS "Prechauffage ABS" - #define MSG_PREHEAT_ABS0 "Prechauffage ABS 1" - #define MSG_PREHEAT_ABS1 "Prechauffage ABS 2" - #define MSG_PREHEAT_ABS2 "Prechauffage ABS 3" - #define MSG_PREHEAT_ABS012 "Prechauffage ABS Tout" - #define MSG_PREHEAT_ABS_BEDONLY "Prechauffage ABS Plateau" - #define MSG_PREHEAT_ABS_SETTINGS "Regl. prechauffe ABS" + #define MSG_PREHEAT_ABS0 "Prechauff. ABS 1" + #define MSG_PREHEAT_ABS1 "Prechauff. ABS 2" + #define MSG_PREHEAT_ABS2 "Prechauff. ABS 3" + #define MSG_PREHEAT_ABS012 "Prech. ABS Tout" + #define MSG_PREHEAT_ABS_BEDONLY "Prech. ABS Plateau" + #define MSG_PREHEAT_ABS_SETTINGS "Regl. prech. ABS" #define MSG_COOLDOWN "Refroidir" #define MSG_SWITCH_PS_ON "Allumer alim." #define MSG_SWITCH_PS_OFF "Eteindre alim." @@ -676,16 +675,16 @@ #define MSG_PREHEAT_PLA0 "Vorwärmen PLA 1" #define MSG_PREHEAT_PLA1 "Vorwärmen PLA 2" #define MSG_PREHEAT_PLA2 "Vorwärmen PLA 3" - #define MSG_PREHEAT_PLA012 "Vorwärmen PLA Alle" - #define MSG_PREHEAT_PLA_BEDONLY "Vorwärmen PLA Bett" - #define MSG_PREHEAT_PLA_SETTINGS "Vorwärmen PLA Einstellungen" + #define MSG_PREHEAT_PLA012 "Vorw. PLA Alle" + #define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett" + #define MSG_PREHEAT_PLA_SETTINGS "Vorwärm. PLA Ein." #define MSG_PREHEAT_ABS "Vorwärmen ABS" #define MSG_PREHEAT_ABS0 "Vorwärmen ABS 1" #define MSG_PREHEAT_ABS1 "Vorwärmen ABS 2" #define MSG_PREHEAT_ABS2 "Vorwärmen ABS 3" - #define MSG_PREHEAT_ABS012 "Vorwärmen ABS Alle" - #define MSG_PREHEAT_ABS_BEDONLY "Vorwärmen ABS Bett" - #define MSG_PREHEAT_ABS_SETTINGS "Vorwärmen ABS Einstellungen" + #define MSG_PREHEAT_ABS012 "Vorw. ABS Alle" + #define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett" + #define MSG_PREHEAT_ABS_SETTINGS "Vorwärm. ABS Ein." #define MSG_COOLDOWN "Abkühlen" #define MSG_SWITCH_PS_ON "Switch Power On" #define MSG_SWITCH_PS_OFF "Switch Power Off" @@ -875,15 +874,15 @@ #define MSG_PREHEAT_PLA0 "Precalentar PLA 1" #define MSG_PREHEAT_PLA1 "Precalentar PLA 2" #define MSG_PREHEAT_PLA2 "Precalentar PLA 3" - #define MSG_PREHEAT_PLA012 "Precalentar PLA Todo" - #define MSG_PREHEAT_PLA_BEDONLY "Precalentar PLA Base" + #define MSG_PREHEAT_PLA012 "Precal. PLA Todo" + #define MSG_PREHEAT_PLA_BEDONLY "Precal. PLA Base" #define MSG_PREHEAT_PLA_SETTINGS "Ajustar temp. PLA" #define MSG_PREHEAT_ABS "Precalentar ABS" #define MSG_PREHEAT_ABS0 "Precalentar ABS 1" #define MSG_PREHEAT_ABS1 "Precalentar ABS 2" #define MSG_PREHEAT_ABS2 "Precalentar ABS 3" - #define MSG_PREHEAT_ABS012 "Precalentar ABS Todo" - #define MSG_PREHEAT_ABS_BEDONLY "Precalentar ABS Base" + #define MSG_PREHEAT_ABS012 "Precal. ABS Todo" + #define MSG_PREHEAT_ABS_BEDONLY "Precal. ABS Base" #define MSG_PREHEAT_ABS_SETTINGS "Ajustar temp. ABS" #define MSG_COOLDOWN "Enfriar" #define MSG_SWITCH_PS_ON "Switch Power On" @@ -1079,15 +1078,15 @@ #define MSG_PREHEAT_PLA0 "Преднагрев PLA0" #define MSG_PREHEAT_PLA1 "Преднагрев PLA1" #define MSG_PREHEAT_PLA2 "Преднагрев PLA2" - #define MSG_PREHEAT_PLA012 "Преднагрев PLA все " - #define MSG_PREHEAT_PLA_BEDONLY "Преднагрев PLA \002 Кровать" + #define MSG_PREHEAT_PLA012 "Преднаг. PLA все" + #define MSG_PREHEAT_PLA_BEDONLY "Пред. PLA Кровать" #define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA" #define MSG_PREHEAT_ABS "Преднагрев ABS" #define MSG_PREHEAT_ABS0 "Преднагрев ABS0" #define MSG_PREHEAT_ABS1 "Преднагрев ABS1" #define MSG_PREHEAT_ABS2 "Преднагрев ABS2" - #define MSG_PREHEAT_ABS012 "Преднагрев ABS все " - #define MSG_PREHEAT_ABS_BEDONLY "Преднагрев ABS \002 Кровать" + #define MSG_PREHEAT_ABS012 "Преднаг. ABS все " + #define MSG_PREHEAT_ABS_BEDONLY "Пред. ABS Кровать" #define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS" #define MSG_COOLDOWN "Охлаждение" #define MSG_SWITCH_PS_ON "Switch Power On" @@ -1274,15 +1273,15 @@ #define MSG_PREHEAT_PLA0 "Preriscalda PLA 1" #define MSG_PREHEAT_PLA1 "Preriscalda PLA 2" #define MSG_PREHEAT_PLA2 "Preriscalda PLA 3" - #define MSG_PREHEAT_PLA012 "Preriscalda PLA Tutto" - #define MSG_PREHEAT_PLA_BEDONLY "Preriscalda PLA Piatto" + #define MSG_PREHEAT_PLA012 "Preris. PLA Tutto" + #define MSG_PREHEAT_PLA_BEDONLY "Preri. PLA Piatto" #define MSG_PREHEAT_PLA_SETTINGS "Preris. PLA Conf" #define MSG_PREHEAT_ABS "Preriscalda ABS" #define MSG_PREHEAT_ABS0 "Preriscalda ABS 1" #define MSG_PREHEAT_ABS1 "Preriscalda ABS 2" #define MSG_PREHEAT_ABS2 "Preriscalda ABS 3" - #define MSG_PREHEAT_ABS012 "Preriscalda ABS Tutto" - #define MSG_PREHEAT_ABS_BEDONLY "Preriscalda ABS Piatto" + #define MSG_PREHEAT_ABS012 "Preris. ABS Tutto" + #define MSG_PREHEAT_ABS_BEDONLY "Preri. ABS Piatto" #define MSG_PREHEAT_ABS_SETTINGS "Preris. ABS Conf" #define MSG_COOLDOWN "Raffredda" #define MSG_SWITCH_PS_ON "Switch Power On" @@ -1471,15 +1470,15 @@ #define MSG_PREHEAT_PLA0 " pre-aquecer PLA 1" #define MSG_PREHEAT_PLA1 " pre-aquecer PLA 2" #define MSG_PREHEAT_PLA2 " pre-aquecer PLA 3" - #define MSG_PREHEAT_PLA012 " pre-aquecer PLA Tudo" - #define MSG_PREHEAT_PLA_BEDONLY " pre-aquecer PLA \002Base" + #define MSG_PREHEAT_PLA012 " pre-aq. PLA Tudo" + #define MSG_PREHEAT_PLA_BEDONLY " pre-aq. PLA \002Base" #define MSG_PREHEAT_PLA_SETTINGS "PLA setting" #define MSG_PREHEAT_ABS "Pre-aquecer ABS" #define MSG_PREHEAT_ABS0 " pre-aquecer ABS 1" #define MSG_PREHEAT_ABS1 " pre-aquecer ABS 2" #define MSG_PREHEAT_ABS2 " pre-aquecer ABS 3" - #define MSG_PREHEAT_ABS012 " pre-aquecer ABS Tudo" - #define MSG_PREHEAT_ABS_BEDONLY " pre-aquecer ABS \002Base" + #define MSG_PREHEAT_ABS012 " pre-aq. ABS Tudo" + #define MSG_PREHEAT_ABS_BEDONLY " pre-aq. ABS \002Base" #define MSG_PREHEAT_ABS_SETTINGS "ABS setting" #define MSG_COOLDOWN "Esfriar" #define MSG_SWITCH_PS_ON "Switch Power On" @@ -1675,15 +1674,15 @@ #define MSG_PREHEAT_PLA0 "Esilammita PLA 1" #define MSG_PREHEAT_PLA1 "Esilammita PLA 2" #define MSG_PREHEAT_PLA2 "Esilammita PLA 3" - #define MSG_PREHEAT_PLA012 "Esilammita PLA Kaikki" - #define MSG_PREHEAT_PLA_BEDONLY "Esilammita PLA Alusta" + #define MSG_PREHEAT_PLA012 "Esila. PLA Kaikki" + #define MSG_PREHEAT_PLA_BEDONLY "Esila. PLA Alusta" #define MSG_PREHEAT_PLA_SETTINGS "Esilamm. PLA konf" #define MSG_PREHEAT_ABS "Esilammita ABS" #define MSG_PREHEAT_ABS0 "Esilammita ABS 1" #define MSG_PREHEAT_ABS1 "Esilammita ABS 2" #define MSG_PREHEAT_ABS2 "Esilammita ABS 3" - #define MSG_PREHEAT_ABS012 "Esilammita ABS Kaikki" - #define MSG_PREHEAT_ABS_BEDONLY "Esilammita ABS Alusta" + #define MSG_PREHEAT_ABS012 "Esila. ABS Kaikki" + #define MSG_PREHEAT_ABS_BEDONLY "Esila. ABS Alusta" #define MSG_PREHEAT_ABS_SETTINGS "Esilamm. ABS konf" #define MSG_COOLDOWN "Jaahdyta" #define MSG_SWITCH_PS_ON "Virta paalle" @@ -2105,6 +2104,9 @@ #define MSG_BED "Bed" #define MSG_FAN_SPEED "Fan snelheid" #define MSG_FLOW "Flow" + #define MSG_FLOW0 "Flow 0" + #define MSG_FLOW1 "Flow 1" + #define MSG_FLOW2 "Flow 2" #define MSG_CONTROL "Control" #define MSG_MIN " \002 Min" #define MSG_MAX " \002 Max" @@ -2197,6 +2199,7 @@ #define MSG_M105_INVALID_EXTRUDER "M105 Ongeldige extruder " #define MSG_M200_INVALID_EXTRUDER "M200 Ongeldige extruder " #define MSG_M218_INVALID_EXTRUDER "M218 Ongeldige extruder " + #define MSG_M221_INVALID_EXTRUDER "M221 Ongeldige extruder " #define MSG_ERR_NO_THERMISTORS "Geen thermistors - geen temperatuur" #define MSG_M109_INVALID_EXTRUDER "M109 Ongeldige extruder " #define MSG_HEATING "Opwarmen..."