andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
pull/1/head
Scott Lahteine 9 years ago
committed by GitHub
parent
7202383695 af9b1d79b1
commit
ed468e848f
26 changed files with 1 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/language_an.h
  2. 2
      Marlin/language_bg.h
  3. 2
      Marlin/language_ca.h
  4. 2
      Marlin/language_cn.h
  5. 2
      Marlin/language_cz.h
  6. 2
      Marlin/language_da.h
  7. 4
      Marlin/language_de.h
  8. 2
      Marlin/language_el-gr.h
  9. 2
      Marlin/language_el.h
  10. 6
      Marlin/language_en.h
  11. 2
      Marlin/language_es.h
  12. 2
      Marlin/language_eu.h
  13. 2
      Marlin/language_fi.h
  14. 2
      Marlin/language_fr.h
  15. 2
      Marlin/language_gl.h
  16. 2
      Marlin/language_hr.h
  17. 2
      Marlin/language_it.h
  18. 2
      Marlin/language_kana.h
  19. 2
      Marlin/language_kana_utf8.h
  20. 2
      Marlin/language_nl.h
  21. 2
      Marlin/language_pl.h
  22. 2
      Marlin/language_pt-br.h
  23. 2
      Marlin/language_pt-br_utf8.h
  24. 2
      Marlin/language_pt.h
  25. 2
      Marlin/language_pt_utf8.h
  26. 2
      Marlin/language_ru.h

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

Write Preview
Loading…
Cancel
Save