Add some more missing translations.

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 5bf0d97f388f1b899e78d9859713bc7abc496b56..9529acab6424950d9dabe6955d30c8f1bb3b47be 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -624,11 +624,11 @@ class normalSettingsPanel(configBase.configPanelBase):
                self.SetSizer(wx.BoxSizer(wx.HORIZONTAL))
                self.GetSizer().Add(self.nb, 1, wx.EXPAND)
 
-               (left, right, self.printPanel) = self.CreateDynamicConfigTab(self.nb, 'Basic')
+               (left, right, self.printPanel) = self.CreateDynamicConfigTab(self.nb, _('Basic'))
                self._addSettingsToPanels('basic', left, right)
                self.SizeLabelWidths(left, right)
 
-               (left, right, self.advancedPanel) = self.CreateDynamicConfigTab(self.nb, 'Advanced')
+               (left, right, self.advancedPanel) = self.CreateDynamicConfigTab(self.nb, _('Advanced'))
                self._addSettingsToPanels('advanced', left, right)
                self.SizeLabelWidths(left, right)
 

diff --git a/Cura/util/resources.py b/Cura/util/resources.py
index 6bbbdac92dbf636d75f81f596585b3da77460d3a..6c38576398db5a26d5685c99301e0e12b465632f 100644 (file)
--- a/Cura/util/resources.py
+++ b/Cura/util/resources.py
@@ -59,6 +59,7 @@ def setupLocalization(selectedLanguage = None):
 
        locale_path = os.path.normpath(os.path.join(resourceBasePath, 'locale'))
        translation = gettext.translation('Cura', locale_path, languages, fallback=True)
+       #translation.ugettext = lambda message: u'#' + message
        translation.install(unicode=True)
 
 def getLanguageOptions():

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 569a05106803311078cfaf0789ceda330600afe5..dcf0fe955a5663a61e307ddfd72248995254b735 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -89,15 +89,15 @@ class EngineResult(object):
                if self._printTimeSeconds is None:
                        return ''
                if int(self._printTimeSeconds / 60 / 60) < 1:
-                       return '%d minutes' % (int(self._printTimeSeconds / 60) % 60)
+                       return _('%d minutes') % (int(self._printTimeSeconds / 60) % 60)
                if int(self._printTimeSeconds / 60 / 60) == 1:
-                       return '%d hour %d minutes' % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)
-               return '%d hours %d minutes' % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)
+                       return _('%d hour %d minutes') % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)
+               return _('%d hours %d minutes') % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)
 
        def getFilamentAmount(self, e=0):
                if self._filamentMM[e] == 0.0:
                        return None
-               return '%0.2f meter %0.0f gram' % (float(self._filamentMM[e]) / 1000.0, self.getFilamentWeight(e) * 1000.0)
+               return _('%0.2f meter %0.0f gram') % (float(self._filamentMM[e]) / 1000.0, self.getFilamentWeight(e) * 1000.0)
 
        def getLog(self):
                return self._engineLog