Browse Source

finished => completed

pull/1/head
Scott Lahteine 8 years ago
parent
commit
c5e51f6b96
  1. 8
      Marlin/language_cz.h
  2. 13
      Marlin/language_de.h
  3. 6
      Marlin/language_el.h
  4. 10
      Marlin/language_en.h
  5. 4
      Marlin/ultralcd.cpp

8
Marlin/language_cz.h

@ -209,12 +209,12 @@
#define MSG_INFO_BAUDRATE "Rychlost" #define MSG_INFO_BAUDRATE "Rychlost"
#define MSG_INFO_PROTOCOL "Protokol" #define MSG_INFO_PROTOCOL "Protokol"
#if LCD_WIDTH > 19 #if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Pocet tisku " #define MSG_INFO_PRINT_COUNT "Pocet tisku"
#define MSG_INFO_FINISHED_PRINTS "Dokonceno " #define MSG_INFO_COMPLETED_PRINTS "Dokonceno "
#define MSG_INFO_PRINT_TIME "Celkovy cas " #define MSG_INFO_PRINT_TIME "Celkovy cas"
#else #else
#define MSG_INFO_PRINT_COUNT "Tisky " #define MSG_INFO_PRINT_COUNT "Tisky "
#define MSG_INFO_FINISHED_PRINTS "Hotovo " #define MSG_INFO_COMPLETED_PRINTS "Hotovo"
#define MSG_INFO_PRINT_TIME "Cas " #define MSG_INFO_PRINT_TIME "Cas "
#endif #endif
#define MSG_INFO_MIN_TEMP "Teplota min" #define MSG_INFO_MIN_TEMP "Teplota min"

13
Marlin/language_de.h

@ -179,9 +179,16 @@
#define MSG_INFO_EXTRUDERS "Extruders" #define MSG_INFO_EXTRUDERS "Extruders"
#define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_BAUDRATE "Baud"
#define MSG_INFO_PROTOCOL "Protokol" #define MSG_INFO_PROTOCOL "Protokol"
#define MSG_INFO_TOTAL_PRINTS "Gesamte Drucke"
#define MSG_INFO_FINISHED_PRINTS "Beendete Drucke" #if LCD_WIDTH > 19
#define MSG_INFO_PRINT_TIME "Gesamte Druckzeit" #define MSG_INFO_TOTAL_PRINTS "Gesamte Drucke "
#define MSG_INFO_COMPLETED_PRINTS "Beendete Drucke "
#define MSG_INFO_PRINT_TIME "Gesamte Druckzeit"
#else
#define MSG_INFO_PRINT_COUNT "Prints "
#define MSG_INFO_COMPLETED_PRINTS "Completed"
#define MSG_INFO_PRINT_TIME "Duration "
#endif
#define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MIN_TEMP "Min Temp"
#define MSG_INFO_MAX_TEMP "Max Temp" #define MSG_INFO_MAX_TEMP "Max Temp"
#define MSG_INFO_PSU "Stromversorgung" #define MSG_INFO_PSU "Stromversorgung"

6
Marlin/language_el.h

@ -209,12 +209,12 @@
#define MSG_INFO_PROTOCOL "Protocol" #define MSG_INFO_PROTOCOL "Protocol"
#if LCD_WIDTH > 19 #if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Print Count " #define MSG_INFO_PRINT_COUNT "Print Count"
#define MSG_INFO_FINISHED_PRINTS "Finished " #define MSG_INFO_COMPLETED_PRINTS "Completed "
#define MSG_INFO_PRINT_TIME "Total Time " #define MSG_INFO_PRINT_TIME "Total Time "
#else #else
#define MSG_INFO_PRINT_COUNT "Prints " #define MSG_INFO_PRINT_COUNT "Prints "
#define MSG_INFO_FINISHED_PRINTS "Finished " #define MSG_INFO_COMPLETED_PRINTS "Completed"
#define MSG_INFO_PRINT_TIME "Duration " #define MSG_INFO_PRINT_TIME "Duration "
#endif #endif
#define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MIN_TEMP "Min Temp"

10
Marlin/language_en.h

@ -555,10 +555,10 @@
#if LCD_WIDTH > 19 #if LCD_WIDTH > 19
#ifndef MSG_INFO_PRINT_COUNT #ifndef MSG_INFO_PRINT_COUNT
#define MSG_INFO_PRINT_COUNT "Print Count " #define MSG_INFO_PRINT_COUNT "Print Count"
#endif #endif
#ifndef MSG_INFO_FINISHED_PRINTS #ifndef MSG_INFO_COMPLETED_PRINTS
#define MSG_INFO_FINISHED_PRINTS "Finished " #define MSG_INFO_COMPLETED_PRINTS "Completed "
#endif #endif
#ifndef MSG_INFO_PRINT_TIME #ifndef MSG_INFO_PRINT_TIME
#define MSG_INFO_PRINT_TIME "Total Time " #define MSG_INFO_PRINT_TIME "Total Time "
@ -567,8 +567,8 @@
#ifndef MSG_INFO_PRINT_COUNT #ifndef MSG_INFO_PRINT_COUNT
#define MSG_INFO_PRINT_COUNT "Prints " #define MSG_INFO_PRINT_COUNT "Prints "
#endif #endif
#ifndef MSG_INFO_FINISHED_PRINTS #ifndef MSG_INFO_COMPLETED_PRINTS
#define MSG_INFO_FINISHED_PRINTS "Finished " #define MSG_INFO_COMPLETED_PRINTS "Completed"
#endif #endif
#ifndef MSG_INFO_PRINT_TIME #ifndef MSG_INFO_PRINT_TIME
#define MSG_INFO_PRINT_TIME "Duration " #define MSG_INFO_PRINT_TIME "Duration "

4
Marlin/ultralcd.cpp

@ -1971,8 +1971,8 @@ void kill_screen(const char* lcd_msg) {
sprintf_P(timeString, PSTR("%i:%02i"), int(stats.printTime / 60 / 60), int(stats.printTime / 60) % 60); sprintf_P(timeString, PSTR("%i:%02i"), int(stats.printTime / 60 / 60), int(stats.printTime / 60) % 60);
START_SCREEN(); // 12345678901234567890 START_SCREEN(); // 12345678901234567890
STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints)); // Print Count : 999 STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints)); // Print Count: 999
STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", false, false, itostr3left(stats.finishedPrints)); // Finished : 666 STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints)); // Completed : 666
STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false, timeString); // Total Time : 123:45 STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false, timeString); // Total Time : 123:45
END_SCREEN(); END_SCREEN();
} }

Loading…
Cancel
Save