Merge remote-tracking branch 'MarlinFirmware/Development' into Development

2015-04-01 00:52:08 -05:00
parent c89b8368ee 8231fb166d
commit fdb4ddbdea
18 changed files with 40 additions and 2 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -843,7 +843,7 @@ void get_command()
        int hours, minutes;
        minutes=(t/60)%60;
        hours=t/60/60;
-        sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes);
+        sprintf_P(time, PSTR("%i "MSG_END_HOUR" %i "MSG_END_MINUTE),hours, minutes);
        SERIAL_ECHO_START;
        SERIAL_ECHOLN(time);
        lcd_setstatus(time, true);