diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py
index 4e9ba09cc5..88c696c2c9 100644
--- a/plugins/USBPrinting/USBPrinterManager.py
+++ b/plugins/USBPrinting/USBPrinterManager.py
@@ -98,7 +98,7 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
     @pyqtSlot()
     def updateAllFirmware(self):
         if not self._printer_connections:
-            Message("Cannot update firmware, there were no connected printers found.").show()
+            Message(i18n_catalog.i18nc("@info","Cannot update firmware, there were no connected printers found.")).show()
             return
 
         self.spawnFirmwareInterface("")
diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index be50f44ece..938eaded7a 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -1,4 +1,4 @@
-# Cura 2.1 Translation File
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:43+0100\n"
+"POT-Creation-Date: 2016-01-18 11:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -225,6 +225,11 @@ msgctxt "@item:inmenu"
 msgid "Update Firmware"
 msgstr ""
 
+#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101
+msgctxt "@info"
+msgid "Cannot update firmware, there were no connected printers found."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -362,6 +367,16 @@ msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr ""
 
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12
+msgctxt "@label"
+msgid "Auto Save"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15
+msgctxt "@info:whatsthis"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12
 msgctxt "@label"
 msgid "Per Object Settings Tool"
@@ -445,8 +460,9 @@ msgid "Print"
 msgstr ""
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr ""
@@ -456,27 +472,76 @@ msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
-msgctxt "@action:label"
-msgid "Size (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38
+msgctxt "@info:tooltip"
+msgid "The maximum distance of each pixel from \"Base.\""
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44
 msgctxt "@action:label"
-msgid "Base Height (mm)"
+msgid "Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
-msgctxt "@action:label"
-msgid "Peak Height (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62
+msgctxt "@info:tooltip"
+msgid "The base height from the build plate in millimeters."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+msgctxt "@action:label"
+msgid "Base (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86
+msgctxt "@info:tooltip"
+msgid "The width in millimeters on the build plate."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92
+msgctxt "@action:label"
+msgid "Width (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111
+msgctxt "@info:tooltip"
+msgid "The depth in millimeters on the build plate"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117
+msgctxt "@action:label"
+msgid "Depth (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135
+msgctxt "@info:tooltip"
+msgid ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Lighter is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Darker is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159
+msgctxt "@info:tooltip"
+msgid "The amount of smoothing to apply to the image."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:93
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193
 msgctxt "@action:button"
 msgid "OK"
 msgstr ""
@@ -508,17 +573,17 @@ msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198
 msgctxt "@label"
 msgid "00h 00min"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "0.0 m"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "%1 m"
 msgstr ""
@@ -564,6 +629,34 @@ msgctxt "@title"
 msgid "Add Printer"
 msgstr ""
 
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15
+msgctxt "@title:window"
+msgid "Load profile"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24
+msgctxt "@label"
+msgid ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38
+msgctxt "@label"
+msgid "Show details."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50
+msgctxt "@action:button"
+msgid "Merge settings"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54
+msgctxt "@action:button"
+msgid "Reset profile"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28
 msgctxt "@label"
 msgid "Profile:"
@@ -769,7 +862,7 @@ msgid ""
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:483
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr ""
@@ -1151,77 +1244,77 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62
 msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100
 msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145
 msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:357
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366
 msgctxt "@action:button"
 msgid "Open File"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:401
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:486
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495
 msgctxt "@title:tab"
 msgid "View"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:635
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644
 msgctxt "@title:window"
 msgid "Open file"
 msgstr ""
diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po
index 9263b0e96c..2106ba4003 100755
--- a/resources/i18n/de/cura.po
+++ b/resources/i18n/de/cura.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:43+0100\n"
+"POT-Creation-Date: 2016-01-18 11:54+0100\n"
 "PO-Revision-Date: 2015-09-30 11:41+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -246,6 +246,11 @@ msgctxt "@item:inmenu"
 msgid "Update Firmware"
 msgstr "Firmware aktualisieren"
 
