Browse Source

finished => completed

Scott Lahteine 9 years ago
parent
commit
c5e51f6b96
5 changed files with 29 additions and 22 deletions
  1. 6
    6
      Marlin/language_cz.h
  2. 10
    3
      Marlin/language_de.h
  3. 4
    4
      Marlin/language_el.h
  4. 6
    6
      Marlin/language_en.h
  5. 3
    3
      Marlin/ultralcd.cpp

+ 6
- 6
Marlin/language_cz.h View File

209
 #define MSG_INFO_BAUDRATE                   "Rychlost"
209
 #define MSG_INFO_BAUDRATE                   "Rychlost"
210
 #define MSG_INFO_PROTOCOL                   "Protokol"
210
 #define MSG_INFO_PROTOCOL                   "Protokol"
211
 #if LCD_WIDTH > 19
211
 #if LCD_WIDTH > 19
212
-  #define MSG_INFO_PRINT_COUNT              "Pocet tisku "
213
-  #define MSG_INFO_FINISHED_PRINTS          "Dokonceno   "
214
-  #define MSG_INFO_PRINT_TIME               "Celkovy cas "
212
+  #define MSG_INFO_PRINT_COUNT              "Pocet tisku"
213
+  #define MSG_INFO_COMPLETED_PRINTS         "Dokonceno  "
214
+  #define MSG_INFO_PRINT_TIME               "Celkovy cas"
215
 #else
215
 #else
216
-  #define MSG_INFO_PRINT_COUNT              "Tisky    "
217
-  #define MSG_INFO_FINISHED_PRINTS          "Hotovo   "
218
-  #define MSG_INFO_PRINT_TIME               "Cas      "
216
+  #define MSG_INFO_PRINT_COUNT              "Tisky "
217
+  #define MSG_INFO_COMPLETED_PRINTS         "Hotovo"
218
+  #define MSG_INFO_PRINT_TIME               "Cas   "
219
 #endif
219
 #endif
220
 #define MSG_INFO_MIN_TEMP                   "Teplota min"
220
 #define MSG_INFO_MIN_TEMP                   "Teplota min"
221
 #define MSG_INFO_MAX_TEMP                   "Teplota max"
221
 #define MSG_INFO_MAX_TEMP                   "Teplota max"

+ 10
- 3
Marlin/language_de.h View File

179
 #define MSG_INFO_EXTRUDERS                  "Extruders"
179
 #define MSG_INFO_EXTRUDERS                  "Extruders"
180
 #define MSG_INFO_BAUDRATE                   "Baud"
180
 #define MSG_INFO_BAUDRATE                   "Baud"
181
 #define MSG_INFO_PROTOCOL                   "Protokol"
181
 #define MSG_INFO_PROTOCOL                   "Protokol"
182
-#define MSG_INFO_TOTAL_PRINTS               "Gesamte Drucke"
183
-#define MSG_INFO_FINISHED_PRINTS            "Beendete Drucke"
184
-#define MSG_INFO_PRINT_TIME                 "Gesamte Druckzeit"
182
+
183
+#if LCD_WIDTH > 19
184
+  #define MSG_INFO_TOTAL_PRINTS             "Gesamte Drucke   "
185
+  #define MSG_INFO_COMPLETED_PRINTS         "Beendete Drucke  "
186
+  #define MSG_INFO_PRINT_TIME               "Gesamte Druckzeit"
187
+#else
188
+  #define MSG_INFO_PRINT_COUNT              "Prints   "
189
+  #define MSG_INFO_COMPLETED_PRINTS         "Completed"
190
+  #define MSG_INFO_PRINT_TIME               "Duration "
191
+#endif
185
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
192
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
186
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
193
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
187
 #define MSG_INFO_PSU                        "Stromversorgung"
194
 #define MSG_INFO_PSU                        "Stromversorgung"

+ 4
- 4
Marlin/language_el.h View File

209
 #define MSG_INFO_PROTOCOL                   "Protocol"
209
 #define MSG_INFO_PROTOCOL                   "Protocol"
210
 
210
 
211
 #if LCD_WIDTH > 19
211
 #if LCD_WIDTH > 19
