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

plugins/CuraEngineBackend/__init__.py

@@ -9,7 +9,7 @@ def getMetaData():
         "type": "backend",
         "plugin": {
             "name": "CuraEngine Backend",
-            "author": "Arjen Hiemstra",
+            "author": "Ultimaker",
             "description": catalog.i18nc("CuraEngine backend plugin description", "Provides the link to the CuraEngine slicing backend")
         }
     }

plugins/GCodeWriter/__init__.py

@@ -1,7 +1,6 @@
 from . import GCodeWriter
 
 from UM.i18n import i18nCatalog
-
 catalog = i18nCatalog("cura")
 
 def getMetaData():
@@ -9,7 +8,7 @@ def getMetaData():
         "type": "mesh_writer",
         "plugin": {
             "name": "GCode Writer",
-            "author": "Arjen Hiemstra",
+            "author": "Ultimaker",
             "version": "1.0",
             "description": catalog.i18nc("GCode Writer Plugin Description", "Writes GCode to a file")
         },

plugins/LayerView/LayerView.qml

@@ -9,27 +9,19 @@ Item
 {
     width: 250
     height: 250
-    /*Rectangle 
+
-    {
-        color: "blue"
-        width: 250  
-        height:250
-    }*/
     Slider 
     {
         width: 10
         height: 250
         anchors.right : parent.right
-        //anchors.fill: parent
-        //Layout.preferredHeight: UM.Theme.sizes.section.height;
         orientation: Qt.Vertical
         minimumValue: 0;
         maximumValue: 100;
 
-        value: 50;
+        value: 100;
         onValueChanged: UM.ActiveView.triggerAction("setLayer", value)
 
         style: UM.Theme.styles.slider;
-        //Component.onCompleted: {console.log(UM.Theme.styles.slider)}
     }
-}
+}

plugins/LayerView/__init__.py

@@ -7,7 +7,10 @@ def getMetaData():
     return {
         "type": "view",
         "plugin": {
-            "name": "Layer View"
+            "name": "Layer View",
+            "author": "Ultimaker",
+            "version": "1.0",
+            "description": catalog.i18nc("Layer View plugin description", "Provides the Layer view.")
         },
         "view": {
             "name": catalog.i18nc("Layers View mode", "Layers"),

plugins/USBPrinting/ControlWindow.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
+
 Rectangle 
 {
     width: 300; height: 100
@@ -10,11 +11,13 @@ Rectangle
         {
             Text 
             {
-                text: "extruder temperature " + manager.extruderTemperature
+                //: USB Printing dialog label, %1 is head temperature
+                text: qsTr("Extruder Temperature %1").arg(manager.extruderTemperature)
             }
             Text 
             {
-                text: "bed temperature " + manager.bedTemperature
+                //: USB Printing dialog label, %1 is bed temperature
+                text: qsTr("Bed Temperature %1").arg(manager.bedTemperature)
             }
             Text 
             {
@@ -26,13 +29,15 @@ Rectangle
         {
             Button 
             {
-                text: "Print"  
+                //: USB Printing dialog start print button
+                text: qsTr("Print");
                 onClicked: { manager.startPrint() }
                 enabled: manager.progress == 0 ? true : false
             }
             Button
             {
-                text: "Cancel" 
+                //: USB Printing dialog cancel print button
+                text: qsTr("Cancel");
                 onClicked: { manager.cancelPrint() }
                 enabled: manager.progress == 0 ? false:  true
             }
@@ -52,4 +57,4 @@ Rectangle
             height: 25
         }
     }
-}
+}

plugins/USBPrinting/FirmwareUpdateWindow.qml

@@ -9,7 +9,23 @@ Rectangle
 
         Text 
         {
-            text: manager.progress == 0 ? "Starting firmware update, may take a while.": manager.progress > 99 ? "Firmware update completed.": "Updating firmware."
+            text: {
+                if (manager.progress == 0)
+                {
+                    //: Firmware update status label
+                    return qsTr("Starting firmware update, this may take a while.")
+                }
+                else if (manager.progress > 99)
+                {
+                    //: Firmware update status label
+                    return qsTr("Firmware update completed.")
+                }
+                else
+                {
+                    //: Firmware update status label
+                    return qsTr("Updating firmware.")
+                }
+            }
         }
         ProgressBar 
         {
@@ -26,4 +42,4 @@ Rectangle
             height: 25
         }
     }
-}
+}

