3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '3.5'

Browse source
This commit is contained in:
Ghostkeeper 2018-09-19 17:16:14 +02:00
commit f6b56a6506
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
52 changed files with 21351 additions and 14470 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/qml/MonitorButton.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
//Copyright (c) 2018 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
@ -281,16 +281,16 @@ Item
text: {
if (!printerConnected || activePrintJob == null)
{
return catalog.i18nc("@label:", "Pause");
return catalog.i18nc("@label", "Pause");
}
if (activePrintJob.state == "paused")
{
return catalog.i18nc("@label:", "Resume");
return catalog.i18nc("@label", "Resume");
}
else
{
return catalog.i18nc("@label:", "Pause");
return catalog.i18nc("@label", "Pause");
}
}
onClicked:
@ -322,7 +322,7 @@ Item
height: UM.Theme.getSize("save_button_save_to_button").height
text: catalog.i18nc("@label:", "Abort Print")
text: catalog.i18nc("@label", "Abort Print")
onClicked: confirmationDialog.visible = true
style: UM.Theme.styles.sidebar_action_button