+#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101
+msgctxt "@info"
+msgid "Cannot update firmware, there were no connected printers found."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -402,6 +407,16 @@ msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr "Schichten"
 
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12
+msgctxt "@label"
+msgid "Auto Save"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15
+msgctxt "@info:whatsthis"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12
 msgctxt "@label"
 msgid "Per Object Settings Tool"
@@ -496,8 +511,9 @@ msgid "Print"
 msgstr "Drucken"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58
 #, fuzzy
 msgctxt "@action:button"
 msgid "Cancel"
@@ -508,27 +524,76 @@ msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
-msgctxt "@action:label"
-msgid "Size (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38
+msgctxt "@info:tooltip"
+msgid "The maximum distance of each pixel from \"Base.\""
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44
 msgctxt "@action:label"
-msgid "Base Height (mm)"
+msgid "Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
-msgctxt "@action:label"
-msgid "Peak Height (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62
+msgctxt "@info:tooltip"
+msgid "The base height from the build plate in millimeters."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+msgctxt "@action:label"
+msgid "Base (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86
+msgctxt "@info:tooltip"
+msgid "The width in millimeters on the build plate."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92
+msgctxt "@action:label"
+msgid "Width (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111
+msgctxt "@info:tooltip"
+msgid "The depth in millimeters on the build plate"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117
+msgctxt "@action:label"
+msgid "Depth (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135
+msgctxt "@info:tooltip"
+msgid ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Lighter is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Darker is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159
+msgctxt "@info:tooltip"
+msgid "The amount of smoothing to apply to the image."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:93
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193
 msgctxt "@action:button"
 msgid "OK"
 msgstr ""
@@ -561,17 +626,17 @@ msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198
 msgctxt "@label"
 msgid "00h 00min"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "0.0 m"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 #, fuzzy
 msgctxt "@label"
 msgid "%1 m"
@@ -625,6 +690,36 @@ msgctxt "@title"
 msgid "Add Printer"
 msgstr "Drucker hinzufügen"
 
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15
+#, fuzzy
+msgctxt "@title:window"
+msgid "Load profile"
+msgstr "&Profil"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24
+msgctxt "@label"
+msgid ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38
+msgctxt "@label"
+msgid "Show details."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50
+#, fuzzy
+msgctxt "@action:button"
+msgid "Merge settings"
+msgstr "Objekt &zusammenführen"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54
+msgctxt "@action:button"
+msgid "Reset profile"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28
 #, fuzzy
 msgctxt "@label"
@@ -862,7 +957,7 @@ msgid ""
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:483
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr "Allgemein"
@@ -1303,91 +1398,91 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr "Cura"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&Datei"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "&Zuletzt geöffnet"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92
 #, fuzzy
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "Auswahl als Datei &speichern"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "&Alles speichern"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&Ansicht"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "Drucken"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "&Profil"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "Er&weiterungen"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Einstellungen"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:357
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366
 #, fuzzy
 msgctxt "@action:button"
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:401
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410
 #, fuzzy
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr "Ansichtsmodus"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:486
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495
 #, fuzzy
 msgctxt "@title:tab"
 msgid "View"
 msgstr "Ansicht"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:635
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644
 #, fuzzy
 msgctxt "@title:window"
 msgid "Open file"
diff --git a/resources/i18n/de/fdmprinter.json.po b/resources/i18n/de/fdmprinter.json.po
index 82bee0ef03..68f0f55ed6 100755
--- a/resources/i18n/de/fdmprinter.json.po
+++ b/resources/i18n/de/fdmprinter.json.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1 json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-13 13:43+0000\n"
+"POT-Creation-Date: 2016-01-18 11:54+0000\n"
 "PO-Revision-Date: 2015-09-30 11:41+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -786,7 +786,9 @@ msgstr "Temperatur des Druckbetts"
 
 #: fdmprinter.json
 msgctxt "material_flow_temp_graph description"
-msgid "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
+msgid ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
 msgstr ""
 
 #: fdmprinter.json
