SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287

Browse source 
Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
This commit is contained in:
Scott Lahteine 2016-07-16 17:14:21 -07:00 committed by GitHub
commit ed468e848f
26 changed files with 1 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/language_an.h
View file

@ -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"

2
Marlin/language_bg.h
View file

@ -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"

2
Marlin/language_ca.h
View file

@ -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"

2
Marlin/language_cn.h
View file

@ -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"

2
Marlin/language_cz.h
View file

@ -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."

2
Marlin/language_da.h
View file

@ -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"

4
Marlin/language_de.h
View file

@ -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

2
Marlin/language_el-gr.h
View file

@ -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 "Θέρμανση κλίνης."

2
Marlin/language_el.h
View file

@ -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

6
Marlin/language_en.h
View file

@ -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

2
Marlin/language_es.h
View file

@ -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 ..."

2
Marlin/language_eu.h
View file

@ -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"

2
Marlin/language_fi.h
View file

@ -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"

2
Marlin/language_fr.h
View file

@ -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..."

2
Marlin/language_gl.h
View file

@ -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"

2
Marlin/language_hr.h
View file

@ -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."

2
Marlin/language_it.h
View file

@ -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.."

2
Marlin/language_kana.h
View file

@ -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.")

2
Marlin/language_kana_utf8.h
View file

@ -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."

2
Marlin/language_nl.h
View file

@ -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."

2
Marlin/language_pl.h
View file

@ -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..."

2
Marlin/language_pt-br.h
View file

@ -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.."

2
Marlin/language_pt-br_utf8.h
View file

@ -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.."

2
Marlin/language_pt.h
View file

@ -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.."

2
Marlin/language_pt_utf8.h
View file

@ -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.."

2
Marlin/language_ru.h
View file

@ -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 "Нагреваю стол"