plugins/USBPrinting/USBPrinterManager.py

@@ -16,8 +16,7 @@ from PyQt5.QtQuick import QQuickView
 from PyQt5.QtCore import QUrl, QObject, pyqtSlot, pyqtProperty, pyqtSignal
 
 from UM.i18n import i18nCatalog
-
+i18n_catalog = i18nCatalog("uranium")
-i18n_catalog = i18nCatalog("plugins")
 
 
 class USBPrinterManager(QObject, SignalEmitter, Extension):
@@ -38,7 +37,7 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
         self._error_message = "" 
         
         ## Add menu item to top menu of the application.
-        self.addMenuItem(i18n_catalog.i18n("Update firmware"), self.updateAllFirmware)
+        self.addMenuItem(i18n_catalog.i18n("Update Firmware"), self.updateAllFirmware)
     
     pyqtError = pyqtSignal(str, arguments = ["amount"])
     processingProgress = pyqtSignal(float, arguments = ["amount"])

plugins/USBPrinting/__init__.py

@@ -1,7 +1,6 @@
 from . import USBPrinterManager
 
 from UM.i18n import i18nCatalog
-
 i18n_catalog = i18nCatalog("cura")
 
 def getMetaData():
@@ -9,9 +8,9 @@ def getMetaData():
         "type": "extension",
         "plugin": {
             "name": "USB printing",
-            "author": "Jaime van Kessel",
+            "author": "Ultimaker",
             "version": "1.0",
-            "description": i18n_catalog.i18nc("usb printing description","Accepts G-Code and sends them to a printer. Plugin can also update firmware")
+            "description": i18n_catalog.i18nc("USB Printing plugin description","Accepts G-Code and sends them to a printer. Plugin can also update firmware")
         }
     }
         

resources/i18n/cura.pot

@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-07 16:35+0200\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:91
+msgctxt "Save button tooltip"
+msgid "Save to Disk"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:96
+msgctxt "Splash screen message"
+msgid "Setting up scene..."
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:130
+msgctxt "Splash screen message"
+msgid "Loading interface..."
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:373
+#, python-brace-format
+msgctxt "Save button tooltip. {0} is sd card name"
+msgid "Save to SD Card {0}"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:421
+#, python-brace-format
+msgctxt "Saved to SD message, {0} is sdcard, {1} is filename"
+msgid "Saved to SD Card {0} as {1}"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:424
+msgctxt "Message action"
+msgid "Eject"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/src/CuraApplication.py:426
+#, python-brace-format
+msgctxt "Message action tooltip, {0} is sdcard"
+msgid "Eject SD Card {0}"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/CuraEngineBackend/__init__.py:13
+msgctxt "CuraEngine backend plugin description"
+msgid "Provides the link to the CuraEngine slicing backend"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/USBPrinting/USBPrinterManager.py:40
+msgid "Update Firmware"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/USBPrinting/__init__.py:13
+msgctxt "USB Printing plugin description"
+msgid ""
+"Accepts G-Code and sends them to a printer. Plugin can also update firmware"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/GCodeWriter/__init__.py:13
+msgctxt "GCode Writer Plugin Description"
+msgid "Writes GCode to a file"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/GCodeWriter/__init__.py:18
+msgctxt "GCode Writer File Description"
+msgid "GCode File"
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/LayerView/__init__.py:13
+msgctxt "Layer View plugin description"
+msgid "Provides the Layer view."
+msgstr ""
+
+#: /home/ahiemstra/Projects/Ultimaker/cura/plugins/LayerView/__init__.py:16
+msgctxt "Layers View mode"
+msgid "Layers"
+msgstr ""

resources/i18n/cura_qt.pot