diff --git a/resources/i18n/en/cura.po b/resources/i18n/en/cura.po
index 09af1ff966..e71391b6fd 100644
--- a/resources/i18n/en/cura.po
+++ b/resources/i18n/en/cura.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:43+0100\n"
-"PO-Revision-Date: 2016-01-13 13:43+0100\n"
+"POT-Creation-Date: 2016-01-18 11:54+0100\n"
+"PO-Revision-Date: 2016-01-18 11:54+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -228,6 +228,11 @@ msgctxt "@item:inmenu"
 msgid "Update Firmware"
 msgstr "Update Firmware"
 
+#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101
+msgctxt "@info"
+msgid "Cannot update firmware, there were no connected printers found."
+msgstr "Cannot update firmware, there were no connected printers found."
+
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -367,6 +372,16 @@ msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr "Layers"
 
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12
+msgctxt "@label"
+msgid "Auto Save"
+msgstr "Auto Save"
+
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15
+msgctxt "@info:whatsthis"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr "Automatically saves Preferences, Machines and Profiles after changes."
+
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12
 msgctxt "@label"
 msgid "Per Object Settings Tool"
@@ -450,8 +465,9 @@ msgid "Print"
 msgstr "Print"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr "Cancel"
@@ -461,27 +477,80 @@ msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr "Convert Image..."
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
-msgctxt "@action:label"
-msgid "Size (mm)"
-msgstr "Size (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38
+msgctxt "@info:tooltip"
+msgid "The maximum distance of each pixel from \"Base.\""
+msgstr "The maximum distance of each pixel from \"Base.\""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44
 msgctxt "@action:label"
-msgid "Base Height (mm)"
-msgstr "Base Height (mm)"
+msgid "Height (mm)"
+msgstr "Height (mm)"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62
+msgctxt "@info:tooltip"
+msgid "The base height from the build plate in millimeters."
+msgstr "The base height from the build plate in millimeters."
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
 msgctxt "@action:label"
-msgid "Peak Height (mm)"
-msgstr "Peak Height (mm)"
+msgid "Base (mm)"
+msgstr "Base (mm)"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86
+msgctxt "@info:tooltip"
+msgid "The width in millimeters on the build plate."
+msgstr "The width in millimeters on the build plate."
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92
+msgctxt "@action:label"
+msgid "Width (mm)"
+msgstr "Width (mm)"
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111
+msgctxt "@info:tooltip"
+msgid "The depth in millimeters on the build plate"
+msgstr "The depth in millimeters on the build plate"
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117
+msgctxt "@action:label"
+msgid "Depth (mm)"
+msgstr "Depth (mm)"
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135
+msgctxt "@info:tooltip"
+msgid ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+msgstr ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Lighter is higher"
+msgstr "Lighter is higher"
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Darker is higher"
+msgstr "Darker is higher"
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159
+msgctxt "@info:tooltip"
+msgid "The amount of smoothing to apply to the image."
+msgstr "The amount of smoothing to apply to the image."
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr "Smoothing"
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:93
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193
 msgctxt "@action:button"
 msgid "OK"
 msgstr "OK"
@@ -515,17 +584,17 @@ msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr "Filter..."
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198
 msgctxt "@label"
 msgid "00h 00min"
 msgstr "00h 00min"
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "0.0 m"
 msgstr "0.0 m"
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "%1 m"
 msgstr "%1 m"
@@ -571,6 +640,37 @@ msgctxt "@title"
 msgid "Add Printer"
 msgstr "Add Printer"
 
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15
+msgctxt "@title:window"
+msgid "Load profile"
+msgstr "Load profile"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24
+msgctxt "@label"
+msgid ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+msgstr ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38
+msgctxt "@label"
+msgid "Show details."
+msgstr "Show details."
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50
+msgctxt "@action:button"
+msgid "Merge settings"
+msgstr "Merge settings"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54
+msgctxt "@action:button"
+msgid "Reset profile"
+msgstr "Reset profile"
+
 #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28
 msgctxt "@label"
 msgid "Profile:"
@@ -781,7 +881,7 @@ msgstr ""
 "below the model to prevent the model from sagging or printing in mid air."
 
 #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:483
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr "General"
@@ -1197,77 +1297,77 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr "Cura"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&File"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62
 msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Open &Recent"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "&Save Selection to File"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100
 msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Save &All"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Edit"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145
 msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&View"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "&Printer"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "P&rofile"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "E&xtensions"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Settings"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Help"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:357
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366
 msgctxt "@action:button"
 msgid "Open File"
 msgstr "Open File"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:401
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr "View Mode"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:486
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495
 msgctxt "@title:tab"
 msgid "View"
 msgstr "View"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:635
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644
 msgctxt "@title:window"
 msgid "Open file"
 msgstr "Open file"
diff --git a/resources/i18n/en/fdmprinter.json.po b/resources/i18n/en/fdmprinter.json.po
index 3e620c84f7..e488835a5c 100644
--- a/resources/i18n/en/fdmprinter.json.po
+++ b/resources/i18n/en/fdmprinter.json.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-13 13:43+0000\n"
-"PO-Revision-Date: 2016-01-13 13:43+0000\n"
+"POT-Creation-Date: 2016-01-18 11:54+0000\n"
+"PO-Revision-Date: 2016-01-18 11:54+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -726,8 +726,12 @@ msgstr "Flow Temperature Graph"
 
 #: fdmprinter.json
 msgctxt "material_flow_temp_graph description"
-msgid "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
-msgstr "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
+msgid ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
+msgstr ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
 
 #: fdmprinter.json
 msgctxt "material_standby_temperature label"
diff --git a/resources/i18n/fdmprinter.json.pot b/resources/i18n/fdmprinter.json.pot
index a3e07b8ca2..cd3af3004b 100644
--- a/resources/i18n/fdmprinter.json.pot
+++ b/resources/i18n/fdmprinter.json.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-13 13:43+0000\n"
+"POT-Creation-Date: 2016-01-18 11:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -624,7 +624,9 @@ msgstr ""
 
 #: fdmprinter.json
 msgctxt "material_flow_temp_graph description"
-msgid "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
+msgid ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
 msgstr ""
 
 #: fdmprinter.json
diff --git a/resources/i18n/fi/cura.po b/resources/i18n/fi/cura.po
index a01ed9083a..889f0ddecc 100755
--- a/resources/i18n/fi/cura.po
+++ b/resources/i18n/fi/cura.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:43+0100\n"
+"POT-Creation-Date: 2016-01-18 11:54+0100\n"
 "PO-Revision-Date: 2015-09-28 14:08+0300\n"
 "Last-Translator: Tapio <info@tapimex.fi>\n"
 "Language-Team: \n"
@@ -241,6 +241,11 @@ msgctxt "@item:inmenu"
 msgid "Update Firmware"
 msgstr "Päivitä laiteohjelmisto"
 
+#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101
+msgctxt "@info"
+msgid "Cannot update firmware, there were no connected printers found."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -393,6 +398,16 @@ msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr "Kerrokset"
 
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12
+msgctxt "@label"
+msgid "Auto Save"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15
+msgctxt "@info:whatsthis"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12
 msgctxt "@label"
 msgid "Per Object Settings Tool"
@@ -486,8 +501,9 @@ msgid "Print"
 msgstr "Tulosta"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58
 #, fuzzy
 msgctxt "@action:button"
 msgid "Cancel"
@@ -498,27 +514,76 @@ msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
-msgctxt "@action:label"
-msgid "Size (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38
+msgctxt "@info:tooltip"
+msgid "The maximum distance of each pixel from \"Base.\""
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44
 msgctxt "@action:label"
-msgid "Base Height (mm)"
+msgid "Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
-msgctxt "@action:label"
-msgid "Peak Height (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62
+msgctxt "@info:tooltip"
+msgid "The base height from the build plate in millimeters."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+msgctxt "@action:label"
+msgid "Base (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86
+msgctxt "@info:tooltip"
+msgid "The width in millimeters on the build plate."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92
+msgctxt "@action:label"
+msgid "Width (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111
+msgctxt "@info:tooltip"
+msgid "The depth in millimeters on the build plate"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117
+msgctxt "@action:label"
+msgid "Depth (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135
+msgctxt "@info:tooltip"
+msgid ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Lighter is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Darker is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159
+msgctxt "@info:tooltip"
+msgid "The amount of smoothing to apply to the image."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:93
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193
 msgctxt "@action:button"
 msgid "OK"
 msgstr ""
