diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index 78b20abb6e..9b8d7f9639 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0200\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -19,64 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/__init__.py:12
-msgctxt "@label"
-msgid "Machine Settings action"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid ""
-"Provides a way to change machine settings (such as build volume, nozzle "
-"size, etc)"
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
 msgid "Machine Settings"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:12
-msgctxt "@label"
-msgid "X-Ray View"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides the X-Ray view."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/XRayView/__init__.py:19
 msgctxt "@item:inlistbox"
 msgid "X-Ray"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:11
-msgctxt "@label"
-msgid "X3D Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:14
-msgctxt "@info:whatsthis"
-msgid "Provides support for reading X3D files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:20
+#: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:13
 msgctxt "@item:inlistbox"
 msgid "X3D File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:12
-msgctxt "@label"
-msgid "GCode Writer"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Writes GCode to a file."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:22
+#: /home/ruben/Projects/Cura/plugins/GCodeWriter/__init__.py:16
 msgctxt "@item:inlistbox"
 msgid "GCode File"
 msgstr ""
@@ -97,7 +55,7 @@ msgid "Doodle3D printing"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/PrinterConnection.py:37
-msgctxt "@action:button Preceded by 'Ready to'."
+msgctxt "@action:button"
 msgid "Print with Doodle3D"
 msgstr ""
 
@@ -116,32 +74,11 @@ msgctxt "@item:inlistbox"
 msgid "Enable Scan devices..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/__init__.py:12
-#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:18
-msgctxt "@label"
-msgid "Changelog"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Shows changes since latest checked version."
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.py:35
 msgctxt "@item:inmenu"
 msgid "Show Changelog"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/__init__.py:12
-msgctxt "@label"
-msgid "Profile flatener"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/ProfileFlattener/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Create a flattend quality changes profile."
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/ProfileFlattener/ProfileFlattener.py:20
 msgctxt "@item:inmenu"
 msgid "Flatten active settings"
@@ -152,17 +89,6 @@ msgctxt "@info:status"
 msgid "Profile has been flattened & activated."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/__init__.py:13
-msgctxt "@label"
-msgid "USB printing"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/__init__.py:17
-msgctxt "@info:whatsthis"
-msgid ""
-"Accepts G-Code and sends them to a printer. Plugin can also update firmware."
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDevice.py:26
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -200,23 +126,18 @@ msgid ""
 "Unable to start a new job because the printer does not support usb printing."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:107
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:108
 msgctxt "@info"
 msgid "Unable to update firmware because there are no printers connected."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:121
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/USBPrinterOutputDeviceManager.py:122
 #, python-format
 msgctxt "@info"
 msgid "Could not find firmware required for the printer at %s."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:15
-msgctxt "X3G Writer Plugin Description"
-msgid "Writes X3G to a file"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:22
+#: /home/ruben/Projects/Cura/plugins/X3GWriter/__init__.py:14
 msgctxt "X3G Writer File Description"
 msgid "X3G File"
 msgstr ""
@@ -280,26 +201,11 @@ msgctxt "@info:status"
 msgid "Failed to eject {0}. Another program may be using the drive."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/__init__.py:12
-msgctxt "@label"
-msgid "Removable Drive Output Device Plugin"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/__init__.py:14
-msgctxt "@info:whatsthis"
-msgid "Provides removable drive hotplugging and writing support."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:69
+#: /home/ruben/Projects/Cura/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py:68
 msgctxt "@item:intext"
 msgid "Removable Drive"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/__init__.py:13
-msgctxt "@info:whatsthis"
-msgid "Manages network connections to Ultimaker 3 printers"
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:106
 msgctxt "@action:button Preceded by 'Ready to'."
 msgid "Print over network"
@@ -355,45 +261,45 @@ msgctxt "@info:tooltip"
 msgid "Send access request to the printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:348
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:358
 msgctxt "@info:status"
 msgid ""
 "Connected over the network. Please approve the access request on the printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:355
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:365
 msgctxt "@info:status"
 msgid "Connected over the network."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:368
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:378
 msgctxt "@info:status"
 msgid "Connected over the network. No access to control the printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:373
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:383
 msgctxt "@info:status"
 msgid "Access request was denied on the printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:376
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:386
 msgctxt "@info:status"
 msgid "Access request failed due to a timeout."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:440
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:450
 msgctxt "@info:status"
 msgid "The connection with the network was lost."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:471
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:481
 msgctxt "@info:status"
 msgid ""
 "The connection with the printer was lost. Check your printer to see if it is "
 "connected."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:620
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:630
 #, python-format
 msgctxt "@info:status"
 msgid ""
