Merge branch '3.2'

This commit is contained in:
Ghostkeeper 2018-01-24 16:17:49 +01:00
commit ae40071ffd
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
5 changed files with 1866 additions and 2490 deletions

View file

@ -405,7 +405,7 @@ Column
Label {
id: materialInfoLabel
wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "<a href='%1'>Check compatibility</a>")
text: "<a href='%1'>" + catalog.i18nc("@label", "Check compatibility") + "</a>"
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")