@@ -551,17 +616,17 @@ msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198
 msgctxt "@label"
 msgid "00h 00min"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "0.0 m"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 #, fuzzy
 msgctxt "@label"
 msgid "%1 m"
@@ -613,6 +678,36 @@ msgctxt "@title"
 msgid "Add Printer"
 msgstr "Lisää tulostin"
 
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15
+#, fuzzy
+msgctxt "@title:window"
+msgid "Load profile"
+msgstr "&Profiili"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24
+msgctxt "@label"
+msgid ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38
+msgctxt "@label"
+msgid "Show details."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50
+#, fuzzy
+msgctxt "@action:button"
+msgid "Merge settings"
+msgstr "&Yhdistä kappaleet"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54
+msgctxt "@action:button"
+msgid "Reset profile"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28
 #, fuzzy
 msgctxt "@label"
@@ -842,7 +937,7 @@ msgid ""
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:483
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr "Yleiset"
@@ -1270,91 +1365,91 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr "Cura"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&Tiedosto"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Avaa &viimeisin"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92
 #, fuzzy
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "&Tallenna valinta tiedostoon"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Tallenna &kaikki"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Muokkaa"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&Näytä"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "Tulosta"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "&Profiili"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "Laa&jennukset"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Asetukset"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Ohje"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:357
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366
 #, fuzzy
 msgctxt "@action:button"
 msgid "Open File"
 msgstr "Avaa tiedosto"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:401
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410
 #, fuzzy
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr "Näyttötapa"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:486
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495
 #, fuzzy
 msgctxt "@title:tab"
 msgid "View"
 msgstr "Näytä"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:635
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644
 #, fuzzy
 msgctxt "@title:window"
 msgid "Open file"
diff --git a/resources/i18n/fi/fdmprinter.json.po b/resources/i18n/fi/fdmprinter.json.po
index 7e0c159209..3232fda2a4 100755
--- a/resources/i18n/fi/fdmprinter.json.po
+++ b/resources/i18n/fi/fdmprinter.json.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1 json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-13 13:43+0000\n"
+"POT-Creation-Date: 2016-01-18 11:54+0000\n"
 "PO-Revision-Date: 2015-09-30 11:37+0300\n"
 "Last-Translator: Tapio <info@tapimex.fi>\n"
 "Language-Team: \n"
@@ -749,7 +749,9 @@ msgstr "Pöydän lämpötila"
 
 #: fdmprinter.json
 msgctxt "material_flow_temp_graph description"
-msgid "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
+msgid ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
 msgstr ""
 
 #: fdmprinter.json
diff --git a/resources/i18n/fr/cura.po b/resources/i18n/fr/cura.po
index 18601d8871..fccf15327b 100644
--- a/resources/i18n/fr/cura.po
+++ b/resources/i18n/fr/cura.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:43+0100\n"
+"POT-Creation-Date: 2016-01-18 11:54+0100\n"
 "PO-Revision-Date: 2015-09-22 16:13+0200\n"
 "Last-Translator: Mathieu Gaborit | Makershop <mathieu@makershop.fr>\n"
 "Language-Team: \n"
@@ -237,6 +237,11 @@ msgctxt "@item:inmenu"
 msgid "Update Firmware"
 msgstr "Mise à jour du Firmware"
 
+#: /home/tamara/2.1/Cura/plugins/USBPrinting/USBPrinterManager.py:101
+msgctxt "@info"
+msgid "Cannot update firmware, there were no connected printers found."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:35
 msgctxt "@item:inmenu"
 msgid "USB printing"
@@ -389,6 +394,16 @@ msgctxt "@item:inlistbox"
 msgid "Layers"
 msgstr "Couches"
 
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:12
+msgctxt "@label"
+msgid "Auto Save"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/AutoSave/__init__.py:15
+msgctxt "@info:whatsthis"
+msgid "Automatically saves Preferences, Machines and Profiles after changes."
+msgstr ""
+
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/__init__.py:12
 msgctxt "@label"
 msgid "Per Object Settings Tool"
