Merge branch '4.1'

This commit is contained in:
Ghostkeeper 2019-05-08 10:24:39 +02:00
commit 2c676a3643
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276

View File

@ -28,7 +28,7 @@ Column
Label
{
text: catalog.i18nc("@label", "Time specification").toUpperCase()
text: catalog.i18nc("@label", "Time estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering
@ -111,7 +111,7 @@ Column
Label
{
text: catalog.i18nc("@label", "Material specification").toUpperCase()
text: catalog.i18nc("@label", "Material estimation").toUpperCase()
color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering