Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

plugins/AutoSave/AutoSave.py

@@ -0,0 +1,77 @@
+# Copyright (c) 2016 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+from PyQt5.QtCore import QTimer
+
+from UM.Extension import Extension
+from UM.Preferences import Preferences
+from UM.Application import Application
+from UM.Resources import Resources
+from UM.Logger import Logger
+
+class AutoSave(Extension):
+    def __init__(self):
+        super().__init__()
+
+        Preferences.getInstance().preferenceChanged.connect(self._onPreferenceChanged)
+
+        machine_manager = Application.getInstance().getMachineManager()
+
+        self._profile = None
+        machine_manager.activeProfileChanged.connect(self._onActiveProfileChanged)
+        machine_manager.profileNameChanged.connect(self._onProfilesChanged)
+        machine_manager.profilesChanged.connect(self._onProfilesChanged)
+        machine_manager.machineInstanceNameChanged.connect(self._onInstancesChanged)
+        machine_manager.machineInstancesChanged.connect(self._onInstancesChanged)
+        Application
+        self._onActiveProfileChanged()
+
+        self._change_timer = QTimer()
+        self._change_timer.setInterval(1000 * 60)
+        self._change_timer.setSingleShot(True)
+        self._change_timer.timeout.connect(self._onTimeout)
+
+        self._save_preferences = False
+        self._save_profiles = False
+        self._save_instances = False
+
+    def _onPreferenceChanged(self, preference):
+        self._save_preferences = True
+        self._change_timer.start()
+
+    def _onSettingValueChanged(self, setting):
+        self._save_profiles = True
+        self._change_timer.start()
+
+    def _onActiveProfileChanged(self):
+        if self._profile:
+            self._profile.settingValueChanged.disconnect(self._onSettingValueChanged)
+
+        self._profile = Application.getInstance().getMachineManager().getActiveProfile()
+
+        if self._profile:
+            self._profile.settingValueChanged.connect(self._onSettingValueChanged)
+
+    def _onProfilesChanged(self):
+        self._save_profiles = True
+        self._change_timer.start()
+
+    def _onInstancesChanged(self):
+        self._save_instances = True
+        self._change_timer.start()
+
+    def _onTimeout(self):
+        Logger.log("d", "Autosaving preferences, instances and profiles")
+
+        if self._save_preferences:
+            Preferences.getInstance().writeToFile(Resources.getStoragePath(Resources.Preferences, Application.getInstance().getApplicationName() + ".cfg"))
+
+        if self._save_instances:
+            Application.getInstance().getMachineManager().saveMachineInstances()
+
+        if self._save_profiles:
+            Application.getInstance().getMachineManager().saveProfiles()
+
+        self._save_preferences = False
+        self._save_instances = False
+        self._save_profiles = False

plugins/AutoSave/__init__.py

@@ -0,0 +1,21 @@
+# Copyright (c) 2016 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
+
+from . import AutoSave
+
+from UM.i18n import i18nCatalog
+catalog = i18nCatalog("cura")
+
+def getMetaData():
+    return {
+        "plugin": {
+            "name": catalog.i18nc("@label", "Auto Save"),
+            "author": "Ultimaker",
+            "version": "1.0",
+            "description": catalog.i18nc("@info:whatsthis", "Automatically saves Preferences, Machines and Profiles after changes."),
+            "api": 2
+        },
+    }
+
+def register(app):
+    return { "extension": AutoSave.AutoSave() }

plugins/ImageReader/ConfigUI.qml

