diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml
index 16c9768eef..fc88051d32 100644
--- a/plugins/LayerView/LayerView.qml
+++ b/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)}
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/USBPrinting/ControlWindow.qml b/plugins/USBPrinting/ControlWindow.qml
index 4ea83f7bb3..5eb9ee2884 100644
--- a/plugins/USBPrinting/ControlWindow.qml
+++ b/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
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/USBPrinting/FirmwareUpdateWindow.qml b/plugins/USBPrinting/FirmwareUpdateWindow.qml
index bc5a33c262..65021b6b9b 100644
--- a/plugins/USBPrinting/FirmwareUpdateWindow.qml
+++ b/plugins/USBPrinting/FirmwareUpdateWindow.qml
@@ -9,7 +9,22 @@ 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 +41,4 @@ Rectangle
             height: 25
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py
index 0c513fbade..a683f12c7a 100644
--- a/plugins/USBPrinting/USBPrinterManager.py
+++ b/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("plugins")
+i18n_catalog = i18nCatalog("uranium")
 
 
 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"])
diff --git a/resources/qml/AboutDialog.qml b/resources/qml/AboutDialog.qml
index 67b6c4edeb..180c40fdd5 100644
--- a/resources/qml/AboutDialog.qml
+++ b/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.")
         }
 
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 2bff9052f4..4205414ef1 100644
--- a/resources/qml/Actions.qml
+++ b/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
-        text: qsTr("Add Printer...");
+        //: Add Printer action
+        text: qsTr("&Add Printer...");
     }
 
     Action {
         id: settingsAction;
-        //: Manage Printers action
-        text: qsTr("Configure Printers");
+        //: Configure Printers action
+        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";
     }
 }
diff --git a/resources/qml/AddMachineWizard.qml b/resources/qml/AddMachineWizard.qml
index 6607dd0860..5ff8bab1ac 100644
--- a/resources/qml/AddMachineWizard.qml
+++ b/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;
         }
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 7158332417..15754b7846 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -10,9 +10,7 @@ UM.MainWindow {
     id: base
     visible: true
 
-    //width: 1280
-    //height: 720
-
+    //: Cura application window title
     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;
     }
diff --git a/resources/qml/EngineLog.qml b/resources/qml/EngineLog.qml
index 8b11641694..3ce1073796 100644
--- a/resources/qml/EngineLog.qml
+++ b/resources/qml/EngineLog.qml
@@ -26,6 +26,7 @@ UM.Dialog {
     }
 
     rightButtons: Button {
+        //: Close engine log button
         text: qsTr("Close");
         onClicked: dialog.visible = false;
     }
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index 65cfbd2641..60caa47ac5 100644
--- a/resources/qml/SaveButton.qml
+++ b/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");
         }
     }
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index c4e033a760..d5b824382d 100644
--- a/resources/qml/Sidebar.qml
+++ b/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" }
     }
 }
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 9d4a103637..ddaa1e0c2a 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/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;
 
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index a80843d2e6..4929d76794 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/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;