@@ -475,8 +490,9 @@ msgid "Print"
 msgstr "Imprimer"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/ControlWindow.qml:67
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:100
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:200
 #: /home/tamara/2.1/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:303
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:58
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr "Annuler"
@@ -486,27 +502,76 @@ msgctxt "@title:window"
 msgid "Convert Image..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:36
-msgctxt "@action:label"
-msgid "Size (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:38
+msgctxt "@info:tooltip"
+msgid "The maximum distance of each pixel from \"Base.\""
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:48
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:44
 msgctxt "@action:label"
-msgid "Base Height (mm)"
+msgid "Height (mm)"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:59
-msgctxt "@action:label"
-msgid "Peak Height (mm)"
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:62
+msgctxt "@info:tooltip"
+msgid "The base height from the build plate in millimeters."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:70
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:68
+msgctxt "@action:label"
+msgid "Base (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:86
+msgctxt "@info:tooltip"
+msgid "The width in millimeters on the build plate."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:92
+msgctxt "@action:label"
+msgid "Width (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:111
+msgctxt "@info:tooltip"
+msgid "The depth in millimeters on the build plate"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:117
+msgctxt "@action:label"
+msgid "Depth (mm)"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:135
+msgctxt "@info:tooltip"
+msgid ""
+"By default, white pixels represent high points on the mesh and black pixels "
+"represent low points on the mesh. Change this option to reverse the behavior "
+"such that black pixels represent high points on the mesh and white pixels "
+"represent low points on the mesh."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Lighter is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:149
+msgctxt "@item:inlistbox"
+msgid "Darker is higher"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:159
+msgctxt "@info:tooltip"
+msgid "The amount of smoothing to apply to the image."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:165
 msgctxt "@action:label"
 msgid "Smoothing"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:93
+#: /home/tamara/2.1/Cura/plugins/ImageReader/ConfigUI.qml:193
 msgctxt "@action:button"
 msgid "OK"
 msgstr ""
@@ -539,17 +604,17 @@ msgctxt "@label:textbox"
 msgid "Filter..."
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:187
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:198
 msgctxt "@label"
 msgid "00h 00min"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 msgctxt "@label"
 msgid "0.0 m"
 msgstr ""
 
-#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:207
+#: /home/tamara/2.1/Cura/resources/qml/JobSpecs.qml:218
 #, fuzzy
 msgctxt "@label"
 msgid "%1 m"
@@ -599,6 +664,36 @@ msgctxt "@title"
 msgid "Add Printer"
 msgstr "Ajouter une imprimante"
 
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:15
+#, fuzzy
+msgctxt "@title:window"
+msgid "Load profile"
+msgstr "&Profil"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:24
+msgctxt "@label"
+msgid ""
+"Selecting this profile overwrites some of your customised settings. Do you "
+"want to merge the new settings into your current profile or do you want to "
+"load a clean copy of the profile?"
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:38
+msgctxt "@label"
+msgid "Show details."
+msgstr ""
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:50
+#, fuzzy
+msgctxt "@action:button"
+msgid "Merge settings"
+msgstr "&Fusionner les objets"
+
+#: /home/tamara/2.1/Cura/resources/qml/LoadProfileDialog.qml:54
+msgctxt "@action:button"
+msgid "Reset profile"
+msgstr ""
+
 #: /home/tamara/2.1/Cura/resources/qml/ProfileSetup.qml:28
 #, fuzzy
 msgctxt "@label"
@@ -829,7 +924,7 @@ msgid ""
 msgstr ""
 
 #: /home/tamara/2.1/Cura/resources/qml/GeneralPage.qml:14
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:483
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:492
 msgctxt "@title:tab"
 msgid "General"
 msgstr "Général"