@@ -10,13 +10,13 @@ import UM 1.1 as UM
 
 UM.Dialog
 {
-    width: 250*Screen.devicePixelRatio;
+    width: 350*Screen.devicePixelRatio;
-    minimumWidth: 250*Screen.devicePixelRatio;
+    minimumWidth: 350*Screen.devicePixelRatio;
-    maximumWidth: 250*Screen.devicePixelRatio;
+    maximumWidth: 350*Screen.devicePixelRatio;
 
-    height: 200*Screen.devicePixelRatio;
+    height: 220*Screen.devicePixelRatio;
-    minimumHeight: 200*Screen.devicePixelRatio;
+    minimumHeight: 220*Screen.devicePixelRatio;
-    maximumHeight: 200*Screen.devicePixelRatio;
+    maximumHeight: 220*Screen.devicePixelRatio;
 
 
     modality: Qt.Modal
@@ -30,58 +30,158 @@ UM.Dialog
         Layout.fillWidth: true
         columnSpacing: 16
         rowSpacing: 4
-        columns: 2
+        columns: 1
 
-        Text {
+        UM.TooltipArea {
-            text: catalog.i18nc("@action:label","Size (mm)")
             Layout.fillWidth:true
-        }
+            height: childrenRect.height
-        TextField {
+            text: catalog.i18nc("@info:tooltip","The maximum distance of each pixel from \"Base.\"")
-            id: size
+            Row {
-            focus: true
+                width: parent.width
-            validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
+                height: childrenRect.height
-            text: "120"
+
-            onTextChanged: { manager.onSizeChanged(text) }
+                Text {
+                    text: catalog.i18nc("@action:label","Height (mm)")
+                    width: 150
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                TextField {
+                    id: peak_height
+                    objectName: "Peak_Height"
+                    validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: -500; top: 500;}
+                    width: 180
+                    onTextChanged: { manager.onPeakHeightChanged(text) }
+                }
+            }
         }
 
-        Text {
+        UM.TooltipArea {
-            text: catalog.i18nc("@action:label","Base Height (mm)")
             Layout.fillWidth:true
-        }
+            height: childrenRect.height
-        TextField {
+            text: catalog.i18nc("@info:tooltip","The base height from the build plate in millimeters.")
-            id: base_height
+            Row {
-            validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
+                width: parent.width
-            text: "2"
+                height: childrenRect.height
-            onTextChanged: { manager.onBaseHeightChanged(text) }
-        }
 
-        Text {
+                Text {
-            text: catalog.i18nc("@action:label","Peak Height (mm)")
+                    text: catalog.i18nc("@action:label","Base (mm)")
+                    width: 150
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                TextField {
+                    id: base_height
+                    objectName: "Base_Height"
+                    validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
+                    width: 180
+                    onTextChanged: { manager.onBaseHeightChanged(text) }
+                }
+            }
+        }
+        
+        UM.TooltipArea {
             Layout.fillWidth:true
-        }
+            height: childrenRect.height
-        TextField {
+            text: catalog.i18nc("@info:tooltip","The width in millimeters on the build plate.")
-            id: peak_height
+            Row {
-            validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 0; top: 500;}
+                width: parent.width
-            text: "12"
+                height: childrenRect.height
-            onTextChanged: { manager.onPeakHeightChanged(text) }
-        }
 
-        Text {
+                Text {
-            text: catalog.i18nc("@action:label","Smoothing")
+                    text: catalog.i18nc("@action:label","Width (mm)")
+                    width: 150
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                TextField {
+                    id: width
+                    objectName: "Width"
+                    focus: true
+                    validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
+                    width: 180
+                    onTextChanged: { manager.onWidthChanged(text) }
+                }
+            }
+        }
+        
+        UM.TooltipArea {
             Layout.fillWidth:true
-        }
+            height: childrenRect.height
-        Rectangle {
+            text: catalog.i18nc("@info:tooltip","The depth in millimeters on the build plate")
-            width: 100
+            Row {
-            height: 20
+                width: parent.width
-            color: "transparent"
+                height: childrenRect.height
 
-            Slider {
+                Text {
-                id: smoothing
+                    text: catalog.i18nc("@action:label","Depth (mm)")
-                maximumValue: 100.0
+                    width: 150
-                stepSize: 1.0
+                    anchors.verticalCenter: parent.verticalCenter
-                value: 1
+                }
-                width: 100
+                TextField {
-                onValueChanged: { manager.onSmoothingChanged(value) }
+                    id: depth
+                    objectName: "Depth"
+                    focus: true
+                    validator: DoubleValidator {notation: DoubleValidator.StandardNotation; bottom: 1; top: 500;}
+                    width: 180
+                    onTextChanged: { manager.onDepthChanged(text) }
+                }
+            }
+        }
+        
+        UM.TooltipArea {
+            Layout.fillWidth:true
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip","By default, white pixels represent high points on the mesh and black pixels represent low points on the mesh. Change this option to reverse the behavior such that black pixels represent high points on the mesh and white pixels represent low points on the mesh.")
+            Row {
+                width: parent.width
+                height: childrenRect.height
+
+                //Empty label so 2 column layout works.
+                Text {
+                    text: ""
+                    width: 150
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+                ComboBox {
+                    id: image_color_invert
+                    objectName: "Image_Color_Invert"
+                    model: [ catalog.i18nc("@action:label","Lighter is higher"), catalog.i18nc("@action:label","Darker is higher") ]
+                    width: 180
+                    onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) }
+                }
+            }
+        }
+
+        UM.TooltipArea {
+            Layout.fillWidth:true
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip","The amount of smoothing to apply to the image.")
+            Row {
+                width: parent.width
+                height: childrenRect.height
+
+                Text {
+                    text: catalog.i18nc("@action:label","Smoothing")
+                    width: 150
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                Rectangle {
+                    width: 180
+                    height: 20
+                    Layout.fillWidth:true
+                    color: "transparent"
+
+                    Slider {
+                        id: smoothing
+                        objectName: "Smoothing"
+                        maximumValue: 100.0
+                        stepSize: 1.0
+                        width: 180
+                        onValueChanged: { manager.onSmoothingChanged(value) }
+                    }
+                }
             }
         }
     }

plugins/ImageReader/ImageReader.py

@@ -23,6 +23,20 @@ class ImageReader(MeshReader):
         self._ui = ImageReaderUI(self)
 
     def preRead(self, file_name):
+        img = QImage(file_name)
+
+        if img.isNull():
+            Logger.log("e", "Image is corrupt.")
+            return MeshReader.PreReadResult.failed
+
+        width = img.width()
+        depth = img.height()
+
+        largest = max(width, depth)
+        width = width/largest*self._ui.defaultWidth
+        depth = depth/largest*self._ui.defaultDepth
+
+        self._ui.setWidthAndDepth(width, depth)
         self._ui.showConfigUI()
         self._ui.waitForUIToClose()
 
@@ -31,9 +45,10 @@ class ImageReader(MeshReader):
         return MeshReader.PreReadResult.accepted
 
     def read(self, file_name):
-        return self._generateSceneNode(file_name, self._ui.size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512)
+        size = max(self._ui.getWidth(), self._ui.getDepth())
+        return self._generateSceneNode(file_name, size, self._ui.peak_height, self._ui.base_height, self._ui.smoothing, 512, self._ui.image_color_invert)
 
-    def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size):
+    def _generateSceneNode(self, file_name, xz_size, peak_height, base_height, blur_iterations, max_size, image_color_invert):
         mesh = None
         scene_node = None
 
@@ -56,9 +71,10 @@ class ImageReader(MeshReader):
             img = img.scaled(width, height, Qt.IgnoreAspectRatio)
 
         base_height = max(base_height, 0)
+        peak_height = max(peak_height, -base_height)
 
         xz_size = max(xz_size, 1)
-        scale_vector = Vector(xz_size, max(peak_height - base_height, -base_height), xz_size)
+        scale_vector = Vector(xz_size, peak_height, xz_size)
 
         if width > height:
             scale_vector.setZ(scale_vector.z * aspect)
@@ -92,6 +108,9 @@ class ImageReader(MeshReader):
 
         Job.yieldThread()
 
+        if image_color_invert:
+            height_data = 1-height_data
+
         for i in range(0, blur_iterations):
             copy = numpy.pad(height_data, ((1, 1), (1, 1)), mode='edge')
 

plugins/ImageReader/ImageReaderUI.py

@@ -24,15 +24,32 @@ class ImageReaderUI(QObject):
         self._ui_view = None
         self.show_config_ui_trigger.connect(self._actualShowConfigUI)
 
-	# There are corresponding values for these fields in ConfigUI.qml. 
+        self.defaultWidth = 120
-	# If you change the values here, consider updating ConfigUI.qml as well.
+        self.defaultDepth = 120
-        self.size = 120	
+
-        self.base_height = 2
+        self._aspect = 1
-        self.peak_height = 12
+        self._width = self.defaultWidth
+        self._depth = self.defaultDepth
+
+        self.base_height = 1
+        self.peak_height = 10
         self.smoothing = 1
+        self.image_color_invert = False;
 
         self._ui_lock = threading.Lock()
         self._cancelled = False
+        self._disable_size_callbacks = False
+
+    def setWidthAndDepth(self, width, depth):
+        self._aspect = width/depth
+        self._width = width
+        self._depth = depth
+
+    def getWidth(self):
+        return self._width
+
+    def getDepth(self):
+        return self._depth
 
     def getCancelled(self):
         return self._cancelled
@@ -47,10 +64,20 @@ class ImageReaderUI(QObject):
         self.show_config_ui_trigger.emit()
 
     def _actualShowConfigUI(self):
+        self._disable_size_callbacks = True
+
         if self._ui_view is None:
             self._createConfigUI()
         self._ui_view.show()
 
+        self._ui_view.findChild(QObject, "Width").setProperty("text", str(self._width))
+        self._ui_view.findChild(QObject, "Depth").setProperty("text", str(self._depth))
+        self._disable_size_callbacks = False
+
+        self._ui_view.findChild(QObject, "Base_Height").setProperty("text", str(self.base_height))
+        self._ui_view.findChild(QObject, "Peak_Height").setProperty("text", str(self.peak_height))
+        self._ui_view.findChild(QObject, "Smoothing").setProperty("value", self.smoothing)
+
     def _createConfigUI(self):
         if self._ui_view is None:
             Logger.log("d", "Creating ImageReader config UI")
@@ -62,6 +89,8 @@ class ImageReaderUI(QObject):
 
             self._ui_view.setFlags(self._ui_view.flags() & ~Qt.WindowCloseButtonHint & ~Qt.WindowMinimizeButtonHint & ~Qt.WindowMaximizeButtonHint);
 
+            self._disable_size_callbacks = False
+
     @pyqtSlot()
     def onOkButtonClicked(self):
         self._cancelled = False
@@ -75,11 +104,30 @@ class ImageReaderUI(QObject):
         self._ui_lock.release()
 
     @pyqtSlot(str)
-    def onSizeChanged(self, value):
+    def onWidthChanged(self, value):
-        if (len(value) > 0):
+        if self._ui_view and not self._disable_size_callbacks:
-            self.size = float(value)
+            if (len(value) > 0):
-        else:
+                self._width = float(value)
-            self.size = 0
+            else:
+                self._width = 0
+
+            self._depth = self._width/self._aspect
+            self._disable_size_callbacks = True
+            self._ui_view.findChild(QObject, "Depth").setProperty("text", str(self._depth))
+            self._disable_size_callbacks = False
+
+    @pyqtSlot(str)
+    def onDepthChanged(self, value):
+        if self._ui_view and not self._disable_size_callbacks:
+            if (len(value) > 0):
+                self._depth = float(value)
+            else:
+                self._depth = 0
+
+            self._width = self._depth*self._aspect
+            self._disable_size_callbacks = True
+            self._ui_view.findChild(QObject, "Width").setProperty("text", str(self._width))
+            self._disable_size_callbacks = False
 
     @pyqtSlot(str)
     def onBaseHeightChanged(self, value):
@@ -98,3 +146,10 @@ class ImageReaderUI(QObject):
     @pyqtSlot(float)
     def onSmoothingChanged(self, value):
         self.smoothing = int(value)
+
+    @pyqtSlot(int)
+    def onImageColorInvertChanged(self, value):
+        if (value == 1):
+            self.image_color_invert = True
+        else:
+            self.image_color_invert = False

resources/i18n/cura.pot

@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# Cura 2.1 Translation File
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 14:40+0100\n"
+"POT-Creation-Date: 2016-01-13 13:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -446,32 +446,32 @@ msgstr ""
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
 #: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:302
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:23
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:24
 msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:34
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
 msgctxt "@action:label"
 msgid "Size (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:46
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
 msgctxt "@action:label"
 msgid "Base Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:57
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
 msgctxt "@action:label"
 msgid "Peak Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
@@ -481,35 +481,45 @@ msgctxt "@action:button"
 msgid "OK"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:29
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:31
 msgctxt "@label"
 msgid ""
 "Per Object Settings behavior may be unexpected when 'Print sequence' is set "
 "to 'All at Once'."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:40
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42
 msgctxt "@label"
 msgid "Object profile"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:124
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126
 msgctxt "@action:button"
 msgid "Add Setting"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:165
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:166
 msgctxt "@title:window"
 msgid "Pick a Setting to Customize"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:176
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:177
 msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+msgctxt "@label"
+msgid "00h 00min"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
-msgctxt "@label %1 is length of filament"
+msgctxt "@label"
+msgid "0.0 m"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+msgctxt "@label"
 msgid "%1 m"
 msgstr ""
 
@@ -570,57 +580,57 @@ msgid "Toggle Fu&ll Screen"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Undo"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Redo"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Quit"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:settings"
 msgid "&Preferences..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:printer"
 msgid "&Add Printer..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:printer"
 msgid "Manage Pr&inters..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:profile"
 msgid "Manage Profiles..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Online &Documentation"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Report a &Bug"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "&About..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Delete &Selection"
 msgstr ""
 
@@ -635,17 +645,17 @@ msgid "Ce&nter Object on Platform"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Group Objects"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Objects"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Merge Objects"
 msgstr ""
 
@@ -655,32 +665,32 @@ msgid "&Duplicate Object"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Clear Build Platform"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "Re&load All Objects"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object Positions"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object &Transformations"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Open File..."
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Engine &Log..."
 msgstr ""
 
@@ -1142,57 +1152,57 @@ msgid "Cura"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr ""
 

resources/i18n/en/cura.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 14:40+0100\n"
+"POT-Creation-Date: 2016-01-13 13:43+0100\n"
-"PO-Revision-Date: 2016-01-08 14:40+0100\n"
+"PO-Revision-Date: 2016-01-13 13:43+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -451,32 +451,32 @@ msgstr "Print"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
 #: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:302
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr "Cancel"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:23
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:24
 msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr "Convert Image..."
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:34
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
 msgctxt "@action:label"
 msgid "Size (mm)"
 msgstr "Size (mm)"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:46
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
 msgctxt "@action:label"
 msgid "Base Height (mm)"
 msgstr "Base Height (mm)"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:57
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
 msgctxt "@action:label"
 msgid "Peak Height (mm)"
 msgstr "Peak Height (mm)"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr "Smoothing"
@@ -486,7 +486,7 @@ msgctxt "@action:button"
 msgid "OK"
 msgstr "OK"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:29
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:31
 msgctxt "@label"
 msgid ""
 "Per Object Settings behavior may be unexpected when 'Print sequence' is set "
@@ -495,28 +495,38 @@ msgstr ""
 "Per Object Settings behavior may be unexpected when 'Print sequence' is set "
 "to 'All at Once'."
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:40
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42
 msgctxt "@label"
 msgid "Object profile"
 msgstr "Object profile"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:124
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126
 msgctxt "@action:button"
 msgid "Add Setting"
 msgstr "Add Setting"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:165
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:166
 msgctxt "@title:window"
 msgid "Pick a Setting to Customize"
 msgstr "Pick a Setting to Customize"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:176
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:177
 msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr "Filter..."
 
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+msgctxt "@label"
+msgid "00h 00min"
+msgstr "00h 00min"
+
 #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
-msgctxt "@label %1 is length of filament"
+msgctxt "@label"
+msgid "0.0 m"
+msgstr "0.0 m"
+
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+msgctxt "@label"
 msgid "%1 m"
 msgstr "%1 m"
 
@@ -577,57 +587,57 @@ msgid "Toggle Fu&ll Screen"
 msgstr "Toggle Fu&ll Screen"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Undo"
 msgstr "&Undo"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Redo"
 msgstr "&Redo"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Quit"
 msgstr "&Quit"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:settings"
 msgid "&Preferences..."
 msgstr "&Preferences..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:printer"
 msgid "&Add Printer..."
 msgstr "&Add Printer..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:printer"
 msgid "Manage Pr&inters..."
 msgstr "Manage Pr&inters..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:profile"
 msgid "Manage Profiles..."
 msgstr "Manage Profiles..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Online &Documentation"
 msgstr "Show Online &Documentation"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Report a &Bug"
 msgstr "Report a &Bug"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "&About..."
 msgstr "&About..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Delete &Selection"
 msgstr "Delete &Selection"
 
@@ -642,17 +652,17 @@ msgid "Ce&nter Object on Platform"
 msgstr "Ce&nter Object on Platform"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Group Objects"
 msgstr "&Group Objects"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Objects"
 msgstr "Ungroup Objects"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Merge Objects"
 msgstr "&Merge Objects"
 
@@ -662,32 +672,32 @@ msgid "&Duplicate Object"
 msgstr "&Duplicate Object"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Clear Build Platform"
 msgstr "&Clear Build Platform"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "Re&load All Objects"
 msgstr "Re&load All Objects"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object Positions"
 msgstr "Reset All Object Positions"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object &Transformations"
 msgstr "Reset All Object &Transformations"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Open File..."
 msgstr "&Open File..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Engine &Log..."
 msgstr "Show Engine &Log..."
 
@@ -1188,57 +1198,57 @@ msgid "Cura"
 msgstr "Cura"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&File"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Open &Recent"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "&Save Selection to File"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Save &All"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Edit"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&View"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "&Printer"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "P&rofile"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "E&xtensions"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Settings"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Help"
 

resources/i18n/en/fdmprinter.json.po

@@ -1,10 +1,9 @@
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.1 json setting files\n"
+"Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-08 14:40+0000\n"
+"POT-Creation-Date: 2016-01-13 13:43+0000\n"
-"PO-Revision-Date: 2016-01-08 14:40+0000\n"
+"PO-Revision-Date: 2016-01-13 13:43+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

resources/i18n/fdmprinter.json.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-08 14:40+0000\n"
+"POT-Creation-Date: 2016-01-13 13:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"

resources/i18n/fi/cura.po

@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 14:40+0100\n"
+"POT-Creation-Date: 2016-01-13 13:43+0100\n"
 "PO-Revision-Date: 2015-09-28 14:08+0300\n"
 "Last-Translator: Tapio <info@tapimex.fi>\n"
 "Language-Team: \n"
@@ -486,33 +487,33 @@ msgstr "Tulosta"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
 #: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:302
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
 #, fuzzy
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:23
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:24
 msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:34
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
 msgctxt "@action:label"
 msgid "Size (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:46
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
 msgctxt "@action:label"
 msgid "Base Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:57
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
 msgctxt "@action:label"
 msgid "Peak Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
@@ -522,36 +523,47 @@ msgctxt "@action:button"
 msgid "OK"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:29
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:31
 msgctxt "@label"
 msgid ""
 "Per Object Settings behavior may be unexpected when 'Print sequence' is set "
 "to 'All at Once'."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:40
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42
 msgctxt "@label"
 msgid "Object profile"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:124
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126
 #, fuzzy
 msgctxt "@action:button"
 msgid "Add Setting"
 msgstr "&Asetukset"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:165
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:166
 msgctxt "@title:window"
 msgid "Pick a Setting to Customize"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:176
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:177
 msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+msgctxt "@label"
+msgid "00h 00min"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
-msgctxt "@label %1 is length of filament"
+msgctxt "@label"
+msgid "0.0 m"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#, fuzzy
+msgctxt "@label"
 msgid "%1 m"
 msgstr "%1 m"
 
@@ -620,63 +632,67 @@ msgstr "Vaihda &koko näyttöön"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Undo"
 msgstr "&Kumoa"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Redo"
 msgstr "Tee &uudelleen"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:file"
 msgid "&Quit"
 msgstr "&Lopeta"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:settings"
 msgid "&Preferences..."
 msgstr "&Lisäasetukset..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:printer"
 msgid "&Add Printer..."
 msgstr "L&isää tulostin..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:printer"
 msgid "Manage Pr&inters..."
 msgstr "Tulostinten &hallinta..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:profile"
 msgid "Manage Profiles..."
 msgstr "Profiilien hallinta..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Online &Documentation"
 msgstr "Näytä sähköinen &dokumentaatio"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Report a &Bug"
 msgstr "Ilmoita &virheestä"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "&About..."
 msgstr "Ti&etoja..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Delete &Selection"
 msgstr "&Poista valinta"
 
@@ -691,17 +707,20 @@ msgid "Ce&nter Object on Platform"
 msgstr "K&eskitä kappale alustalle"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Group Objects"
 msgstr "&Ryhmitä kappaleet"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Objects"
 msgstr "Pura kappaleiden ryhmitys"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Merge Objects"
 msgstr "&Yhdistä kappaleet"
 
@@ -711,33 +730,38 @@ msgid "&Duplicate Object"
 msgstr "&Monista kappale"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Clear Build Platform"
 msgstr "&Tyhjennä alusta"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "Re&load All Objects"
 msgstr "&Lataa kaikki kappaleet uudelleen"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object Positions"
 msgstr "Nollaa kaikkien kappaleiden sijainnit"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object &Transformations"
 msgstr "Nollaa kaikkien kappaleiden m&uunnokset"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "&Open File..."
 msgstr "&Avaa tiedosto..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216
 #, fuzzy
-msgctxt "@action:inmenu"
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Engine &Log..."
 msgstr "Näytä moottorin l&oki"
 
@@ -1248,63 +1272,67 @@ msgstr "Cura"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&Tiedosto"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Avaa &viimeisin"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "&Tallenna valinta tiedostoon"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Tallenna &kaikki"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Muokkaa"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&Näytä"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "Tulosta"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "&Profiili"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "Laa&jennukset"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Asetukset"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Ohje"
 

resources/i18n/fi/fdmprinter.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1 json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-08 14:40+0000\n"
+"POT-Creation-Date: 2016-01-13 13:43+0000\n"
 "PO-Revision-Date: 2015-09-30 11:37+0300\n"
 "Last-Translator: Tapio <info@tapimex.fi>\n"
 "Language-Team: \n"

resources/i18n/fr/cura.po

@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-08 14:40+0100\n"
+"POT-Creation-Date: 2016-01-13 13:43+0100\n"
 "PO-Revision-Date: 2015-09-22 16:13+0200\n"
 "Last-Translator: Mathieu Gaborit | Makershop <mathieu@makershop.fr>\n"
 "Language-Team: \n"
@@ -475,32 +476,32 @@ msgstr "Imprimer"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
 #: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:302
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:23
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:24
 msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:34
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
 msgctxt "@action:label"
 msgid "Size (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:46
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
 msgctxt "@action:label"
 msgid "Base Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:57
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
 msgctxt "@action:label"
 msgid "Peak Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
@@ -510,36 +511,47 @@ msgctxt "@action:button"
 msgid "OK"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:29
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:31
 msgctxt "@label"
 msgid ""
 "Per Object Settings behavior may be unexpected when 'Print sequence' is set "
 "to 'All at Once'."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:40
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42
 msgctxt "@label"
 msgid "Object profile"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:124
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:126
 #, fuzzy
 msgctxt "@action:button"
 msgid "Add Setting"
 msgstr "&Paramètres"
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:165
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:166
 msgctxt "@title:window"
 msgid "Pick a Setting to Customize"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:176
+#: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:177
 msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+msgctxt "@label"
+msgid "00h 00min"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
-msgctxt "@label %1 is length of filament"
+msgctxt "@label"
+msgid "0.0 m"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#, fuzzy
+msgctxt "@label"
 msgid "%1 m"
 msgstr "%1 m"
 
@@ -604,57 +616,68 @@ msgid "Toggle Fu&ll Screen"
 msgstr "&Plein écran"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:57
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Undo"
 msgstr "&Annuler"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:65
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Redo"
 msgstr "&Rétablir"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:73
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "&Quit"
 msgstr "&Quitter"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:81
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:settings"
 msgid "&Preferences..."
 msgstr "&Préférences"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:88
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:printer"
 msgid "&Add Printer..."
 msgstr "&Ajouter une imprimante..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:94
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:printer"
 msgid "Manage Pr&inters..."
 msgstr "Gérer les imprimantes..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:101
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:profile"
 msgid "Manage Profiles..."
 msgstr "Gérer les profils..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:108
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Online &Documentation"
 msgstr "Afficher la documentation en ligne"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:115
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:help"
 msgid "Report a &Bug"
 msgstr "Reporter un &bug"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:122
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:help"
 msgid "&About..."
 msgstr "À propos de..."
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:129
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Delete &Selection"
 msgstr "&Supprimer la sélection"
 
@@ -669,17 +692,20 @@ msgid "Ce&nter Object on Platform"
 msgstr "Ce&ntrer l’objet sur le plateau"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:150
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Group Objects"
 msgstr "&Grouper les objets"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:158
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Ungroup Objects"
 msgstr "&Dégrouper les objets"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:166
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Merge Objects"
 msgstr "&Fusionner les objets"
 
@@ -689,32 +715,38 @@ msgid "&Duplicate Object"
 msgstr "&Dupliquer l’objet"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:181
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "&Clear Build Platform"
 msgstr "Supprimer les objets du plateau"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:189
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "Re&load All Objects"
 msgstr "Rechar&ger tous les objets"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:196
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object Positions"
 msgstr "Réinitialiser la position de tous les objets"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:202
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:edit"
 msgid "Reset All Object &Transformations"
 msgstr "Réinitialiser les modifications de tous les objets"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:208
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "&Open File..."
 msgstr "&Ouvrir un fichier"
 
 #: /home/tamara/2.1/Cura/resources/qml/Actions.qml:216
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:help"
 msgid "Show Engine &Log..."
 msgstr "Voir le &journal du slicer..."
 
@@ -1230,59 +1262,68 @@ msgid "Cura"
 msgstr "Cura"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&Fichier"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Ouvrir Fichier &Récent"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
-msgctxt "@action:inmenu"
+#, fuzzy
+msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "Enregi&strer la sélection dans un fichier"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Enregistrer &tout"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Modifier"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&Visualisation"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "Imprimer"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
 #, fuzzy
-msgctxt "@title:menu"
+msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "&Profil"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "E&xtensions"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Paramètres"
 
 #: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
-msgctxt "@title:menu"
+#, fuzzy
+msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Aide"
 
@@ -1397,4 +1438,4 @@ msgstr "Ouvrir un fichier"
 
 #~ msgctxt "erase tool description"
 #~ msgid "Remove points"
-#~ msgstr "Supprimer les points"
+#~ msgstr "Supprimer les points"

resources/i18n/fr/fdmprinter.json.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1 json files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-08 14:40+0000\n"
+"POT-Creation-Date: 2016-01-13 13:43+0000\n"
 "PO-Revision-Date: 2015-09-24 08:16+0100\n"
 "Last-Translator: Mathieu Gaborit | Makershop <mathieu@makershop.fr>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
@@ -3330,4 +3330,4 @@ msgstr ""
 
 #~ msgctxt "resolution label"
 #~ msgid "Resolution"
-#~ msgstr "Résolution"
+#~ msgstr "Résolution"