Merge branch 'master' into fix_toolbox_appearance

# Conflicts:
#	plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
This commit is contained in:
fieldOfView 2018-05-02 20:37:33 +02:00
commit 0aadaa3c9d
11 changed files with 179 additions and 90 deletions

View file

@ -106,7 +106,7 @@ Item
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
Label
{
text: details.version || ""
text: details.version || catalog.i18nc("@label", "Unknown")
font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text")
}