@@ -0,0 +1,419 @@
+msgid ""
+msgstr ""
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Qt-Contexts: true\n"
+
+#. About dialog title
+#: ../resources/qml/AboutDialog.qml:12
+msgctxt "AboutDialog|"
+msgid "About Cura"
+msgstr ""
+
+#. About dialog application description
+#: ../resources/qml/AboutDialog.qml:42
+msgctxt "AboutDialog|"
+msgid "End-to-end solution for fused filament 3D printing."
+msgstr ""
+
+#. About dialog application author note
+#: ../resources/qml/AboutDialog.qml:47
+msgctxt "AboutDialog|"
+msgid ""
+"Cura has been developed by Ultimaker B.V. in cooperation with the community."
+msgstr ""
+
+#. Close about dialog button
+#: ../resources/qml/AboutDialog.qml:58
+msgctxt "AboutDialog|"
+msgid "Close"
+msgstr ""
+
+#. Undo action
+#: ../resources/qml/Actions.qml:37
+msgctxt "Actions|"
+msgid "&Undo"
+msgstr ""
+
+#. Redo action
+#: ../resources/qml/Actions.qml:45
+msgctxt "Actions|"
+msgid "&Redo"
+msgstr ""
+
+#. Quit action
+#: ../resources/qml/Actions.qml:53
+msgctxt "Actions|"
+msgid "&Quit"
+msgstr ""
+
+#. Preferences action
+#: ../resources/qml/Actions.qml:61
+msgctxt "Actions|"
+msgid "&Preferences..."
+msgstr ""
+
+#. Add Printer action
+#: ../resources/qml/Actions.qml:68
+msgctxt "Actions|"
+msgid "&Add Printer..."
+msgstr ""
+
+#. Configure Printers action
+#: ../resources/qml/Actions.qml:74
+msgctxt "Actions|"
+msgid "&Configure Printers"
+msgstr ""
+
+#. Show Online Documentation action
+#: ../resources/qml/Actions.qml:81
+msgctxt "Actions|"
+msgid "Show Online &Documentation"
+msgstr ""
+
+#. Report a Bug Action
+#: ../resources/qml/Actions.qml:89
+msgctxt "Actions|"
+msgid "Report a &Bug"
+msgstr ""
+
+#. About action
+#: ../resources/qml/Actions.qml:96
+msgctxt "Actions|"
+msgid "&About..."
+msgstr ""
+
+#. Delete selection action
+#: ../resources/qml/Actions.qml:103
+msgctxt "Actions|"
+msgid "Delete Selection"
+msgstr ""
+
+#. Delete object action
+#: ../resources/qml/Actions.qml:111
+msgctxt "Actions|"
+msgid "Delete Object"
+msgstr ""
+
+#. Center object action
+#: ../resources/qml/Actions.qml:118
+msgctxt "Actions|"
+msgid "Center Object on Platform"
+msgstr ""
+
+#. Duplicate object action
+#: ../resources/qml/Actions.qml:124
+msgctxt "Actions|"
+msgid "Duplicate Object"
+msgstr ""
+
+#. Split object action
+#: ../resources/qml/Actions.qml:130
+msgctxt "Actions|"
+msgid "Split Object into Parts"
+msgstr ""
+
+#. Clear build platform action
+#: ../resources/qml/Actions.qml:137
+msgctxt "Actions|"
+msgid "Clear Build Platform"
+msgstr ""
+
+#. Reload all objects action
+#: ../resources/qml/Actions.qml:144
+msgctxt "Actions|"
+msgid "Reload All Objects"
+msgstr ""
+
+#. Reset all positions action
+#: ../resources/qml/Actions.qml:150
+msgctxt "Actions|"
+msgid "Reset All Object Positions"
+msgstr ""
+
+#. Reset all positions action
+#: ../resources/qml/Actions.qml:156
+msgctxt "Actions|"
+msgid "Reset All Object Transformations"
+msgstr ""
+
+#. Open file action
+#: ../resources/qml/Actions.qml:162
+msgctxt "Actions|"
+msgid "&Open..."
+msgstr ""
+
+#. Save file action
+#: ../resources/qml/Actions.qml:170
+msgctxt "Actions|"
+msgid "&Save..."
+msgstr ""
+
+#. Show engine log action
+#: ../resources/qml/Actions.qml:178
+msgctxt "Actions|"
+msgid "Show engine &log..."
+msgstr ""
+
+#. Add Printer dialog title
+#. ----------
+#. Add Printer wizard page title
+#: ../resources/qml/AddMachineWizard.qml:12
+#: ../resources/qml/AddMachineWizard.qml:19
+msgctxt "AddMachineWizard|"
+msgid "Add Printer"
+msgstr ""
+
+#. Add Printer wizard page description
+#: ../resources/qml/AddMachineWizard.qml:25
+msgctxt "AddMachineWizard|"
+msgid "Please select the type of printer:"
+msgstr ""
+
+#. Add Printer wizard field label
+#: ../resources/qml/AddMachineWizard.qml:40
+msgctxt "AddMachineWizard|"
+msgid "Printer Name:"
+msgstr ""
+
+#. Add Printer wizarad button
+#: ../resources/qml/AddMachineWizard.qml:53
+msgctxt "AddMachineWizard|"
+msgid "Next"
+msgstr ""
+
+#. Add Printer wizarad button
+#: ../resources/qml/AddMachineWizard.qml:63
+msgctxt "AddMachineWizard|"
+msgid "Cancel"
+msgstr ""
+
+#. USB Printing dialog label, %1 is head temperature
+#: ../plugins/USBPrinting/ControlWindow.qml:15
+#, qt-format
+msgctxt "ControlWindow|"
+msgid "Extruder Temperature %1"
+msgstr ""
+
+#. USB Printing dialog label, %1 is bed temperature
+#: ../plugins/USBPrinting/ControlWindow.qml:20
+#, qt-format
+msgctxt "ControlWindow|"
+msgid "Bed Temperature %1"
+msgstr ""
+
+#. USB Printing dialog start print button
+#: ../plugins/USBPrinting/ControlWindow.qml:33
+msgctxt "ControlWindow|"
+msgid "Print"
+msgstr ""
+
+#. USB Printing dialog cancel print button
+#: ../plugins/USBPrinting/ControlWindow.qml:40
+msgctxt "ControlWindow|"
+msgid "Cancel"
+msgstr ""
+
+#. Cura application window title
+#: ../resources/qml/Cura.qml:14
+msgctxt "Cura|"
+msgid "Cura"
+msgstr ""
+
+#. File menu
+#: ../resources/qml/Cura.qml:26
+msgctxt "Cura|"
+msgid "&File"
+msgstr ""
+
+#. Edit menu
+#: ../resources/qml/Cura.qml:38
+msgctxt "Cura|"
+msgid "&Edit"
+msgstr ""
+
+#. Machine menu
+#: ../resources/qml/Cura.qml:50
+msgctxt "Cura|"
+msgid "&Machine"
+msgstr ""
+
+#. Extensions menu
+#: ../resources/qml/Cura.qml:76
+msgctxt "Cura|"
+msgid "E&xtensions"
+msgstr ""
+
+#. Settings menu
+#: ../resources/qml/Cura.qml:107
+msgctxt "Cura|"
+msgid "&Settings"
+msgstr ""
+
+#. Help menu
+#: ../resources/qml/Cura.qml:114
+msgctxt "Cura|"
+msgid "&Help"
+msgstr ""
+
+#. View Mode toolbar button
+#: ../resources/qml/Cura.qml:231
+msgctxt "Cura|"
+msgid "View Mode"
+msgstr ""
+
+#. View preferences page title
+#: ../resources/qml/Cura.qml:273
+msgctxt "Cura|"
+msgid "View"
+msgstr ""
+
+#. File open dialog title
+#: ../resources/qml/Cura.qml:370
+msgctxt "Cura|"
+msgid "Open File"
+msgstr ""
+
+#. File save dialog title
+#: ../resources/qml/Cura.qml:386
+msgctxt "Cura|"
+msgid "Save File"
+msgstr ""
+
+#. Engine Log dialog title
+#: ../resources/qml/EngineLog.qml:11
+msgctxt "EngineLog|"
+msgid "Engine Log"
+msgstr ""
+
+#. Close engine log button
+#: ../resources/qml/EngineLog.qml:30
+msgctxt "EngineLog|"
+msgid "Close"
+msgstr ""
+
+#. Firmware update status label
+#: ../plugins/USBPrinting/FirmwareUpdateWindow.qml:16
+msgctxt "FirmwareUpdateWindow|"
+msgid "Starting firmware update, this may take a while."
+msgstr ""
+
+#. Firmware update status label
+#: ../plugins/USBPrinting/FirmwareUpdateWindow.qml:21
+msgctxt "FirmwareUpdateWindow|"
+msgid "Firmware update completed."
+msgstr ""
+
+#. Firmware update status label
+#: ../plugins/USBPrinting/FirmwareUpdateWindow.qml:26
+msgctxt "FirmwareUpdateWindow|"
+msgid "Updating firmware."
+msgstr ""
+
+#. Print material amount save button label
+#: ../resources/qml/SaveButton.qml:149
+#, qt-format
+msgctxt "SaveButton|"
+msgid "%1m material"
+msgstr ""
+
+#. Save button label
+#: ../resources/qml/SaveButton.qml:191
+msgctxt "SaveButton|"
+msgid "Please load a 3D model"
+msgstr ""
+
+#. Save button label
+#: ../resources/qml/SaveButton.qml:194
+msgctxt "SaveButton|"
+msgid "Calculating Print-time"
+msgstr ""
+
+#. Save button label
+#: ../resources/qml/SaveButton.qml:197
+msgctxt "SaveButton|"
+msgid "Estimated Print-time"
+msgstr ""
+
+#. Simple configuration mode option
+#: ../resources/qml/Sidebar.qml:105
+msgctxt "Sidebar|"
+msgid "Simple"
+msgstr ""
+
+#. Advanced configuration mode option
+#: ../resources/qml/Sidebar.qml:107
+msgctxt "Sidebar|"
+msgid "Advanced"
+msgstr ""
+
+#. Configuration mode label
+#: ../resources/qml/SidebarHeader.qml:26
+msgctxt "SidebarHeader|"
+msgid "Mode:"
+msgstr ""
+
+#. Machine selection label
+#: ../resources/qml/SidebarHeader.qml:70
+msgctxt "SidebarHeader|"
+msgid "Machine:"
+msgstr ""
+
+#. Sidebar header label
+#: ../resources/qml/SidebarHeader.qml:117
+msgctxt "SidebarHeader|"
+msgid "Print Setup"
+msgstr ""
+
+#. Sidebar configuration label
+#: ../resources/qml/SidebarSimple.qml:40
+msgctxt "SidebarSimple|"
+msgid "No Model Loaded"
+msgstr ""
+
+#. Sidebar configuration label
+#: ../resources/qml/SidebarSimple.qml:45
+msgctxt "SidebarSimple|"
+msgid "Calculating..."
+msgstr ""
+
+#. Sidebar configuration label
+#: ../resources/qml/SidebarSimple.qml:50
+msgctxt "SidebarSimple|"
+msgid "Estimated Print Time"
+msgstr ""
+
+#. Quality slider label
+#: ../resources/qml/SidebarSimple.qml:87
+msgctxt "SidebarSimple|"
+msgid ""
+"Minimum\n"
+"Draft"
+msgstr ""
+
+#. Quality slider label
+#: ../resources/qml/SidebarSimple.qml:97
+msgctxt "SidebarSimple|"
+msgid ""
+"Maximum\n"
+"Quality"
+msgstr ""
+
+#. Setting checkbox
+#: ../resources/qml/SidebarSimple.qml:109
+msgctxt "SidebarSimple|"
+msgid "Enable Support"
+msgstr ""
+
+#. View configuration page title
+#: ../resources/qml/ViewPage.qml:9
+msgctxt "ViewPage|"
+msgid "View"
+msgstr ""
+
+#. Display Overhang preference checkbox
+#: ../resources/qml/ViewPage.qml:24
+msgctxt "ViewPage|"
+msgid "Display Overhang"
+msgstr ""

