Merge branch '2.5'

This commit is contained in:
Jack Ha 2017-03-15 09:10:49 +01:00
commit 132b6aa9d7
4 changed files with 57 additions and 7 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