@@ -401,51 +307,50 @@ msgid ""
 "%s."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:644
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:654
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Unable to start a new print job. No Printcore loaded in slot {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:651
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:661
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Unable to start a new print job. No material loaded in slot {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:660
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:670
 #, python-brace-format
 msgctxt "@label"
 msgid "Not enough material for spool {0}."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:670
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:680
 #, python-brace-format
 msgctxt "@label"
-msgid ""
-"Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}"
+msgid "Different PrintCore (Cura: {0}, Printer: {1}) selected for extruder {2}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:684
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:694
 #, python-brace-format
 msgctxt "@label"
 msgid "Different material (Cura: {0}, Printer: {1}) selected for extruder {2}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:692
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:702
 #, python-brace-format
 msgctxt "@label"
 msgid ""
-"Print core {0} is not properly calibrated. XY calibration needs to be "
+"PrintCore {0} is not properly calibrated. XY calibration needs to be "
 "performed on the printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:697
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:707
 msgctxt "@label"
 msgid "Are you sure you wish to print with the selected configuration?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:698
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:708
 msgctxt "@label"
 msgid ""
 "There is a mismatch between the configuration or calibration of the printer "
@@ -453,69 +358,72 @@ msgid ""
 "that are inserted in your printer."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:704
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:714
 msgctxt "@window:title"
 msgid "Mismatched configuration"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:805
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:815
 msgctxt "@info:status"
 msgid "Sending data to printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:806
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:816
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/SettingsWindow.qml:46
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/ControlWindow.qml:73
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:350
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:104
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:99
 #: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:188
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:374
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:371
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:137
 #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:87
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:251
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:874
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:884
 msgctxt "@info:status"
 msgid "Unable to send data to printer. Is another job still active?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1008
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1018
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:198
 msgctxt "@label:MonitorStatus"
 msgid "Aborting print..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1014
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1024
 msgctxt "@label:MonitorStatus"
 msgid "Print aborted. Please check the printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1020
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1030
 msgctxt "@label:MonitorStatus"
 msgid "Pausing print..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1022
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1032
 msgctxt "@label:MonitorStatus"
 msgid "Resuming print..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1165
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1175
 msgctxt "@window:title"
 msgid "Sync with your printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1167
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1177
 msgctxt "@label"
 msgid "Would you like to use your current printer configuration in Cura?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1169
+#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py:1179
 msgctxt "@label"
 msgid ""
-"The print cores and/or materials on your printer differ from those within "
-"your current project. For the best result, always slice for the print cores "
+"The PrintCores and/or materials on your printer differ from those within "
+"your current project. For the best result, always slice for the PrintCores "
 "and materials that are inserted in your printer."
 msgstr ""
 
@@ -524,104 +432,69 @@ msgctxt "@action"
 msgid "Connect via Network"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/SolidWorksReader.py:172
+msgctxt "@info:status"
+msgid ""
+"Errors appeared while opening your SolidWorks file!             Please "
+"check, whether it is possible to open your file in SolidWorks itself without "
+"any problems as well!"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/__init__.py:31
+msgctxt "@item:inlistbox"
+msgid "SolidWorks part file"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/__init__.py:35
+msgctxt "@item:inlistbox"
+msgid "SolidWorks assembly file"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.py:21
+msgid "Configure"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/CommonComReader.py:129
+#, python-format
+msgctxt "@info:status"
+msgid "Error while starting %s!"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/CommonComReader.py:207
+msgctxt "@info:status"
+msgid ""
+"Please keep in mind, that you have to reopen your SolidWorks file manually! "
+"Reloading the model won't work!"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24
 msgid "Modify G-Code"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12
-msgctxt "@label"
-msgid "Post Processing"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16
-msgctxt "Description of plugin"
-msgid "Extension that allows for user created scripts for post processing"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/AutoSave/__init__.py:12
-msgctxt "@label"
-msgid "Auto Save"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/AutoSave/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Automatically saves Preferences, Machines and Profiles after changes."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/__init__.py:10
-msgctxt "@label"
-msgid "Slice info"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/__init__.py:13
-msgctxt "@info:whatsthis"
-msgid "Submits anonymous slice info. Can be disabled through preferences."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:75
+#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:43
 msgctxt "@info"
 msgid ""
-"Cura collects anonymised slicing statistics. You can disable this in "
-"preferences"
+"Cura collects anonymised slicing statistics. You can disable this in the "
+"preferences."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:76
+#: /home/ruben/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:44
 msgctxt "@action:button"
 msgid "Dismiss"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/XmlMaterialProfile/__init__.py:18
-msgctxt "@label"
-msgid "Material Profiles"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/XmlMaterialProfile/__init__.py:21
-msgctxt "@info:whatsthis"
-msgid "Provides capabilities to read and write XML-based material profiles."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:12
-msgctxt "@label"
-msgid "Legacy Cura Profile Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides support for importing profiles from legacy Cura versions."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:21
+#: /home/ruben/Projects/Cura/plugins/LegacyProfileReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "Cura 15.04 profiles"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:12
-msgctxt "@label"
-msgid "GCode Profile Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides support for importing profiles from g-code files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:21
-#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:21
+#: /home/ruben/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14
+#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "G-code File"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:13
-msgctxt "@label"
-msgid "Layer View"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:16
-msgctxt "@info:whatsthis"
-msgid "Provides the Layer view."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/LayerView/__init__.py:20
 msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr ""
@@ -631,80 +504,40 @@ msgctxt "@info:status"
 msgid "Cura does not accurately display layers when Wire Printing is enabled"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py:14
-msgctxt "@label"
-msgid "Version Upgrade 2.5 to 2.6"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py:17
-msgctxt "@info:whatsthis"
-msgid "Upgrades configurations from Cura 2.5 to Cura 2.6."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:14
-msgctxt "@label"
-msgid "Version Upgrade 2.1 to 2.2"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py:17
-msgctxt "@info:whatsthis"
-msgid "Upgrades configurations from Cura 2.1 to Cura 2.2."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py:14
-msgctxt "@label"
-msgid "Version Upgrade 2.2 to 2.4"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py:17
-msgctxt "@info:whatsthis"
-msgid "Upgrades configurations from Cura 2.2 to Cura 2.4."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:12
-msgctxt "@label"
-msgid "Image Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Enables ability to generate printable geometry from 2D image files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:21
+#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "JPG Image"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:25
+#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:18
 msgctxt "@item:inlistbox"
 msgid "JPEG Image"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:29
+#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:22
 msgctxt "@item:inlistbox"
 msgid "PNG Image"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:33
+#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:26
 msgctxt "@item:inlistbox"
 msgid "BMP Image"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:37
+#: /home/ruben/Projects/Cura/plugins/ImageReader/__init__.py:30
 msgctxt "@item:inlistbox"
 msgid "GIF Image"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:272
-#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:105
+#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:281
+#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:108
 msgctxt "@info:status"
 msgid ""
 "The selected material is incompatible with the selected machine or "
 "configuration."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:299
+#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:308
 #, python-brace-format
 msgctxt "@info:status"
 msgid ""
@@ -712,30 +545,20 @@ msgid ""
 "errors: {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:308
+#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:317
 msgctxt "@info:status"
 msgid ""
 "Unable to slice because the prime tower or prime position(s) are invalid."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:316
+#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:325
 msgctxt "@info:status"
 msgid ""
 "Nothing to slice because none of the models fit the build volume. Please "
 "scale or rotate models to fit."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/__init__.py:13
-msgctxt "@label"
-msgid "CuraEngine Backend"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides the link to the CuraEngine slicing backend."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:64
+#: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:65
 #: /home/ruben/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:238
 msgctxt "@info:status"
 msgid "Processing Layers"
@@ -743,84 +566,53 @@ msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:14
 msgctxt "@label"
-msgid "Per Model Settings Tool"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:17
-msgctxt "@info:whatsthis"
-msgid "Provides the Per Model Settings."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:21
-msgctxt "@label"
 msgid "Per Model Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:22
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/__init__.py:15
 msgctxt "@info:tooltip"
 msgid "Configure Per Model Settings"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:165
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:643
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:454
 msgctxt "@title:tab"
 msgid "Recommended"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.py:167
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:648
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:459
 msgctxt "@title:tab"
 msgid "Custom"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:27
-msgctxt "@label"
-msgid "3MF Reader"
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:30
-msgctxt "@info:whatsthis"
-msgid "Provides support for reading 3MF files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:38
-#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:44
+#: /home/ruben/Projects/Cura/plugins/3MFReader/__init__.py:36
 msgctxt "@item:inlistbox"
 msgid "3MF File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:119
-#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1047
+#: /home/ruben/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:122
+#: /home/ruben/Projects/Cura/cura/Settings/MachineManager.py:1050
 msgctxt "@label"
 msgid "Nozzle"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:25
+msgid "Browse plugins"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.py:120
+msgctxt "@window:title"
+msgid "Plugin browser"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:12
-msgctxt "@label"
-msgid "Solid View"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides a normal solid mesh view."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/SolidView/__init__.py:19
 msgctxt "@item:inmenu"
 msgid "Solid"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:12
-msgctxt "@label"
-msgid "G-code Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Allows loading and displaying G-code files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:25
+#: /home/ruben/Projects/Cura/plugins/GCodeReader/__init__.py:18
 msgctxt "@item:inlistbox"
 msgid "G File"
 msgstr ""
@@ -837,38 +629,18 @@ msgid ""
 "before sending the file to it. The g-code representation may not be accurate."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:12
-msgctxt "@label"
-msgid "Cura Profile Writer"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides support for exporting Cura profiles."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:21
-#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:21
+#: /home/ruben/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14
+#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:14
 msgctxt "@item:inlistbox"
 msgid "Cura Profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:19
-msgctxt "@label"
-msgid "3MF Writer"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:22
-msgctxt "@info:whatsthis"
-msgid "Provides support for writing 3MF files."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:31
+#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:30
 msgctxt "@item:inlistbox"
 msgid "3MF file"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:39
+#: /home/ruben/Projects/Cura/plugins/3MFWriter/__init__.py:38
 msgctxt "@item:inlistbox"
 msgid "Cura Project 3MF file"
 msgstr ""
@@ -879,18 +651,6 @@ msgctxt "@action"
 msgid "Select upgrades"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/__init__.py:16
-msgctxt "@label"
-msgid "Ultimaker machine actions"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/__init__.py:19
-msgctxt "@info:whatsthis"
-msgid ""
-"Provides machine actions for Ultimaker machines (such as bed leveling "
-"wizard, selecting upgrades, etc)"
-msgstr ""
-
 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.py:12
 msgctxt "@action"
 msgid "Upgrade Firmware"
@@ -906,28 +666,18 @@ msgctxt "@action"
 msgid "Level build plate"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:12
-msgctxt "@label"
-msgid "Cura Profile Reader"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/CuraProfileReader/__init__.py:15
-msgctxt "@info:whatsthis"
-msgid "Provides support for importing Cura profiles."
-msgstr ""
-
 #: /home/ruben/Projects/Cura/cura/PrintInformation.py:247
 #, python-brace-format
 msgctxt "@label"
 msgid "Pre-sliced file {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:376
+#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:440
 msgctxt "@item:material"
 msgid "No material loaded"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:383
+#: /home/ruben/Projects/Cura/cura/PrinterOutputDevice.py:447
 msgctxt "@item:material"
 msgid "Unknown material"
 msgstr ""
@@ -943,13 +693,13 @@ msgctxt "@info:status"
 msgid "Unable to find a location within the build volume for all objects"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:355
+#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:417
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:112
 msgctxt "@title:window"
 msgid "File Already Exists"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:356
+#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:418
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:113
 #, python-brace-format
 msgctxt "@label"
@@ -958,17 +708,33 @@ msgid ""
 "overwrite it?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:739
-#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:740
+#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:801
 msgctxt "@label"
 msgid "Custom"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:741
+#: /home/ruben/Projects/Cura/cura/Settings/ContainerManager.py:805
 msgctxt "@label"
 msgid "Custom Material"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/cura/Settings/MaterialManager.py:24
+msgctxt "@info:status Has a cancel button next to it."
+msgid ""
+"The selected material diameter causes the material to become incompatible "
+"with the current printer."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/cura/Settings/MaterialManager.py:25
+msgctxt "@action:button"
+msgid "Undo"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/cura/Settings/MaterialManager.py:25
+msgctxt "@action"
+msgid "Undo changing the material diameter."
+msgstr ""
+
 #: /home/ruben/Projects/Cura/cura/Settings/CuraContainerRegistry.py:143
 #, python-brace-format
 msgctxt "@info:status"
@@ -1062,179 +828,239 @@ msgctxt "@action:button"
 msgid "Open Web Page"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:238
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:248
 msgctxt "@info:progress"
 msgid "Loading machines..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:594
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:610
 msgctxt "@info:progress"
 msgid "Setting up scene..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:636
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:652
 msgctxt "@info:progress"
 msgid "Loading interface..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:793
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:815
 #, python-format
-msgctxt "@info"
+msgctxt ""
+"@info 'width', 'depth' and 'height' are variable names that must NOT be "
+"translated; just translate the format of ##x##x## mm."
 msgid "%(width).1f x %(depth).1f x %(height).1f mm"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1263
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1285
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Only one G-code file can be loaded at a time. Skipped importing {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1272
+#: /home/ruben/Projects/Cura/cura/CuraApplication.py:1294
 #, python-brace-format
 msgctxt "@info:status"
 msgid "Can't open any other file if G-code is loading. Skipped importing {0}"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:53
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:59
 msgctxt "@title"
 msgid "Machine Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:71
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:77
 msgctxt "@title:tab"
 msgid "Printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:90
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:96
 msgctxt "@label"
 msgid "Printer Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:102
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:107
 msgctxt "@label"
 msgid "X (Width)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:109
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:122
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:135
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:343
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:386
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:108
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:118
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:128
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:234
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:286
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:298
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:389
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:399
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:549
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:561
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:574
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:411
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:838
 msgctxt "@label"
 msgid "mm"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:115
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:117
 msgctxt "@label"
 msgid "Y (Depth)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:128
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:127
 msgctxt "@label"
 msgid "Z (Height)"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:139
+msgctxt "@label"
+msgid "Build plate shape"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:148
-msgctxt "@label"
-msgid "Build Plate Shape"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:198
 msgctxt "@option:check"
-msgid "Machine Center is Zero"
+msgid "Origin at center"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:209
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:156
 msgctxt "@option:check"
-msgid "Heated Bed"
+msgid "Heated bed"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:221
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:167
 msgctxt "@label"
-msgid "GCode Flavor"
+msgid "Gcode flavor"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:273
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:180
 msgctxt "@label"
 msgid "Printhead Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:285
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:190
 msgctxt "@label"
 msgid "X min"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:297
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:191
+msgctxt "@tooltip"
+msgid ""
+"Distance from the left of the printhead to the center of the nozzle. Used to "
+"prevent colissions between previous prints and the printhead when printing "
+"\"One at a Time\"."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:200
 msgctxt "@label"
 msgid "Y min"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:309
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:201
+msgctxt "@tooltip"
+msgid ""
+"Distance from the front of the printhead to the center of the nozzle. Used "
+"to prevent colissions between previous prints and the printhead when "
+"printing \"One at a Time\"."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:210
 msgctxt "@label"
 msgid "X max"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:321
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:211
+msgctxt "@tooltip"
+msgid ""
+"Distance from the right of the printhead to the center of the nozzle. Used "
+"to prevent colissions between previous prints and the printhead when "
+"printing \"One at a Time\"."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:220
 msgctxt "@label"
 msgid "Y max"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:336
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:221
+msgctxt "@tooltip"
+msgid ""
+"Distance from the rear of the printhead to the center of the nozzle. Used to "
+"prevent colissions between previous prints and the printhead when printing "
+"\"One at a Time\"."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:233
 msgctxt "@label"
 msgid "Gantry height"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:351
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:235
+msgctxt "@tooltip"
+msgid ""
+"The height difference between the tip of the nozzle and the gantry system (X "
+"and Y axes). Used to prevent collisions between previous prints and the "
+"gantry when printing \"One at a Time\"."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:253
 msgctxt "@label"
 msgid "Number of Extruders"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:379
-msgctxt "@label"
-msgid "Material Diameter"
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:287
+msgctxt "@tooltip"
+msgid ""
+"The nominal diameter of filament supported by the printer. The exact "
+"diameter will be overridden by the material and/or the profile."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:390
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:540
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:289
+msgctxt "@label"
+msgid "Material diameter"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:297
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:388
 msgctxt "@label"
 msgid "Nozzle size"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:417
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:315
 msgctxt "@label"
 msgid "Start Gcode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:446
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:325
+msgctxt "@tooltip"
+msgid "Gcode commands to be executed at the very start."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:334
 msgctxt "@label"
 msgid "End Gcode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:528
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:344
+msgctxt "@tooltip"
+msgid "Gcode commands to be executed at the very end."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:376
 msgctxt "@label"
 msgid "Nozzle Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:554
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:398
 msgctxt "@label"
 msgid "Nozzle offset X"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:567
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:410
 msgctxt "@label"
 msgid "Nozzle offset Y"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:592
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:431
 msgctxt "@label"
 msgid "Extruder Start Gcode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:620
+#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.qml:449
 msgctxt "@label"
 msgid "Extruder End Gcode"
 msgstr ""
@@ -1280,11 +1106,17 @@ msgctxt "@action:button"
 msgid "Print"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:18
+msgctxt "@label"
+msgid "Changelog"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/ChangeLogPlugin/ChangeLog.qml:37
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:105
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:107
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/UM3InfoComponents.qml:55
 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:446
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:304
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:306
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:78
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:125
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:146
 #: /home/ruben/Projects/Cura/resources/qml/EngineLog.qml:38
@@ -1292,47 +1124,47 @@ msgctxt "@action:button"
 msgid "Close"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:20
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:22
 msgctxt "@title:window"
 msgid "Firmware Update"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:40
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:42
 msgctxt "@label"
 msgid "Firmware update completed."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:45
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:47
 msgctxt "@label"
 msgid "Starting firmware update, this may take a while."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:50
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:52
 msgctxt "@label"
 msgid "Updating firmware."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:59
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:61
 msgctxt "@label"
 msgid "Firmware update failed due to an unknown error."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:62
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:64
 msgctxt "@label"
 msgid "Firmware update failed due to an communication error."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:65
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:67
 msgctxt "@label"
 msgid "Firmware update failed due to an input/output error."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:68
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:70
 msgctxt "@label"
 msgid "Firmware update failed due to missing firmware."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:71
+#: /home/ruben/Projects/Cura/plugins/USBPrinting/FirmwareUpdateWindow.qml:73
 msgctxt "@label"
 msgid "Unknown error code: %1"
 msgstr ""
@@ -1368,12 +1200,13 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:96
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:50
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:95
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:187
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:190
 msgctxt "@action:button"
 msgid "Remove"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:104
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:33
 msgctxt "@action:button"
 msgid "Refresh"
 msgstr ""
@@ -1381,7 +1214,7 @@ msgstr ""
 #: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml:196
 msgctxt "@label"
 msgid ""
-"If your printer is not listed, read the <a href='%1'>network-printing "
+"If your printer is not listed, read the <a href='%1'>network printing "
 "troubleshooting guide</a>"
 msgstr ""
 
@@ -1456,6 +1289,69 @@ msgctxt "@action:button"
 msgid "Activate Configuration"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:20
+msgctxt "@title:window"
+msgid "Cura SolidWorks Plugin Configuration"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:44
+msgctxt "@action:label"
+msgid "Default quality of the exported STL:"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:79
+msgctxt "@option:curaSolidworksStlQuality"
+msgid "Always ask"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:80
+msgctxt "@option:curaSolidworksStlQuality"
+msgid "Always use Fine quality"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:81
+msgctxt "@option:curaSolidworksStlQuality"
+msgid "Always use Coarse quality"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ConfigDialog.qml:92
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:88
+#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181
+msgctxt "@action:button"
+msgid "OK"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:20
+msgctxt "@title:window"
+msgid "Import SolidWorks File as STL..."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:43
+msgctxt "@info:tooltip"
+msgid "Quality of the Exported STL"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:48
+msgctxt "@action:label"
+msgid "Quality"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:62
+msgctxt "@option:curaSolidworksStlQuality"
+msgid "Coarse"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:63
+msgctxt "@option:curaSolidworksStlQuality"
+msgid "Fine"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/CuraSolidWorksPlugin/ExportSTLUI.qml:78
+#: /home/ruben/Projects/Cura/resources/qml/AskOpenAsProjectOrModelsDialog.qml:81
+msgctxt "@text:window"
+msgid "Remember my choice"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18
 msgctxt "@title:window"
 msgid "Post Processing Plugin"
@@ -1481,67 +1377,67 @@ msgctxt "@info:tooltip"
 msgid "Change active post-processing scripts"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:61
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:71
 msgctxt "@label"
 msgid "View Mode: Layers"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:78
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:88
 msgctxt "@label"
 msgid "Color scheme"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:92
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:102
 msgctxt "@label:listbox"
 msgid "Material Color"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:96
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:106
 msgctxt "@label:listbox"
 msgid "Line Type"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:134
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:144
 msgctxt "@label"
 msgid "Compatibility Mode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:199
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:210
 msgctxt "@label"
 msgid "Show Travels"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:205
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:216
 msgctxt "@label"
 msgid "Show Helpers"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:211
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:222
 msgctxt "@label"
 msgid "Show Shell"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:217
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:228
 msgctxt "@label"
 msgid "Show Infill"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:253
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:264
 msgctxt "@label"
 msgid "Only Show Top Layers"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:262
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:273
 msgctxt "@label"
 msgid "Show 5 Detailed Layers On Top"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:273
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:284
 msgctxt "@label"
 msgid "Top / Bottom"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:277
+#: /home/ruben/Projects/Cura/plugins/LayerView/LayerView.qml:288
 msgctxt "@label"
 msgid "Inner Wall"
 msgstr ""
@@ -1620,28 +1516,23 @@ msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/ImageReader/ConfigUI.qml:181
-msgctxt "@action:button"
-msgid "OK"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:155
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:157
 msgctxt "@action:button"
 msgid "Select settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:195
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:197
 msgctxt "@title:window"
 msgid "Select Settings to Customize for this model"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:219
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:221
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:91
 msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:243
+#: /home/ruben/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:245
 msgctxt "@label:checkbox"
 msgid "Show all"
 msgstr ""
@@ -1651,66 +1542,66 @@ msgctxt "@title:window"
 msgid "Open Project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:57
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:54
 msgctxt "@action:ComboBox option"
 msgid "Update existing"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:58
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:55
 msgctxt "@action:ComboBox option"
 msgid "Create new"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:69
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:66
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:70
 msgctxt "@action:title"
 msgid "Summary - Cura Project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:91
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:88
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:88
 msgctxt "@action:label"
 msgid "Printer settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:107
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:104
 msgctxt "@info:tooltip"
 msgid "How should the conflict in the machine be resolved?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:127
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:124
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:97
 msgctxt "@action:label"
 msgid "Type"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:143
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:200
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:140
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:197
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:289
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:112
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:188
 msgctxt "@action:label"
 msgid "Name"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:164
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:161
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:164
 msgctxt "@action:label"
 msgid "Profile settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:180
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:177
 msgctxt "@info:tooltip"
 msgid "How should the conflict in the profile be resolved?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:215
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:212
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:172
 msgctxt "@action:label"
 msgid "Not in profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:220
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:217
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:177
 msgctxt "@action:label"
 msgid "%1 override"
@@ -1718,61 +1609,86 @@ msgid_plural "%1 overrides"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:231
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:228
 msgctxt "@action:label"
 msgid "Derivative from"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:236
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:233
 msgctxt "@action:label"
 msgid "%1, %2 override"
 msgid_plural "%1, %2 overrides"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:252
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:249
 msgctxt "@action:label"
 msgid "Material settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:268
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:265
 msgctxt "@info:tooltip"
 msgid "How should the conflict in the material be resolved?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:311
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:308
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:207
 msgctxt "@action:label"
 msgid "Setting visibility"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:320
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:317
 msgctxt "@action:label"
 msgid "Mode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:335
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:332
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:216
 msgctxt "@action:label"
 msgid "Visible settings:"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:340
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:337
 #: /home/ruben/Projects/Cura/resources/qml/WorkspaceSummaryDialog.qml:221
 msgctxt "@action:label"
 msgid "%1 out of %2"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:366
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:363
 msgctxt "@action:warning"
 msgid "Loading a project will clear all models on the buildplate"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:385
+#: /home/ruben/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:381
 msgctxt "@action:button"
 msgid "Open"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:11
+msgctxt "@title:window"
+msgid "Find & Update plugins"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:25
+msgctxt "@label"
+msgid "Here you can find a list of Third Party plugins."
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:143
+msgctxt "@action:button"
+msgid "Upgrade"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:145
+msgctxt "@action:button"
+msgid "Installed"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/plugins/PluginBrowser/PluginBrowser.qml:147
+msgctxt "@action:button"
+msgid "Download"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml:25
 #: /home/ruben/Projects/Cura/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml:25
 msgctxt "@title"
@@ -2057,19 +1973,19 @@ msgid "Customized"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:157
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:564
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:586
 msgctxt "@option:discardOrKeep"
 msgid "Always ask me this"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:158
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:565
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:587
 msgctxt "@option:discardOrKeep"
 msgid "Discard and never ask again"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/DiscardOrKeepProfileChangesDialog.qml:159
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:566
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:588
 msgctxt "@option:discardOrKeep"
 msgid "Keep and never ask again"
 msgstr ""
@@ -2129,47 +2045,47 @@ msgctxt "@label"
 msgid "Diameter"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:171
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:185
 msgctxt "@label"
 msgid "Filament Cost"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:187
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:201
 msgctxt "@label"
 msgid "Filament weight"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:204
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:218
 msgctxt "@label"
 msgid "Filament length"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:213
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:227
 msgctxt "@label"
 msgid "Cost per Meter"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:227
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:241
 msgctxt "@label"
 msgid "This material is linked to %1 and shares some of its properties."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:234
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:248
 msgctxt "@label"
 msgid "Unlink Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:245
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:259
 msgctxt "@label"
 msgid "Description"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:258
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:272
 msgctxt "@label"
 msgid "Adhesion Information"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:284
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:298
 msgctxt "@label"
 msgid "Print settings"
 msgstr ""
@@ -2184,6 +2100,11 @@ msgctxt "@label:textbox"
 msgid "Check all"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:40
+msgctxt "@info:status"
+msgid "Calculated"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfileTab.qml:53
 msgctxt "@title:column"
 msgid "Setting"
@@ -2205,207 +2126,212 @@ msgid "Unit"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:14
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:461
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:126
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:128
 msgctxt "@label"
 msgid "Interface"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:137
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:139
 msgctxt "@label"
 msgid "Language:"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:194
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:198
 msgctxt "@label"
 msgid "Currency:"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:208
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:212
 msgctxt "@label"
 msgid "Theme:"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:221
-msgctxt "@item:inlistbox"
-msgid "Ultimaker"
-msgstr ""
-
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:263
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:272
 msgctxt "@label"
 msgid ""
 "You will need to restart the application for these changes to have effect."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:280
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:289
 msgctxt "@info:tooltip"
 msgid "Slice automatically when changing settings."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:288
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:297
 msgctxt "@option:check"
 msgid "Slice automatically"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:311
 msgctxt "@label"
 msgid "Viewport behavior"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319
 msgctxt "@info:tooltip"
 msgid ""
 "Highlight unsupported areas of the model in red. Without support these areas "
 "will not print properly."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:319
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:328
 msgctxt "@option:check"
 msgid "Display overhang"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:326
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:335
 msgctxt "@info:tooltip"
 msgid ""
 "Moves the camera so the model is in the center of the view when a model is "
 "selected"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:331
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:340
 msgctxt "@action:button"
 msgid "Center camera when item is selected"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:349
 msgctxt "@info:tooltip"
 msgid "Should the default zoom behavior of cura be inverted?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:346
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:354
 msgctxt "@action:button"
 msgid "Invert the direction of camera zoom."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:363
+msgctxt "@info:tooltip"
+msgid "Should zooming move in the direction of the mouse?"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368
+msgctxt "@action:button"
+msgid "Zoom toward mouse direction"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:377
 msgctxt "@info:tooltip"
 msgid ""
 "Should models on the platform be moved so that they no longer intersect?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:382
 msgctxt "@option:check"
 msgid "Ensure models are kept apart"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:390
 msgctxt "@info:tooltip"
 msgid "Should models on the platform be moved down to touch the build plate?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:395
 msgctxt "@option:check"
 msgid "Automatically drop models to the build plate"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:385
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:407
 msgctxt "@info:tooltip"
 msgid "Show caution message in gcode reader."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:394
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:416
 msgctxt "@option:check"
 msgid "Caution message in gcode reader"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:401
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:423
 msgctxt "@info:tooltip"
 msgid "Should layer be forced into compatibility mode?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:406
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428
 msgctxt "@option:check"
 msgid "Force layer view compatibility mode (restart required)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:444
 msgctxt "@label"
 msgid "Opening and saving files"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:428
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:450
 msgctxt "@info:tooltip"
 msgid "Should models be scaled to the build volume if they are too large?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:433
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:455
 msgctxt "@option:check"
 msgid "Scale large models"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:442
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:464
 msgctxt "@info:tooltip"
 msgid ""
 "An model may appear extremely small if its unit is for example in meters "
 "rather than millimeters. Should these models be scaled up?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:447
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:469
 msgctxt "@option:check"
 msgid "Scale extremely small models"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:456
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:478
 msgctxt "@info:tooltip"
 msgid ""
 "Should a prefix based on the printer name be added to the print job name "
 "automatically?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:461
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483
 msgctxt "@option:check"
 msgid "Add machine prefix to job name"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:492
 msgctxt "@info:tooltip"
 msgid "Should a summary be shown when saving a project file?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:474
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:496
 msgctxt "@option:check"
 msgid "Show summary dialog when saving project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505
 msgctxt "@info:tooltip"
 msgid "Default behavior when opening a project file"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:491
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513
 msgctxt "@window:text"
 msgid "Default behavior when opening a project file: "
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:504
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:526
 msgctxt "@option:openProject"
 msgid "Always ask"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:505
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:527
 msgctxt "@option:openProject"
 msgid "Always open as a project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:506
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:528
 msgctxt "@option:openProject"
 msgid "Always import models"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:542
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:564
 msgctxt "@info:tooltip"
 msgid ""
 "When you have made changes to a profile and switched to a different one, a "
@@ -2413,27 +2339,27 @@ msgid ""
 "not, or you can choose a default behaviour and never show that dialog again."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:551
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:573
 msgctxt "@label"
 msgid "Override Profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:622
 msgctxt "@label"
 msgid "Privacy"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:607
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:629
 msgctxt "@info:tooltip"
 msgid "Should Cura check for updates when the program is started?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:612
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634
 msgctxt "@option:check"
 msgid "Check for updates on start"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:622
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644
 msgctxt "@info:tooltip"
 msgid ""
 "Should anonymous data about your print be sent to Ultimaker? Note, no "
@@ -2441,13 +2367,13 @@ msgid ""
 "stored."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:627
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649
 msgctxt "@option:check"
 msgid "Send (anonymous) print information"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:15
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:466
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:497
 msgctxt "@title:tab"
 msgid "Printers"
 msgstr ""
@@ -2497,7 +2423,7 @@ msgid "Waiting for a printjob"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:15
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:470
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:501
 msgctxt "@title:tab"
 msgid "Profiles"
 msgstr ""
@@ -2523,13 +2449,13 @@ msgid "Duplicate"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:113
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:194
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:201
 msgctxt "@action:button"
 msgid "Import"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:119
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:201
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:212
 msgctxt "@action:button"
 msgid "Export"
 msgstr ""
@@ -2597,7 +2523,7 @@ msgid "Export Profile"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:15
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:468
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:499
 msgctxt "@title:tab"
 msgid "Materials"
 msgstr ""
@@ -2614,52 +2540,52 @@ msgctxt "@action:label %1 is printer name"
 msgid "Printer: %1"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:148
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:149
 msgctxt "@action:button"
 msgid "Create"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:166
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:168
 msgctxt "@action:button"
 msgid "Duplicate"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:295
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:303
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:311
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:319
 msgctxt "@title:window"
 msgid "Import Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:304
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:320
 msgctxt "@info:status"
 msgid ""
 "Could not import material <filename>%1</filename>: <message>%2</message>"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:308
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:324
 msgctxt "@info:status"
 msgid "Successfully imported material <filename>%1</filename>"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:327
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:342
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:343
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:358
 msgctxt "@title:window"
 msgid "Export Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:346
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:362
 msgctxt "@info:status"
 msgid ""
 "Failed to export material to <filename>%1</filename>: <message>%2</message>"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:352
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialsPage.qml:368
 msgctxt "@info:status"
 msgid "Successfully exported material to <filename>%1</filename>"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/AddMachineDialog.qml:18
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:783
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:822
 msgctxt "@title:window"
 msgid "Add Printer"
 msgstr ""
@@ -2674,67 +2600,67 @@ msgctxt "@action:button"
 msgid "Add Printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:179
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:166
 msgctxt "@tooltip"
 msgid "Outer Wall"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:180
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:167
 msgctxt "@tooltip"
 msgid "Inner Walls"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:181
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:168
 msgctxt "@tooltip"
 msgid "Skin"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:182
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:169
 msgctxt "@tooltip"
 msgid "Infill"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:183
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:170
 msgctxt "@tooltip"
 msgid "Support Infill"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:184
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:171
 msgctxt "@tooltip"
 msgid "Support Interface"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:185
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:172
 msgctxt "@tooltip"
 msgid "Support"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:186
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:173
 msgctxt "@tooltip"
 msgid "Travel"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:187
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:174
 msgctxt "@tooltip"
 msgid "Retractions"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:188
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:175
 msgctxt "@tooltip"
 msgid "Other"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:215
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:217
 msgctxt "@label"
 msgid "00h 00min"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:268
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:270
 msgctxt "@label"
 msgid "%1 m / ~ %2 g / ~ %4 %3"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:273
+#: /home/ruben/Projects/Cura/resources/qml/JobSpecs.qml:275
 msgctxt "@label"
 msgid "%1 m / ~ %2 g"
 msgstr ""
@@ -2803,7 +2729,7 @@ msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:128
 msgctxt "@label"
-msgid "Support library for scientific computing "
+msgid "Support library for scientific computing"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/AboutDialog.qml:129
@@ -2851,32 +2777,32 @@ msgctxt "@label:textbox"
 msgid "Search..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:337
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:390
 msgctxt "@action:menu"
 msgid "Copy value to all extruders"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:352
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:405
 msgctxt "@action:menu"
 msgid "Hide this setting"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:362
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:415
 msgctxt "@action:menu"
 msgid "Don't show this setting"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:366
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:419
 msgctxt "@action:menu"
 msgid "Keep this setting visible"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:385
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingView.qml:438
 msgctxt "@action:menu"
 msgid "Configure setting visiblity..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:93
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingCategory.qml:123
 msgctxt "@label"
 msgid ""
 "Some hidden settings use values different from their normal calculated "
@@ -2885,29 +2811,29 @@ msgid ""
 "Click to make these settings visible."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:60
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:62
 msgctxt "@label Header for list of settings."
 msgid "Affects"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:65
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:67
 msgctxt "@label Header for list of settings."
 msgid "Affected By"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:155
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:157
 msgctxt "@label"
 msgid ""
 "This setting is always shared between all extruders. Changing it here will "
 "change the value for all extruders"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:158
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:160
 msgctxt "@label"
 msgid "The value is resolved from per-extruder values "
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:184
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:186
 msgctxt "@label"
 msgid ""
 "This setting has a value that is different from the profile.\n"
@@ -2915,7 +2841,7 @@ msgid ""
 "Click to restore the value of the profile."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:282
+#: /home/ruben/Projects/Cura/resources/qml/Settings/SettingItem.qml:284
 msgctxt "@label"
 msgid ""
 "This setting is normally calculated, but it currently has an absolute value "
@@ -2924,40 +2850,26 @@ msgid ""
 "Click to restore the calculated value."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:185
-msgctxt "@tooltip"
-msgid ""
-"<b>Print Setup</b><br/><br/>Edit or review the settings for the active print "
-"job."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:284
-msgctxt "@tooltip"
-msgid ""
-"<b>Print Monitor</b><br/><br/>Monitor the state of the connected printer and "
-"the print job in progress."
-msgstr ""
-
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:337
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:112
 msgctxt "@label:listbox"
 msgid "Print Setup"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:337
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:112
 msgctxt "@label:listbox"
 msgid ""
 "Print Setup disabled\n"
 "G-code files cannot be modified"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:644
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:455
 msgctxt "@tooltip"
 msgid ""
 "<b>Recommended Print Setup</b><br/><br/>Print with the recommended settings "
 "for the selected printer, material and quality."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:649
+#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:460
 msgctxt "@tooltip"
 msgid ""
 "<b>Custom Print Setup</b><br/><br/>Print with finegrained control over every "
@@ -2975,7 +2887,7 @@ msgid "&View"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:26
-msgctxt "@title:menuitem %1 is the value from the printer"
+msgctxt "@title:menuitem %1 is the nozzle currently loaded in the printer"
 msgid "Automatic: %1"
 msgstr ""
 
@@ -2986,14 +2898,14 @@ msgid_plural "Print Selected Models With:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:82
+#: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:83
 msgctxt "@title:window"
 msgid "Multiply Selected Model"
 msgid_plural "Multiply Selected Models"
 msgstr[0] ""
 msgstr[1] ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:109
+#: /home/ruben/Projects/Cura/resources/qml/Menus/ContextMenu.qml:108
 msgctxt "@label"
 msgid "Number of Copies"
 msgstr ""
@@ -3050,22 +2962,22 @@ msgctxt "@tooltip"
 msgid "The current temperature of the heated bed."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:379
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:389
 msgctxt "@tooltip of temperature input"
 msgid "The temperature to pre-heat the bed to."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:573
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:583
 msgctxt "@button Cancel pre-heating"
 msgid "Cancel"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:573
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:583
 msgctxt "@button"
 msgid "Pre-heat"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:600
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:610
 msgctxt "@tooltip of pre-heat"
 msgid ""
 "Heat the bed in advance before printing. You can continue adjusting your "
@@ -3073,22 +2985,22 @@ msgid ""
 "when you're ready to print."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:633
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:643
 msgctxt "@label"
 msgid "Active print"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:638
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:648
 msgctxt "@label"
 msgid "Job Name"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:644
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:654
 msgctxt "@label"
 msgid "Printing Time"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:650
+#: /home/ruben/Projects/Cura/resources/qml/PrintMonitor.qml:660
 msgctxt "@label"
 msgid "Estimated time left"
 msgstr ""
@@ -3281,7 +3193,7 @@ msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:27
 msgctxt "@label:PrintjobStatus"
-msgid "Please load a 3d model"
+msgid "Please load a 3D model"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/SaveButton.qml:33
@@ -3325,7 +3237,7 @@ msgid "Select the active output device"
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/OpenFilesIncludingProjectsDialog.qml:19
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:618
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:649
 msgctxt "@title:window"
 msgid "Open file(s)"
 msgstr ""
@@ -3348,111 +3260,116 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:68
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:85
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:85
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:102
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:94
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:111
 msgctxt "@title:menu menubar:file"
 msgid "Save &As..."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:105
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:122
 msgctxt "@title:menu menubar:file"
 msgid "Save project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:128
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:145
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:145
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:162
 msgctxt "@title:menu"
 msgid "&View"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:150
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:167
 msgctxt "@title:menu"
 msgid "&Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:152
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:169
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:162
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:174
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:179
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:191
 msgctxt "@title:menu"
 msgid "&Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:163
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:175
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:180
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:192
 msgctxt "@title:menu"
 msgid "&Profile"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:167
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:184
 msgctxt "@action:inmenu"
 msgid "Set as Active Extruder"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:185
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:202
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:218
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:235
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&references"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:226
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:243
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:296
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:343
 msgctxt "@action:button"
 msgid "Open File"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:369
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:428
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:464
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:495
 msgctxt "@title:tab"
 msgid "Settings"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:500
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:531
 msgctxt "@title:window"
 msgid "New project"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:501
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:532
 msgctxt "@info:question"
 msgid ""
 "Are you sure you want to start a new project? This will clear the build "
 "plate and any unsaved settings."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:718
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:750
+msgctxt "@window:title"
+msgid "Install Plugin"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:757
 msgctxt "@title:window"
 msgid "Open File(s)"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:721
+#: /home/ruben/Projects/Cura/resources/qml/Cura.qml:760
 msgctxt "@text:window"
 msgid ""
 "We have found one or more G-Code files within the files you have selected. "
@@ -3480,80 +3397,90 @@ msgctxt "@action:label"
 msgid "Don't show project summary on save again"
 msgstr ""
 
+#: /home/ruben/Projects/Cura/resources/qml/Topbar.qml:47
+msgctxt "@title:tab"
+msgid "Prepare"
+msgstr ""
+
+#: /home/ruben/Projects/Cura/resources/qml/Topbar.qml:60
+msgctxt "@title:tab"
+msgid "Print"
+msgstr ""
+
 #: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:41
 msgctxt "@label"
 msgid "Infill"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:188
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:192
 msgctxt "@label"
 msgid "0%"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:195
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:199
 msgctxt "@label"
 msgid "Empty infill will leave your model hollow with low strength."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:199
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:203
 msgctxt "@label"
 msgid "20%"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:206
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:210
 msgctxt "@label"
 msgid "Light (20%) infill will give your model an average strength."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:210
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:214
 msgctxt "@label"
 msgid "50%"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:217
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:221
 msgctxt "@label"
 msgid "Dense (50%) infill will give your model an above average strength."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:221
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:225
 msgctxt "@label"
 msgid "100%"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:228
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:232
 msgctxt "@label"
 msgid "Solid (100%) infill will make your model completely solid."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:232
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:236
 msgctxt "@label"
 msgid "Gradual"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:240
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:244
 msgctxt "@label"
 msgid ""
 "Gradual infill will gradually increase the amount of infill towards the top."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:263
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:267
 msgctxt "@label"
 msgid "Generate Support"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:296
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:300
 msgctxt "@label"
 msgid ""
 "Generate structures to support parts of the model which have overhangs. "
 "Without these structures, such parts would collapse during printing."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:313
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:317
 msgctxt "@label"
 msgid "Support Extruder"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:387
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:391
 msgctxt "@label"
 msgid ""
 "Select which extruder to use for support. This will build up supporting "
@@ -3561,19 +3488,19 @@ msgid ""
 "mid air."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:412
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:416
 msgctxt "@label"
 msgid "Build Plate Adhesion"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:458
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:462
 msgctxt "@label"
 msgid ""
 "Enable printing a brim or raft. This will add a flat area around or under "
 "your object which is easy to cut off afterwards."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:511
+#: /home/ruben/Projects/Cura/resources/qml/SidebarSimple.qml:515
 msgctxt "@label"
 msgid ""
 "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker "
@@ -3581,9 +3508,9 @@ msgid ""
 msgstr ""
 
 #: /home/ruben/Projects/Cura/resources/qml/ExtruderButton.qml:16
-msgctxt "@label"
+msgctxt "@label %1 is filled in with the name of an extruder"
 msgid "Print Selected Model with %1"
-msgid_plural "Print Selected Models With %1"
+msgid_plural "Print Selected Models with %1"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -3599,11 +3526,6 @@ msgid ""
 "import the models from it?"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/AskOpenAsProjectOrModelsDialog.qml:81
-msgctxt "@text:window"
-msgid "Remember my choice"
-msgstr ""
-
 #: /home/ruben/Projects/Cura/resources/qml/AskOpenAsProjectOrModelsDialog.qml:95
 msgctxt "@action:button"
 msgid "Open as project"
@@ -3619,23 +3541,23 @@ msgctxt "@title:window"
 msgid "Engine Log"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:185
 #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:193
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:201
 msgctxt "@label"
 msgid "Material"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:234
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:236
 msgctxt "@tooltip"
 msgid "Click to check the material compatibility on Ultimaker.com."
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:321
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:325
 msgctxt "@label"
 msgid "Profile:"
 msgstr ""
 
-#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:372
+#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:376
 msgctxt "@tooltip"
 msgid ""
 "Some setting/override values are different from the values stored in the "
@@ -3643,3 +3565,350 @@ msgid ""
 "\n"
 "Click to open the profile manager."
 msgstr ""
+
+#: MachineSettingsAction/plugin.json
+msgctxt "description"
+msgid ""
+"Provides a way to change machine settings (such as build volume, nozzle "
+"size, etc)"
+msgstr ""
+
+#: MachineSettingsAction/plugin.json
+msgctxt "name"
+msgid "Machine Settings action"
+msgstr ""
+
+#: XRayView/plugin.json
+msgctxt "description"
+msgid "Provides the X-Ray view."
+msgstr ""
+
+#: XRayView/plugin.json
+msgctxt "name"
+msgid "X-Ray View"
+msgstr ""
+
+#: X3DReader/plugin.json
+msgctxt "description"
+msgid "Provides support for reading X3D files."
+msgstr ""
+
+#: X3DReader/plugin.json
+msgctxt "name"
+msgid "X3D Reader"
+msgstr ""
+
+#: GCodeWriter/plugin.json
+msgctxt "description"
+msgid "Writes GCode to a file."
+msgstr ""
+
+#: GCodeWriter/plugin.json
+msgctxt "name"
+msgid "GCode Writer"
+msgstr ""
+
+#: cura-god-mode-plugin/src/GodMode/plugin.json
+msgctxt "description"
+msgid "Dump the contents of all settings to a HTML file."
+msgstr ""
+
+#: cura-god-mode-plugin/src/GodMode/plugin.json
+msgctxt "name"
+msgid "God Mode"
+msgstr ""
+
+#: ChangeLogPlugin/plugin.json
+msgctxt "description"
+msgid "Shows changes since latest checked version."
+msgstr ""
+
+#: ChangeLogPlugin/plugin.json
+msgctxt "name"
+msgid "Changelog"
+msgstr ""
+
+#: ProfileFlattener/plugin.json
+msgctxt "description"
+msgid "Create a flattend quality changes profile."
+msgstr ""
+
+#: ProfileFlattener/plugin.json
+msgctxt "name"
+msgid "Profile flatener"
+msgstr ""
+
+#: USBPrinting/plugin.json
+msgctxt "description"
+msgid ""
+"Accepts G-Code and sends them to a printer. Plugin can also update firmware."
+msgstr ""
+
+#: USBPrinting/plugin.json
+msgctxt "name"
+msgid "USB printing"
+msgstr ""
+
+#: X3GWriter/plugin.json
+msgctxt "description"
+msgid "Provides support for writing X3G files"
+msgstr ""
+
+#: X3GWriter/plugin.json
+msgctxt "name"
+msgid "X3G Writer"
+msgstr ""
+
+#: RemovableDriveOutputDevice/plugin.json
+msgctxt "description"
+msgid "Provides removable drive hotplugging and writing support."
+msgstr ""
+
+#: RemovableDriveOutputDevice/plugin.json
+msgctxt "name"
+msgid "Removable Drive Output Device Plugin"
+msgstr ""
+
+#: UM3NetworkPrinting/plugin.json
+msgctxt "description"
+msgid "Manages network connections to Ultimaker 3 printers"
+msgstr ""
+
+#: UM3NetworkPrinting/plugin.json
+msgctxt "name"
+msgid "UM3 Network Connection"
+msgstr ""
+
+#: CuraSolidWorksPlugin/plugin.json
+msgctxt "description"
+msgid ""
+"Gives you the possibility to open certain files via SolidWorks itself. These "
+"are then converted and loaded into Cura"
+msgstr ""
+
+#: CuraSolidWorksPlugin/plugin.json
+msgctxt "name"
+msgid "SolidWorks Integration"
+msgstr ""
+
+#: PostProcessingPlugin/plugin.json
+msgctxt "description"
+msgid "Extension that allows for user created scripts for post processing"
+msgstr ""
+
+#: PostProcessingPlugin/plugin.json
+msgctxt "name"
+msgid "Post Processing"
+msgstr ""
+
+#: AutoSave/plugin.json
+msgctxt "description"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr ""
+
+#: AutoSave/plugin.json
+msgctxt "name"
+msgid "Auto Save"
+msgstr ""
+
+#: SliceInfoPlugin/plugin.json
+msgctxt "description"
+msgid "Submits anonymous slice info. Can be disabled through preferences."
+msgstr ""
+
+#: SliceInfoPlugin/plugin.json
+msgctxt "name"
+msgid "Slice info"
+msgstr ""
+
+#: XmlMaterialProfile/plugin.json
+msgctxt "description"
+msgid "Provides capabilities to read and write XML-based material profiles."
+msgstr ""
+
+#: XmlMaterialProfile/plugin.json
+msgctxt "name"
+msgid "Material Profiles"
+msgstr ""
+
+#: LegacyProfileReader/plugin.json
+msgctxt "description"
+msgid "Provides support for importing profiles from legacy Cura versions."
+msgstr ""
+
+#: LegacyProfileReader/plugin.json
+msgctxt "name"
+msgid "Legacy Cura Profile Reader"
+msgstr ""
+
+#: GCodeProfileReader/plugin.json
+msgctxt "description"
+msgid "Provides support for importing profiles from g-code files."
+msgstr ""
+
+#: GCodeProfileReader/plugin.json
+msgctxt "name"
+msgid "GCode Profile Reader"
+msgstr ""
+
+#: LayerView/plugin.json
+msgctxt "description"
+msgid "Provides the Layer view."
+msgstr ""
+
+#: LayerView/plugin.json
+msgctxt "name"
+msgid "Layer View"
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade25to26/plugin.json
+msgctxt "description"
+msgid "Upgrades configurations from Cura 2.5 to Cura 2.6."
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade25to26/plugin.json
+msgctxt "name"
+msgid "Version Upgrade 2.5 to 2.6"
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade26to27/plugin.json
+msgctxt "description"
+msgid "Upgrades configurations from Cura 2.6 to Cura 2.7."
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade26to27/plugin.json
+msgctxt "name"
+msgid "Version Upgrade 2.6 to 2.7"
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade21to22/plugin.json
+msgctxt "description"
+msgid "Upgrades configurations from Cura 2.1 to Cura 2.2."
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade21to22/plugin.json
+msgctxt "name"
+msgid "Version Upgrade 2.1 to 2.2"
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade22to24/plugin.json
+msgctxt "description"
+msgid "Upgrades configurations from Cura 2.2 to Cura 2.4."
+msgstr ""
+
+#: VersionUpgrade/VersionUpgrade22to24/plugin.json
+msgctxt "name"
+msgid "Version Upgrade 2.2 to 2.4"
+msgstr ""
+
+#: ImageReader/plugin.json
+msgctxt "description"
+msgid "Enables ability to generate printable geometry from 2D image files."
+msgstr ""
+
+#: ImageReader/plugin.json
+msgctxt "name"
+msgid "Image Reader"
+msgstr ""
+
+#: CuraEngineBackend/plugin.json
+msgctxt "description"
+msgid "Provides the link to the CuraEngine slicing backend."
+msgstr ""
+
+#: CuraEngineBackend/plugin.json
+msgctxt "name"
+msgid "CuraEngine Backend"
+msgstr ""
+
+#: PerObjectSettingsTool/plugin.json
+msgctxt "description"
+msgid "Provides the Per Model Settings."
+msgstr ""
+
+#: PerObjectSettingsTool/plugin.json
+msgctxt "name"
+msgid "Per Model Settings Tool"
+msgstr ""
+
+#: 3MFReader/plugin.json
+msgctxt "description"
+msgid "Provides support for reading 3MF files."
+msgstr ""
+
+#: 3MFReader/plugin.json
+msgctxt "name"
+msgid "3MF Reader"
+msgstr ""
+
+#: PluginBrowser/plugin.json
+msgctxt "description"
+msgid "Find, manage and install new plugins."
+msgstr ""
+
+#: PluginBrowser/plugin.json
+msgctxt "name"
+msgid "Plugin Browser"
+msgstr ""
+
+#: SolidView/plugin.json
+msgctxt "description"
+msgid "Provides a normal solid mesh view."
+msgstr ""
+
+#: SolidView/plugin.json
+msgctxt "name"
+msgid "Solid View"
+msgstr ""
+
+#: GCodeReader/plugin.json
+msgctxt "description"
+msgid "Allows loading and displaying G-code files."
+msgstr ""
+
+#: GCodeReader/plugin.json
+msgctxt "name"
+msgid "G-code Reader"
+msgstr ""
+
+#: CuraProfileWriter/plugin.json
+msgctxt "description"
+msgid "Provides support for exporting Cura profiles."
+msgstr ""
+
+#: CuraProfileWriter/plugin.json
+msgctxt "name"
+msgid "Cura Profile Writer"
+msgstr ""
+
+#: 3MFWriter/plugin.json
+msgctxt "description"
+msgid "Provides support for writing 3MF files."
+msgstr ""
+
+#: 3MFWriter/plugin.json
+msgctxt "name"
+msgid "3MF Writer"
+msgstr ""
+
+#: UltimakerMachineActions/plugin.json
+msgctxt "description"
+msgid ""
+"Provides machine actions for Ultimaker machines (such as bed leveling "
+"wizard, selecting upgrades, etc)"
+msgstr ""
+
+#: UltimakerMachineActions/plugin.json
+msgctxt "name"
+msgid "Ultimaker machine actions"
+msgstr ""
+
+#: CuraProfileReader/plugin.json
+msgctxt "description"
+msgid "Provides support for importing Cura profiles."
+msgstr ""
+
+#: CuraProfileReader/plugin.json
+msgctxt "name"
+msgid "Cura Profile Reader"
+msgstr ""
diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot
index eb290d301c..8a8b4b089a 100644
--- a/resources/i18n/fdmextruder.def.json.pot
+++ b/resources/i18n/fdmextruder.def.json.pot
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -38,6 +38,16 @@ msgctxt "extruder_nr description"
 msgid "The extruder train used for printing. This is used in multi-extrusion."
 msgstr ""
 
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_id description"
+msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"."
+msgstr ""
+
 #: fdmextruder.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot
index f8c6dfb1c7..4b4c3ada46 100644
--- a/resources/i18n/fdmprinter.def.json.pot
+++ b/resources/i18n/fdmprinter.def.json.pot
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Cura 2.6\n"
+"Project-Id-Version: Cura 2.7\n"
 "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
-"POT-Creation-Date: 2017-05-30 15:32+0000\n"
+"POT-Creation-Date: 2017-08-02 16:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
@@ -40,7 +40,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_show_variants label"
-msgid "Show machine variants"
+msgid "Show Machine Variants"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -86,7 +86,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_wait label"
-msgid "Wait for build plate heatup"
+msgid "Wait for Build Plate Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -98,7 +98,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_wait label"
-msgid "Wait for nozzle heatup"
+msgid "Wait for Nozzle Heatup"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -108,7 +108,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_print_temp_prepend label"
-msgid "Include material temperatures"
+msgid "Include Material Temperatures"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -121,7 +121,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "material_bed_temp_prepend label"
-msgid "Include build plate temperature"
+msgid "Include Build Plate Temperature"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -134,7 +134,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_width label"
-msgid "Machine width"
+msgid "Machine Width"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -144,7 +144,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_depth label"
-msgid "Machine depth"
+msgid "Machine Depth"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -154,7 +154,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_shape label"
-msgid "Build plate shape"
+msgid "Build Plate Shape"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -175,7 +175,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_height label"
-msgid "Machine height"
+msgid "Machine Height"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -185,7 +185,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_heated_bed label"
-msgid "Has heated build plate"
+msgid "Has Heated Build Plate"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -195,7 +195,7 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_center_is_zero label"
-msgid "Is center origin"
+msgid "Is Center Origin"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -336,12 +336,17 @@ msgstr ""
 
 #: fdmprinter.def.json
 msgctxt "machine_gcode_flavor option RepRap (Marlin/Sprinter)"
-msgid "RepRap (Marlin/Sprinter)"
+msgid "Marlin"
 msgstr ""
 
 #: fdmprinter.def.json
-msgctxt "machine_gcode_flavor option RepRap (Volumatric)"
-msgid "RepRap (Volumetric)"
+msgctxt "machine_gcode_flavor option RepRap (Volumetric)"
+msgid "Marlin (Volumetric)"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_gcode_flavor option RepRap (RepRap)"
+msgid "RepRap"
 msgstr ""
 
 #: fdmprinter.def.json
@@ -426,6 +431,16 @@ msgid ""
 "and Y axes)."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id label"
+msgid "Nozzle ID"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "machine_nozzle_id description"
+msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "machine_nozzle_size label"
 msgid "Nozzle Diameter"
@@ -684,6 +699,16 @@ msgid ""
 "Width of a single wall line for all wall lines except the outermost one."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "roofing_line_width label"
+msgid "Top Surface Skin Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_line_width description"
+msgid "Width of a single line of the areas at the top of the print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_line_width label"
 msgid "Top/Bottom Line Width"
@@ -764,6 +789,18 @@ msgctxt "prime_tower_line_width description"
 msgid "Width of a single prime tower line."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor label"
+msgid "Initial Layer Line Width"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "initial_layer_line_width_factor description"
+msgid ""
+"Multiplier of the line width on the first layer. Increasing this could "
+"improve bed adhesion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "shell label"
 msgid "Shell"
@@ -774,6 +811,42 @@ msgctxt "shell description"
 msgid "Shell"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr label"
+msgid "Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_extruder_nr description"
+msgid ""
+"The extruder train used for printing the walls. This is used in multi-"
+"extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr label"
+msgid "Outer Wall Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_0_extruder_nr description"
+msgid ""
+"The extruder train used for printing the outer wall. This is used in multi-"
+"extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr label"
+msgid "Inner Walls Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "wall_x_extruder_nr description"
+msgid ""
+"The extruder train used for printing the inner walls. This is used in multi-"
+"extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "wall_thickness label"
 msgid "Wall Thickness"
@@ -782,8 +855,8 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "wall_thickness description"
 msgid ""
-"The thickness of the outside walls in the horizontal direction. This value "
-"divided by the wall line width defines the number of walls."
+"The thickness of the walls in the horizontal direction. This value divided "
+"by the wall line width defines the number of walls."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -810,6 +883,83 @@ msgid ""
 "better."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr label"
+msgid "Top Surface Skin Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_extruder_nr description"
+msgid ""
+"The extruder train used for printing the top most skin. This is used in "
+"multi-extrusion."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count label"
+msgid "Top Surface Skin Layers"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_layer_count description"
+msgid ""
+"The number of top most skin layers. Usually only one top most layer is "
+"sufficient to generate higher quality top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern label"
+msgid "Top Surface Skin Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern description"
+msgid "The pattern of the top most layers."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option lines"
+msgid "Lines"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles label"
+msgid "Top Surface Skin Line Directions"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "roofing_angles description"
+msgid ""
+"A list of integer line directions to use when the top surface skin layers "
+"use the lines or zig zag pattern. Elements from the list are used "
+"sequentially as the layers progress and when the end of the list is reached, "
+"it starts at the beginning again. The list items are separated by commas and "
+"the whole list is contained in square brackets. Default is an empty list "
+"which means use the traditional default angles (45 and 135 degrees)."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr label"
+msgid "Top/Bottom Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "top_bottom_extruder_nr description"
+msgid ""
+"The extruder train used for printing the top and bottom skin. This is used "
+"in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "top_bottom_thickness label"
 msgid "Top/Bottom Thickness"
@@ -1032,6 +1182,18 @@ msgctxt "fill_perimeter_gaps option everywhere"
 msgid "Everywhere"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps label"
+msgid "Print Thin Walls"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "fill_outline_gaps description"
+msgid ""
+"Print pieces of the model which are horizontally thinner than the nozzle "
+"size."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "xy_offset label"
 msgid "Horizontal Expansion"
@@ -1045,6 +1207,19 @@ msgid ""
 "holes."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 label"
+msgid "Initial Layer Horizontal Expansion"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "xy_offset_layer_0 description"
+msgid ""
+"Amount of offset applied to all polygons in the first layer. A negative "
+"value can compensate for squishing of the first layer known as \"elephant's "
+"foot\"."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "z_seam_type label"
 msgid "Z Seam Alignment"
@@ -1099,6 +1274,19 @@ msgid ""
 "layer."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "z_seam_relative label"
+msgid "Z Seam Relative"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "z_seam_relative description"
+msgid ""
+"When enabled, the z seam coordinates are relative to each part's centre. "
+"When disabled, the coordinates define an absolute position on the build "
+"plate."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "skin_no_small_gaps_heuristic label"
 msgid "Ignore Small Z Gaps"
@@ -1122,6 +1310,17 @@ msgctxt "infill description"
 msgid "Infill"
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr label"
+msgid "Infill Extruder"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "infill_extruder_nr description"
+msgid ""
+"The extruder train used for printing infill. This is used in multi-extrusion."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "infill_sparse_density label"
 msgid "Infill Density"
@@ -1220,68 +1419,6 @@ msgid ""
 "lines and zig zag patterns and 45 degrees for all other patterns)."
 msgstr ""
 
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled label"
-msgid "Spaghetti Infill"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_infill_enabled description"
-msgid ""
-"Print the infill every so often, so that the filament will curl up "
-"chaotically inside the object. This reduces print time, but the behaviour is "
-"rather unpredictable."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle label"
-msgid "Spaghetti Maximum Infill Angle"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_infill_angle description"
-msgid ""
-"The maximum angle w.r.t. the Z axis of the inside of the print for areas "
-"which are to be filled with spaghetti infill afterwards. Lowering this value "
-"causes more angled parts in your model to be filled on each layer."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height label"
-msgid "Spaghetti Infill Maximum Height"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_max_height description"
-msgid ""
-"The maximum height of inside space which can be combined and filled from the "
-"top."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset label"
-msgid "Spaghetti Inset"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_inset description"
-msgid ""
-"The offset from the walls from where the spaghetti infill will be printed."
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow label"
-msgid "Spaghetti Flow"
-msgstr ""
-
-#: fdmprinter.def.json
-msgctxt "spaghetti_flow description"
-msgid ""
-"Adjusts the density of the spaghetti infill. Note that the Infill Density "
-"only controls the line spacing of the filling pattern, not the amount of "
-"extrusion for spaghetti infill."
-msgstr ""
-
 #: fdmprinter.def.json
 msgctxt "sub_div_rad_add label"
 msgid "Cubic Subdivision Shell"
@@ -1328,8 +1465,10 @@ msgstr ""
 #: fdmprinter.def.json
 msgctxt "skin_overlap description"
 msgid ""
-"The amount of overlap between the skin and the walls. A slight overlap "
-"allows the walls to connect firmly to the skin."
+"The amount of overlap between the skin and the walls as a percentage of the "
+"line width. A slight overlap allows the walls to connect firmly to the skin. "
+"This is a percentage of the average line widths of the skin lines and the "
+"innermost wall."
 msgstr ""
 
 #: fdmprinter.def.json
@@ -1890,6 +2029,16 @@ msgid ""
 "this in between the outer wall speed and the infill speed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "speed_roofing label"
+msgid "Top Surface Skin Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_roofing description"
+msgid "The speed at which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_topbottom label"
 msgid "Top/Bottom Speed"
@@ -1900,6 +2049,16 @@ msgctxt "speed_topbottom description"
 msgid "The speed at which top/bottom layers are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "speed_ironing label"
+msgid "Ironing Speed"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "speed_ironing description"
+msgid "The speed at which to pass over the top surface."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "speed_support label"
 msgid "Support Speed"
@@ -2147,6 +2306,16 @@ msgctxt "acceleration_wall_x description"
 msgid "The acceleration with which all inner walls are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing label"
+msgid "Top Surface Skin Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_roofing description"
+msgid "The acceleration with which top surface skin layers are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_topbottom label"
 msgid "Top/Bottom Acceleration"
@@ -2157,6 +2326,16 @@ msgctxt "acceleration_topbottom description"
 msgid "The acceleration with which top/bottom layers are printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing label"
+msgid "Ironing Acceleration"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "acceleration_ironing description"
+msgid "The acceleration with which ironing is performed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "acceleration_support label"
 msgid "Support Acceleration"
@@ -2344,6 +2523,18 @@ msgid ""
 "printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "jerk_roofing label"
+msgid "Top Surface Skin Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_roofing description"
+msgid ""
+"The maximum instantaneous velocity change with which top surface skin layers "
+"are printed."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_topbottom label"
 msgid "Top/Bottom Jerk"
@@ -2356,6 +2547,16 @@ msgid ""
 "printed."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "jerk_ironing label"
+msgid "Ironing Jerk"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "jerk_ironing description"
+msgid "The maximum instantaneous velocity change while performing ironing."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "jerk_support label"
 msgid "Support Jerk"
@@ -2978,6 +3179,29 @@ msgid ""
 "structure."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags label"
+msgid "Skip Some ZigZags Connections"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_skip_some_zags description"
+msgid ""
+"Skip some ZigZags connections to make the support structure easier to break."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count label"
+msgid "ZigZag Connection Skip Count"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_zag_skip_count description"
+msgid ""
+"Skip one in every N connection lines to make the support structure easier to "
+"break."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_infill_rate label"
 msgid "Support Density"
@@ -3132,6 +3356,43 @@ msgid ""
 "values can smooth out the support areas and result in more sturdy support."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness label"
+msgid "Support Infill Layer Thickness"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "support_infill_sparse_thickness description"
+msgid ""
+"The thickness per layer of support infill material. This value should always "
+"be a multiple of the layer height and is otherwise rounded."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps label"
+msgid "Gradual Support Infill Steps"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_steps description"
+msgid ""
+"Number of times to reduce the support infill density by half when getting "
+"further below top surfaces. Areas which are closer to top surfaces get a "
+"higher density, up to the Support Infill Density."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height label"
+msgid "Gradual Support Infill Step Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "gradual_support_infill_step_height description"
+msgid ""
+"The height of support infill of a given density before switching to half the "
+"density."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_interface_enable label"
 msgid "Enable Support Interface"
@@ -4060,6 +4321,19 @@ msgid ""
 "the oozed material causes least harm to the surface quality of your print."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume label"
+msgid "Prime Tower Purge Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "prime_tower_purge_volume description"
+msgid ""
+"Amount of filament to be purged when wiping on the prime tower. Purging is "
+"useful for compensating the filament lost by oozing during inactivity of the "
+"nozzle."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "ooze_shield_enabled label"
 msgid "Enable Ooze Shield"
@@ -4581,6 +4855,92 @@ msgid ""
 "directions."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled label"
+msgid "Spaghetti Infill"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_enabled description"
+msgid ""
+"Print the infill every so often, so that the filament will curl up "
+"chaotically inside the object. This reduces print time, but the behaviour is "
+"rather unpredictable."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped label"
+msgid "Spaghetti Infill Stepping"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_stepped description"
+msgid ""
+"Whether to print spaghetti infill in steps or extrude all the infill "
+"filament at the end of the print."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle label"
+msgid "Spaghetti Maximum Infill Angle"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_infill_angle description"
+msgid ""
+"The maximum angle w.r.t. the Z axis of the inside of the print for areas "
+"which are to be filled with spaghetti infill afterwards. Lowering this value "
+"causes more angled parts in your model to be filled on each layer."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height label"
+msgid "Spaghetti Infill Maximum Height"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_max_height description"
+msgid ""
+"The maximum height of inside space which can be combined and filled from the "
+"top."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset label"
+msgid "Spaghetti Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_inset description"
+msgid ""
+"The offset from the walls from where the spaghetti infill will be printed."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow label"
+msgid "Spaghetti Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_flow description"
+msgid ""
+"Adjusts the density of the spaghetti infill. Note that the Infill Density "
+"only controls the line spacing of the filling pattern, not the amount of "
+"extrusion for spaghetti infill."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume label"
+msgid "Spaghetti Infill Extra Volume"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "spaghetti_infill_extra_volume description"
+msgid ""
+"A correction term to adjust the total volume being extruded each time when "
+"filling spaghetti."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "support_conical_enabled label"
 msgid "Enable Conical Support"
@@ -4994,6 +5354,75 @@ msgid ""
 "applies to Wire Printing."
 msgstr ""
 
+#: fdmprinter.def.json
+msgctxt "ironing_enabled label"
+msgid "Enable Ironing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_enabled description"
+msgid ""
+"Go over the top surface one additional time, but without extruding material. "
+"This is meant to melt the plastic on top further, creating a smoother "
+"surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern label"
+msgid "Ironing Pattern"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern description"
+msgid "The pattern to use for ironing top surfaces."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option concentric"
+msgid "Concentric"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_pattern option zigzag"
+msgid "Zig Zag"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing label"
+msgid "Ironing Line Spacing"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_line_spacing description"
+msgid "The distance between the lines of ironing."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow label"
+msgid "Ironing Flow"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_flow description"
+msgid ""
+"The amount of material, relative to a normal skin line, to extrude during "
+"ironing. Keeping the nozzle filled helps filling some of the crevices of the "
+"top surface, but too much results in overextrusion and blips on the side of "
+"the surface."
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset label"
+msgid "Ironing Inset"
+msgstr ""
+
+#: fdmprinter.def.json
+msgctxt "ironing_inset description"
+msgid ""
+"A distance to keep from the edges of the model. Ironing all the way to the "
+"edge of the mesh may result in a jagged edge on your print."
+msgstr ""
+
 #: fdmprinter.def.json
 msgctxt "command_line_settings label"
 msgid "Command Line Settings"