3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '5.0'

Browse source 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
This commit is contained in:
Ghostkeeper 2022-05-16 15:11:39 +02:00
commit fc4585e098
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
78 changed files with 6736 additions and 6556 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -81,7 +81,6 @@ UM.Dialog
id: questionText
width: parent.width
text: catalog.i18nc("@text:window", "This is a Cura project file. Would you like to open it as a project or import the models from it?")
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
}