resources/qml/AboutDialog.qml

@@ -33,15 +33,17 @@ UM.Dialog {
         Label {
             Layout.alignment: Qt.AlignHCenter;
 
-            text: "Cura 15.06";
+            text: "Cura 15.06 Beta";
             font: UM.Theme.fonts.large;
         }
 
         Label {
+            //: About dialog application description
             text: qsTr("End-to-end solution for fused filament 3D printing.")
         }
 
         Label {
+            //: About dialog application author note
             text: qsTr("Cura has been developed by Ultimaker B.V. in cooperation with the community.")
         }
 

resources/qml/Actions.qml

@@ -34,7 +34,7 @@ Item {
     Action {
         id: undoAction;
         //: Undo action
-        text: qsTr("Undo");
+        text: qsTr("&Undo");
         iconName: "edit-undo";
         shortcut: StandardKey.Undo;
     }
@@ -42,7 +42,7 @@ Item {
     Action {
         id: redoAction;
         //: Redo action
-        text: qsTr("Redo");
+        text: qsTr("&Redo");
         iconName: "edit-redo";
         shortcut: StandardKey.Redo;
     }
@@ -50,7 +50,7 @@ Item {
     Action {
         id: quitAction;
         //: Quit action
-        text: qsTr("Quit");
+        text: qsTr("&Quit");
         iconName: "application-exit";
         shortcut: StandardKey.Quit;
     }
@@ -58,27 +58,27 @@ Item {
     Action {
         id: preferencesAction;
         //: Preferences action
-        text: qsTr("Preferences");
+        text: qsTr("&Preferences...");
         iconName: "configure";
     }
 
     Action {
         id: addMachineAction;
-        //: Add a Machine action
+        //: Add Printer action
-        text: qsTr("Add Printer...");
+        text: qsTr("&Add Printer...");
     }
 
     Action {
         id: settingsAction;
-        //: Manage Printers action
+        //: Configure Printers action
-        text: qsTr("Configure Printers");
+        text: qsTr("&Configure Printers");
         iconName: "configure";
     }
 
     Action {
         id: documentationAction;
         //: Show Online Documentation action
-        text: qsTr("Show Online Documentation");
+        text: qsTr("Show Online &Documentation");
         iconName: "help-contents";
         shortcut: StandardKey.Help;
     }
@@ -86,14 +86,14 @@ Item {
     Action {
         id: reportBugAction;
         //: Report a Bug Action
-        text: qsTr("Report a Bug");
+        text: qsTr("Report a &Bug");
         iconName: "tools-report-bug";
     }
 
     Action {
         id: aboutAction;
         //: About action
-        text: qsTr("About...");
+        text: qsTr("&About...");
         iconName: "help-about";
     }
 
@@ -159,7 +159,7 @@ Item {
     Action {
         id: openAction;
         //: Open file action
-        text: qsTr("Open...");
+        text: qsTr("&Open...");
         iconName: "document-open";
         shortcut: StandardKey.Open;
     }
@@ -167,7 +167,7 @@ Item {
     Action {
         id: saveAction;
         //: Save file action
-        text: qsTr("Save...");
+        text: qsTr("&Save...");
         iconName: "document-save";
         shortcut: StandardKey.Save;
     }
@@ -175,7 +175,7 @@ Item {
     Action {
         id: showEngineLogAction;
         //: Show engine log action
-        text: qsTr("Show engine log...");
+        text: qsTr("Show engine &log...");
         iconName: "view-list-text";
     }
 }

resources/qml/AddMachineWizard.qml

@@ -15,11 +15,13 @@ UM.Dialog {
         anchors.fill: parent;
 
         Label {
+            //: Add Printer wizard page title
             text: qsTr("Add Printer");
             font.pointSize: 18;
         }
 
         Label {
+            //: Add Printer wizard page description
             text: qsTr("Please select the type of printer:");
         }
 
@@ -34,6 +36,7 @@ UM.Dialog {
         }
 
         Label {
+            //: Add Printer wizard field label
             text: qsTr("Printer Name:");
         }
 
@@ -46,6 +49,7 @@ UM.Dialog {
 
     rightButtons: [
         Button {
+            //: Add Printer wizarad button
             text: qsTr("Next");
             onClicked: {
                 if(machineList.currentIndex != -1) {
@@ -55,6 +59,7 @@ UM.Dialog {
             }
         },
         Button {
+            //: Add Printer wizarad button
             text: qsTr("Cancel");
             onClicked: base.visible = false;
         }

resources/qml/Cura.qml

@@ -10,9 +10,7 @@ UM.MainWindow {
     id: base
     visible: true
 
-    //width: 1280
+    //: Cura application window title
-    //height: 720
-
     title: qsTr("Cura");
 
     Item {
@@ -271,6 +269,7 @@ UM.MainWindow {
         id: preferences
 
         Component.onCompleted: {
+            //: View preferences page title
             insertPage(1, qsTr("View"), "view-preview", Qt.resolvedUrl("./ViewPage.qml"));
         }
     }
@@ -322,7 +321,7 @@ UM.MainWindow {
         configureMachines.onTriggered: { preferences.visible = true; preferences.setPage(2); }
 
         documentation.onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/support");
-        reportBug.onTriggered: Qt.openUrlExternally("https://github.com/Ultimaker/PluggableCura/issues");
+        reportBug.onTriggered: Qt.openUrlExternally("https://github.com/Ultimaker/Cura/issues");
         showEngineLog.onTriggered: engineLog.visible = true;
         about.onTriggered: aboutDialog.visible = true;
     }

resources/qml/EngineLog.qml

@@ -26,6 +26,7 @@ UM.Dialog {
     }
 
     rightButtons: Button {
+        //: Close engine log button
         text: qsTr("Close");
         onClicked: dialog.visible = false;
     }

resources/qml/SaveButton.qml

@@ -145,6 +145,7 @@ Button {
                 color: UM.Theme.colors.save_button_text;
                 font: UM.Theme.fonts.default;
 
+                //: Print material amount save button label
                 text: control.printMaterialAmount < 0 ? "" : qsTr("%1m material").arg(control.printMaterialAmount);
             }
         }
@@ -186,10 +187,13 @@ Button {
 
     text: {
         if(base.progress < 0) {
+            //: Save button label
             return qsTr("Please load a 3D model");
         } else if (base.progress < 0.95) {
+            //: Save button label
             return qsTr("Calculating Print-time");
         } else {
+            //: Save button label
             return qsTr("Estimated Print-time");
         }
     }

resources/qml/Sidebar.qml

@@ -101,7 +101,9 @@ UM.AngledCornerRectangle {
 
     ListModel {
         id: modesListModel;
+        //: Simple configuration mode option
         ListElement { text: QT_TR_NOOP("Simple"); file: "SidebarSimple.qml" }
+        //: Advanced configuration mode option
         ListElement { text: QT_TR_NOOP("Advanced"); file: "SidebarAdvanced.qml" }
     }
 }

resources/qml/SidebarHeader.qml

@@ -22,6 +22,7 @@ Column {
         height: UM.Theme.sizes.line.height;
 
         Label {
+            //: Configuration mode label
             text: qsTr("Mode:");
 
             font: UM.Theme.fonts.sidebar_header;
@@ -65,6 +66,7 @@ Column {
         }
 
         Label {
+            //: Machine selection label
             text: qsTr("Machine:");
 
             font: UM.Theme.fonts.sidebar_header;
@@ -110,6 +112,8 @@ Column {
         height: UM.Theme.sizes.section.height;
 
         iconSource: UM.Theme.icons.printsetup;
+
+        //: Sidebar header label
         text: qsTr("Print Setup");
         enabled: false;
 

resources/qml/SidebarSimple.qml

@@ -36,14 +36,17 @@ Item {
                 text: {
                     if (UM.Backend.progress < 0)
                     {
+                        //: Sidebar configuration label
                         return qsTr("No Model Loaded");
                     }
                     else if (!base.minimumPrintTime.valid || !base.maximumPrintTime.valid)
                     {
+                        //: Sidebar configuration label
                         return qsTr("Calculating...")
                     }
                     else
                     {
+                        //: Sidebar configuration label
                         return qsTr("Estimated Print Time");
                     }
                 }
@@ -79,6 +82,8 @@ Item {
             Label {
                 anchors.left: parent.left;
                 anchors.verticalCenter: parent.verticalCenter;
+
+                //: Quality slider label
                 text: qsTr("Minimum\nDraft");
                 color: UM.Theme.colors.text;
                 font: UM.Theme.fonts.default;
@@ -87,6 +92,8 @@ Item {
             Label {
                 anchors.right: parent.right;
                 anchors.verticalCenter: parent.verticalCenter;
+
+                //: Quality slider label
                 text: qsTr("Maximum\nQuality");
                 horizontalAlignment: Text.AlignRight;
                 color: UM.Theme.colors.text;
@@ -98,6 +105,7 @@ Item {
             Layout.fillWidth: true;
             Layout.preferredHeight: UM.Theme.sizes.section.height;
 
+            //: Setting checkbox
             text: qsTr("Enable Support");
 
             style: UM.Theme.styles.checkbox;

setup.py

@@ -31,9 +31,9 @@ setup(name="Cura",
         author_email="d.braam@ultimaker.com",
         url="http://software.ultimaker.com/",
         license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)",
-        scripts=["printer.py"],
+        scripts=["cura.py"],
         #windows=[{"script": "printer.py", "dest_name": "Cura"}],
-        console=[{"script": "printer.py"}],
+        console=[{"script": "cura.py"}],
         options={"py2exe": {"skip_archive": False, "includes": includes}})
 
 print("Coping Cura plugins.")