212
-  #define MSG_INFO_PRINT_COUNT              "Print Count "
213
-  #define MSG_INFO_FINISHED_PRINTS          "Finished    "
214
-  #define MSG_INFO_PRINT_TIME               "Total Time  "
212
+  #define MSG_INFO_PRINT_COUNT              "Print Count"
213
+  #define MSG_INFO_COMPLETED_PRINTS         "Completed  "
214
+  #define MSG_INFO_PRINT_TIME               "Total Time "
215
 #else
215
 #else
216
   #define MSG_INFO_PRINT_COUNT              "Prints   "
216
   #define MSG_INFO_PRINT_COUNT              "Prints   "
217
-  #define MSG_INFO_FINISHED_PRINTS          "Finished "
217
+  #define MSG_INFO_COMPLETED_PRINTS         "Completed"
218
   #define MSG_INFO_PRINT_TIME               "Duration "
218
   #define MSG_INFO_PRINT_TIME               "Duration "
219
 #endif
219
 #endif
220
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
220
 #define MSG_INFO_MIN_TEMP                   "Min Temp"

+ 6
- 6
Marlin/language_en.h View File

555
 
555
 
556
 #if LCD_WIDTH > 19
556
 #if LCD_WIDTH > 19
557
   #ifndef MSG_INFO_PRINT_COUNT
557
   #ifndef MSG_INFO_PRINT_COUNT
558
-    #define MSG_INFO_PRINT_COUNT              "Print Count "
558
+    #define MSG_INFO_PRINT_COUNT              "Print Count"
559
   #endif
559
   #endif
560
-  #ifndef MSG_INFO_FINISHED_PRINTS
561
-    #define MSG_INFO_FINISHED_PRINTS          "Finished    "
560
+  #ifndef MSG_INFO_COMPLETED_PRINTS
561
+    #define MSG_INFO_COMPLETED_PRINTS         "Completed  "
562
   #endif
562
   #endif
563
   #ifndef MSG_INFO_PRINT_TIME
563
   #ifndef MSG_INFO_PRINT_TIME
564
-    #define MSG_INFO_PRINT_TIME               "Total Time  "
564
+    #define MSG_INFO_PRINT_TIME               "Total Time "
565
   #endif
565
   #endif
566
 #else
566
 #else
567
   #ifndef MSG_INFO_PRINT_COUNT
567
   #ifndef MSG_INFO_PRINT_COUNT
568
     #define MSG_INFO_PRINT_COUNT              "Prints   "
568
     #define MSG_INFO_PRINT_COUNT              "Prints   "
569
   #endif
569
   #endif
570
-  #ifndef MSG_INFO_FINISHED_PRINTS
571
-    #define MSG_INFO_FINISHED_PRINTS          "Finished "
570
+  #ifndef MSG_INFO_COMPLETED_PRINTS
571
+    #define MSG_INFO_COMPLETED_PRINTS         "Completed"
572
   #endif
572
   #endif
573
   #ifndef MSG_INFO_PRINT_TIME
573
   #ifndef MSG_INFO_PRINT_TIME
574
     #define MSG_INFO_PRINT_TIME               "Duration "
574
     #define MSG_INFO_PRINT_TIME               "Duration "

+ 3
- 3
Marlin/ultralcd.cpp View File

1971
         sprintf_P(timeString, PSTR("%i:%02i"), int(stats.printTime / 60 / 60), int(stats.printTime / 60) % 60);
1971
         sprintf_P(timeString, PSTR("%i:%02i"), int(stats.printTime / 60 / 60), int(stats.printTime / 60) % 60);
1972
 
1972
 
1973
         START_SCREEN();                                                                              // 12345678901234567890
1973
         START_SCREEN();                                                                              // 12345678901234567890
1974
-        STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints));        // Print Count : 999
1975
-        STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", false, false, itostr3left(stats.finishedPrints)); // Finished    : 666
1976
-        STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false, timeString);                             // Total Time  : 123:45
1974
+        STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints));        // Print Count: 999
1975
+        STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints)); // Completed  : 666
1976
+        STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false, timeString);                             // Total Time : 123:45
1977
         END_SCREEN();
1977
         END_SCREEN();
1978
       }
1978
       }
1979
     #endif // PRINTCOUNTER
1979
     #endif // PRINTCOUNTER

Loading…
Cancel
Save