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

resources/i18n/de/cura.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: Cura 2.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-01-18 11:54+0100\n"
-"PO-Revision-Date: 2016-02-07 16:01+0100\n"
+"PO-Revision-Date: 2016-03-09 15:28+0100\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: Thomas Karl Pietrowski <thopiekar@googlemail.com>\n"
 "Language-Team: \n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: /home/tamara/2.1/Cura/cura/CrashHandler.py:26
 msgctxt "@title:window"
@@ -249,7 +249,7 @@ msgstr "Über USB drucken"
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:37
 msgctxt "@info:tooltip"
 msgid "Print with USB"
-msgstr "Über USB drucken"
+msgstr "Drucken über USB"
 
 #: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:13
 msgctxt "@label"

resources/profiles/general/High+Quality.cfg

@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = High Quality
+weight = -3
 
 [settings]
 layer_height = 0.06

resources/profiles/general/Low+Quality.cfg

@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Low Quality
+weight = -1
 
 [settings]
 infill_sparse_density = 10

resources/profiles/general/Normal+Quality.cfg

@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Normal Quality
+weight = -2
 
 [settings]
 speed_wall_0 = 30

resources/profiles/general/Ulti+Quality.cfg

@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Ulti Quality
+weight = -4
 
 [settings]
 layer_height = 0.04

resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.06

resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile

@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -1
 
 [settings]
 layer_height = 0.15

resources/profiles/ultimaker2+/abs_0.4_high.curaprofile

@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -3
 
 [settings]
 layer_height = 0.06

resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height_0 = 0.26

resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.15

resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.2

resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17

resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile

@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -1
 
 [settings]
 infill_overlap = 17

resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile

@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -3
 
 [settings]
 layer_height = 0.06

resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -2
 
 [settings]
 layer_height_0 = 0.26

resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17

resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17

resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.22

resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile

@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -1
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2+/pla_0.4_high.curaprofile

@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -3
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile

@@ -4,6 +4,7 @@ name = Ulti Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -4
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.53

resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile

@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.7

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.25 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.22

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Fast Print
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -1
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = High Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -3
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Ulti Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -4
 
 [settings]
 machine_nozzle_size = 0.35

resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.6 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.53

resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile

@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.8 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.7