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

This commit is contained in:
Ghostkeeper 2016-01-17 14:42:27 +01:00
commit 136eb65105
2 changed files with 2 additions and 2 deletions

View file

@ -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) }
}