Merge branch '2.7'

This commit is contained in:
Ghostkeeper 2017-08-15 14:16:08 +02:00
commit 72bf74e513
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75

View file

@ -1940,7 +1940,7 @@ msgstr "Informatie"
#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:68
msgctxt "@label"
msgid "Display Name"
msgstr "Naam Weergeven"
msgstr "Naam"
#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:78
msgctxt "@label"