Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-03-15 09:27:08 +01:00
commit 48cba91b16
134 changed files with 542 additions and 149 deletions

View file

@ -47,7 +47,7 @@ UM.Dialog
Label
{
text: "You have customized some profile settings.\nWould you like to keep or discard those settings?"
text: catalog.i18nc("@text:window", "You have customized some profile settings.\nWould you like to keep or discard those settings?")
anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap