From a43f9ef43580058abed9eb9bc3ab140523fb3f55 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Fri, 15 Jan 2016 17:20:40 +0100 Subject: [PATCH 1/2] makes the mm's square again fixes #CURA-526 --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index f128fb76c6..1b0d2a7979 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -605,7 +605,7 @@ }, "material_flow_temp_graph": { "label": "Flow Temperature Graph", - "description": "Data linking material flow (in mm/s) to temperature (degrees Celsius).", + "description": "Data linking material flow (in mm3 per second) to temperature (degrees Celsius).", "unit": "", "type": "string", "default": "[[3.5,200],[7.0,240]]", From 44217fbf94d4e7db8584da274bc00ab96e527384 Mon Sep 17 00:00:00 2001 From: Kurt Loeffler Date: Fri, 15 Jan 2016 09:53:06 -0800 Subject: [PATCH 2/2] Changed the translation string context in the ComboBox items in the image import dialog to their correct value of "@item:inlistbox". --- plugins/ImageReader/ConfigUI.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index 08b5b44db1..ac9ec13c33 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -146,7 +146,7 @@ UM.Dialog ComboBox { id: image_color_invert objectName: "Image_Color_Invert" - model: [ catalog.i18nc("@action:label","Lighter is higher"), catalog.i18nc("@action:label","Darker is higher") ] + model: [ catalog.i18nc("@item:inlistbox","Lighter is higher"), catalog.i18nc("@item:inlistbox","Darker is higher") ] width: 180 onCurrentIndexChanged: { manager.onImageColorInvertChanged(currentIndex) } }