Merge tag '14.12' into upstream

[cura.git] / Cura / gui / printWindow.py

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 35be4a8385f1be33c478b6cce3361ecf760f86e3..6356df6491486bdc8cb380da8fbf6dd4f347dd80 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -502,6 +502,12 @@ class printWindowBasic(wx.Frame):
                        preventComputerFromSleeping(self._isPrinting)
 
 
+       def _addTermLog(self, msg):
+               pass
+
+       def _addTermLog(self, msg):
+               pass
+
        def _updateButtonStates(self):
                self.connectButton.Show(self._printerConnection.hasActiveConnection())
                self.connectButton.Enable(not self._printerConnection.isActiveConnectionOpen() and not self._printerConnection.isActiveConnectionOpening())
@@ -647,7 +653,7 @@ class TemperatureGraph(wx.Panel):
 
 class LogWindow(wx.Frame):
        def __init__(self, logText):
-               super(LogWindow, self).__init__(None, title="Error log")
+               super(LogWindow, self).__init__(None, title=_("Error log"))
                self.textBox = wx.TextCtrl(self, -1, logText, style=wx.TE_MULTILINE | wx.TE_DONTWRAP | wx.TE_READONLY)
                self.SetSize((500, 400))
                self.Show(True)