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

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-04-09 11:33:07 +02:00
commit f94344263b
14 changed files with 345 additions and 503 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml
View file

@ -23,11 +23,11 @@ Cura.MachineAction
Label
{
id: pageDescription
anchors.top: pageTitle.bottom
anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker 2.")
text: catalog.i18nc("@label", "Please select any upgrades made to this Ultimaker 2.")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
}