@@ -1261,88 +1356,88 @@ msgctxt "@title:window"
 msgid "Cura"
 msgstr "Cura"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:47
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:53
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&File"
 msgstr "&Fichier"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:56
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:62
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Open &Recent"
 msgstr "Ouvrir Fichier &Récent"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:85
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:92
 #, fuzzy
 msgctxt "@action:inmenu menubar:file"
 msgid "&Save Selection to File"
 msgstr "Enregi&strer la sélection dans un fichier"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:93
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:100
 #, fuzzy
 msgctxt "@title:menu menubar:file"
 msgid "Save &All"
 msgstr "Enregistrer &tout"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:121
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:128
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
 msgstr "&Modifier"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:138
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:145
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&View"
 msgstr "&Visualisation"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:160
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:167
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Printer"
 msgstr "Imprimer"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:206
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:213
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&rofile"
 msgstr "&Profil"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:233
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:240
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "E&xtensions"
 msgstr "E&xtensions"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:266
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:273
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:274
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:281
 #, fuzzy
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Help"
 msgstr "&Aide"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:357
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:366
 msgctxt "@action:button"
 msgid "Open File"
 msgstr "Ouvrir un fichier"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:401
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:410
 msgctxt "@action:button"
 msgid "View Mode"
 msgstr "Mode d’affichage"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:486
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:495
 msgctxt "@title:tab"
 msgid "View"
 msgstr "Visualisation"
 
-#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:635
+#: /home/tamara/2.1/Cura/resources/qml/Cura.qml:644
 #, fuzzy
 msgctxt "@title:window"
 msgid "Open file"
diff --git a/resources/i18n/fr/fdmprinter.json.po b/resources/i18n/fr/fdmprinter.json.po
index 3d8a8d08f9..4830311602 100644
--- a/resources/i18n/fr/fdmprinter.json.po
+++ b/resources/i18n/fr/fdmprinter.json.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cura 2.1 json files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
-"POT-Creation-Date: 2016-01-13 13:43+0000\n"
+"POT-Creation-Date: 2016-01-18 11:54+0000\n"
 "PO-Revision-Date: 2015-09-24 08:16+0100\n"
 "Last-Translator: Mathieu Gaborit | Makershop <mathieu@makershop.fr>\n"
 "Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
@@ -777,7 +777,9 @@ msgstr "Température du plateau chauffant"
 
 #: fdmprinter.json
 msgctxt "material_flow_temp_graph description"
-msgid "Data linking material flow (in mm/s) to temperature (degrees Celsius)."
+msgid ""
+"Data linking material flow (in mm3 per second) to temperature (degrees "
+"Celsius)."
 msgstr ""
 
 #: fdmprinter.json
diff --git a/resources/qml/LoadProfileDialog.qml b/resources/qml/LoadProfileDialog.qml
new file mode 100644
index 0000000000..ab92f02b99
--- /dev/null
+++ b/resources/qml/LoadProfileDialog.qml
@@ -0,0 +1,64 @@
+// Copyright (c) 2015 Ultimaker B.V.
+// Cura is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Window 2.1
+
+import UM 1.1 as UM
+
+UM.Dialog
+{
+    id: base
+
+    //: About dialog title
+    title: catalog.i18nc("@title:window","Load profile")
+    width: 400
+    height: childrenRect.height
+
+    Label
+    {
+        id: body
+
+        //: About dialog application description
+        text: catalog.i18nc("@label","Selecting this profile overwrites some of your customised settings. Do you want to merge the new settings into your current profile or do you want to load a clean copy of the profile?")
+        wrapMode: Text.WordWrap
+        width: parent.width
+        anchors.top: parent.top
+        anchors.margins: UM.Theme.sizes.default_margin.height
+
+        UM.I18nCatalog { id: catalog; name: "cura"; }
+    }
+
+    Label
+    {
+        id: show_details
+
+        //: About dialog application author note
+        text: catalog.i18nc("@label","Show details.")
+        wrapMode: Text.WordWrap
+        anchors.top: body.bottom
+        anchors.topMargin: UM.Theme.sizes.default_margin.height
+    }
+
+    rightButtons: Row
+    {
+        spacing: UM.Theme.sizes.default_margin.width
+
+        Button
+        {
+            text: catalog.i18nc("@action:button","Merge settings");
+        }
+        Button
+        {
+            text: catalog.i18nc("@action:button","Reset profile");
+        }
+        Button
+        {
+            text: catalog.i18nc("@action:button","Cancel");
+
+            onClicked: base.visible = false;
+        }
+    }
+}
+