From af9b1d79b1e004d95cc95bb01257c605ad0ed97e Mon Sep 17 00:00:00 2001 From: esenapaj Date: Sat, 16 Jul 2016 18:39:22 +0900 Subject: [PATCH] Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files ・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German file --- 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 | 4 +--- Marlin/language_el-gr.h | 2 -- Marlin/language_el.h | 2 -- Marlin/language_en.h | 6 ------ 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 -- 26 files changed, 1 insertion(+), 57 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 2423275d9..bfabc0a57 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -148,8 +148,6 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" #define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index 8b4290467..51606947c 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -150,8 +150,6 @@ #define MSG_BABYSTEP_Y "Министъпка Y" #define MSG_BABYSTEP_Z "Министъпка Z" #define MSG_ENDSTOP_ABORT "Стоп Кр.Изключватели" -#define MSG_END_HOUR "часа" -#define MSG_END_MINUTE "минути" #define MSG_DELTA_CALIBRATE "Делта Калибровка" #define MSG_DELTA_CALIBRATE_X "Калибровка X" #define MSG_DELTA_CALIBRATE_Y "Калибровка Y" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index 27f9ff475..b90f1c395 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -149,8 +149,6 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" #define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index dc102d7bf..86c639dfa 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -153,8 +153,6 @@ #define MSG_ERR_MAXTEMP "Err: MAXTEMP" #define MSG_ERR_MINTEMP "Err: MINTEMP" #define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" #define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index f8e4cec24..54a8ae5de 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -189,8 +189,6 @@ #define MSG_ERR_MINTEMP_BED "NIZ. TEPL. PODL." #define MSG_HALTED "TISK. ZASTAVENA" #define MSG_PLEASE_RESET "Provedte reset" -#define MSG_END_HOUR "hod" -#define MSG_END_MINUTE "min" #define MSG_HEATING "Zahrivani..." #define MSG_HEATING_COMPLETE "Zahrati hotovo." #define MSG_BED_HEATING "Zahrivani podl." diff --git a/Marlin/language_da.h b/Marlin/language_da.h index 833a6b26a..b107ca05d 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -184,8 +184,6 @@ #define MSG_ERR_MINTEMP "Fejl: Min temp" #define MSG_ERR_MAXTEMP_BED "Fejl: Maks Plsde temp" #define MSG_ERR_MINTEMP_BED "Fejl: Min Plade temp" -#define MSG_END_HOUR "Timer" -#define MSG_END_MINUTE "Minutter" #define MSG_HEATING "Opvarmer..." #define MSG_HEATING_COMPLETE "Opvarmet" #define MSG_BED_HEATING "Opvarmer plade" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index f9e2644aa..9744378fc 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -159,8 +159,6 @@ #define MSG_ERR_MINTEMP LCD_STR_THERMOMETER " UNTERSCHRITTEN" #define MSG_ERR_MAXTEMP_BED "BETT " LCD_STR_THERMOMETER " ÜBERSCHRITTEN" #define MSG_ERR_MINTEMP_BED "BETT " LCD_STR_THERMOMETER " UNTERSCHRITTEN" -#define MSG_END_HOUR "Stunden" -#define MSG_END_MINUTE "Minuten" #define MSG_HEATING "Aufheizen..." #define MSG_HEATING_COMPLETE "Aufgeheizt" #define MSG_BED_HEATING "Bett aufheizen" @@ -181,7 +179,7 @@ #define MSG_INFO_PROTOCOL "Protokol" #if LCD_WIDTH > 19 - #define MSG_INFO_TOTAL_PRINTS "Gesamte Drucke " + #define MSG_INFO_PRINT_COUNT "Gesamte Drucke " #define MSG_INFO_COMPLETED_PRINTS "Beendete Drucke " #define MSG_INFO_PRINT_TIME "Gesamte Druckzeit" #else diff --git a/Marlin/language_el-gr.h b/Marlin/language_el-gr.h index 9a55eb0c8..510e8aae3 100644 --- a/Marlin/language_el-gr.h +++ b/Marlin/language_el-gr.h @@ -185,8 +185,6 @@ #define MSG_ERR_MINTEMP "Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ" #define MSG_ERR_MAXTEMP_BED "Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ" #define MSG_ERR_MINTEMP_BED "Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ" -#define MSG_END_HOUR "ώρες" -#define MSG_END_MINUTE "λεπτά" #define MSG_HEATING "Θερμαίνεται…" #define MSG_HEATING_COMPLETE "Η θέρμανση ολοκληρώθηκε." #define MSG_BED_HEATING "Θέρμανση κλίνης." diff --git a/Marlin/language_el.h b/Marlin/language_el.h index f0d94db10..9d1c8555a 100644 --- a/Marlin/language_el.h +++ b/Marlin/language_el.h @@ -187,8 +187,6 @@ #define MSG_ERR_MINTEMP_BED "ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΚΡΑΣΙΑΣ ΕΠ. ΕΚΤΥΠΩΣΗΣ" //SHORTEN #define MSG_HALTED "H εκτύπωση διακόπηκε" #define MSG_PLEASE_RESET "PLEASE RESET" //TRANSLATE -#define MSG_END_HOUR "ώρες" -#define MSG_END_MINUTE "λεπτά" #define MSG_HEATING "Θερμαίνεται…" #define MSG_HEATING_COMPLETE "Η θέρμανση ολοκληρώθηκε." //SHORTEN #define MSG_BED_HEATING "Θέρμανση ΕΠ. Εκτύπωσης" //SHORTEN diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 27444aebd..a1b38a1a9 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -491,12 +491,6 @@ #ifndef MSG_END_DAY #define MSG_END_DAY "days" #endif -#ifndef MSG_END_HOUR - #define MSG_END_HOUR "hours" -#endif -#ifndef MSG_END_MINUTE - #define MSG_END_MINUTE "minutes" -#endif #ifndef MSG_PRINT_TIME #define MSG_PRINT_TIME "Print time" #endif diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 8647a50fa..2943fcf96 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -182,8 +182,6 @@ #define MSG_ERR_MINTEMP "Error: Temp Minima" #define MSG_ERR_MAXTEMP_BED "Error: Temp Max Plataforma" #define MSG_ERR_MINTEMP_BED "Error: Temp Min Plataforma" -#define MSG_END_HOUR "horas" -#define MSG_END_MINUTE "minutos" #define MSG_HEATING "Calentando..." #define MSG_HEATING_COMPLETE "Calentamiento Completo" #define MSG_BED_HEATING "Calentando plataforma ..." diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 2b246e20d..909d6c85d 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -148,8 +148,6 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop deuseztat" -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" #define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index f3f4db27e..b73a207e2 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -149,8 +149,6 @@ #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" -#define MSG_END_HOUR "hours" -#define MSG_END_MINUTE "minutes" #define MSG_DELTA_CALIBRATE "Delta Kalibrointi" #define MSG_DELTA_CALIBRATE_X "Kalibroi X" #define MSG_DELTA_CALIBRATE_Y "Kalibroi Y" diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 30c45e78a..52adbcba0 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -158,8 +158,6 @@ #define MSG_ERR_MINTEMP "Err: TEMP. MIN" #define MSG_ERR_MAXTEMP_BED "Err: TEMP. MAX PLATEAU" #define MSG_ERR_MINTEMP_BED "Err: TEMP. MIN PLATEAU" -#define MSG_END_HOUR "heures" -#define MSG_END_MINUTE "minutes" #define MSG_HEATING "En chauffe..." #define MSG_HEATING_COMPLETE "Chauffe terminee" #define MSG_BED_HEATING "Plateau en chauffe..." diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index 87453b81c..c899c63fd 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -184,8 +184,6 @@ #define MSG_ERR_MINTEMP "Err: temp. min." #define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" #define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED" -#define MSG_END_HOUR "horas" -#define MSG_END_MINUTE "minutos" #define MSG_HEATING "Quentando..." #define MSG_HEATING_COMPLETE "Xa esta quente" #define MSG_BED_HEATING "Quentando cama" diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h index 83742ded9..603521506 100644 --- a/Marlin/language_hr.h +++ b/Marlin/language_hr.h @@ -184,8 +184,6 @@ #define MSG_ERR_MINTEMP "Err: MINTEMP" #define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" #define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED" -#define MSG_END_HOUR "sati" -#define MSG_END_MINUTE "minuta" #define MSG_HEATING "Grijanje..." #define MSG_HEATING_COMPLETE "Grijanje gotovo." #define MSG_BED_HEATING "Grijanje Bed-a." diff --git a/Marlin/language_it.h b/Marlin/language_it.h index e393f5911..2bf9a5f0f 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -163,8 +163,6 @@ #define MSG_ERR_MINTEMP "Err: TEMP MINIMA" #define MSG_ERR_MAXTEMP_BED "Err: TEMP MASSIMA PIATTO" #define MSG_ERR_MINTEMP_BED "Err: TEMP MINIMA PIATTO" -#define MSG_END_HOUR "ore" -#define MSG_END_MINUTE "minuti" #define MSG_HEATING "Riscaldamento.." #define MSG_HEATING_COMPLETE "Risc. completato" #define MSG_BED_HEATING "Risc. Piatto.." diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 894bda043..81c020ac9 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -220,8 +220,6 @@ #define MSG_ERR_MAXTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP BED") #define MSG_ERR_MINTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP BED") #endif -#define MSG_END_HOUR "\xbc\xde\xb6\xdd" // "ｼﾞｶﾝ" ("hours") -#define MSG_END_MINUTE "\xcc\xdd" // "ﾌﾝ" ("minutes") #define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3" // "ｶﾈﾂﾁｭｳ" ("Heating...") #define MSG_HEATING_COMPLETE "\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3" // "ｶﾈﾂｶﾝﾘｮｳ" ("Heating done.") #define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3" // "ﾍﾞｯﾄﾞ ｶﾈﾂﾁｭｳ" ("Bed Heating.") diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index b91212607..46aba87d2 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -169,8 +169,6 @@ #define MSG_ERR_MINTEMP "エラー:サイテイオンミマン" // "Err: MINTEMP" #define MSG_ERR_MAXTEMP_BED "エラー:ベッド サイコウオンチョウカ" // "Err: MAXTEMP BED" #define MSG_ERR_MINTEMP_BED "エラー:ベッド サイテイオンミマン" // "Err: MINTEMP BED" -#define MSG_END_HOUR "ジカン" // "hours" -#define MSG_END_MINUTE "フン" // "minutes" #define MSG_HEATING "カネツチュウ" // "Heating..." #define MSG_HEATING_COMPLETE "カネツカンリョウ" // "Heating done." #define MSG_BED_HEATING "ベッド カネツチュウ" // "Bed Heating." diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 1b1f91877..5f682bd90 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -157,8 +157,6 @@ #define MSG_ERR_MINTEMP "Err: Min. temp" #define MSG_ERR_MAXTEMP_BED "Err: Max.tmp bed" #define MSG_ERR_MINTEMP_BED "Err: Min.tmp bed" -#define MSG_END_HOUR "uur" -#define MSG_END_MINUTE "minuten" #define MSG_HEATING "Voorwarmen..." #define MSG_HEATING_COMPLETE "Voorverw. kompl." #define MSG_BED_HEATING "Bed voorverw." diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 8df809b62..b1559c4a4 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -180,8 +180,6 @@ #define MSG_ERR_MINTEMP "Err: min. temp." #define MSG_ERR_MAXTEMP_BED "Err: max. temp. loza" #define MSG_ERR_MINTEMP_BED "Err: min. temp. loza" -#define MSG_END_HOUR "godzin" -#define MSG_END_MINUTE "minut" #define MSG_HEATING "Rozgrzewanie..." #define MSG_HEATING_COMPLETE "Rozgrzano" #define MSG_BED_HEATING "Rozgrzewanie loza..." diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index c8914fc4e..3db6e15c7 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -157,8 +157,6 @@ #define MSG_ERR_MINTEMP "Err: T Minima" #define MSG_ERR_MAXTEMP_BED "Err: T Base Maxima" #define MSG_ERR_MINTEMP_BED "Err: T Base Minima" -#define MSG_END_HOUR "Horas" -#define MSG_END_MINUTE "Minutos" #define MSG_HEATING "Aquecendo..." #define MSG_HEATING_COMPLETE "Aquecida." #define MSG_BED_HEATING "Aquecendo base.." diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index 48731438b..a556c2430 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -157,8 +157,6 @@ #define MSG_ERR_MINTEMP "Err: T Mínima" #define MSG_ERR_MAXTEMP_BED "Err: T Base Máxima" #define MSG_ERR_MINTEMP_BED "Err: T Base Mínima" -#define MSG_END_HOUR "Horas" -#define MSG_END_MINUTE "Minutos" #define MSG_HEATING "Aquecendo..." #define MSG_HEATING_COMPLETE "Aquecida." #define MSG_BED_HEATING "Aquecendo base.." diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index b7c562c20..a0df879fc 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -165,8 +165,6 @@ #define MSG_ERR_MINTEMP "Err: T Minima" #define MSG_ERR_MAXTEMP_BED "Err: T Base Maxima" #define MSG_ERR_MINTEMP_BED "Err: T Base Minima" -#define MSG_END_HOUR "horas" -#define MSG_END_MINUTE "minutos" #define MSG_HEATING "Aquecendo..." #define MSG_HEATING_COMPLETE "Aquecida." #define MSG_BED_HEATING "Aquecendo base.." diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index ac8b2440c..24ce828b5 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -165,8 +165,6 @@ #define MSG_ERR_MINTEMP "Err: T Mínima" #define MSG_ERR_MAXTEMP_BED "Err: T Base Máxima" #define MSG_ERR_MINTEMP_BED "Err: T Base Mínima" -#define MSG_END_HOUR "horas" -#define MSG_END_MINUTE "minutos" #define MSG_HEATING "Aquecendo..." #define MSG_HEATING_COMPLETE "Aquecida." #define MSG_BED_HEATING "Aquecendo base.." diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index c86e34983..aa381c88f 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -156,8 +156,6 @@ #define MSG_ERR_MINTEMP "Ошибка: Т мин." #define MSG_ERR_MAXTEMP_BED "Ошибка:Т макс.стол" #define MSG_ERR_MINTEMP_BED "Ошибка:Т мин.стол" -#define MSG_END_HOUR "часов" -#define MSG_END_MINUTE "минут" #define MSG_HEATING "Нагреваю сопло..." #define MSG_HEATING_COMPLETE "Нагрев выполнен" #define MSG_BED_HEATING "Нагреваю стол"