3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 13:21:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' into marketplace_redesign

Browse source 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
This commit is contained in:
Ghostkeeper 2022-01-20 15:57:28 +01:00
commit efcd00e2f3
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
68 changed files with 1974 additions and 3039 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Actions.qml
View file

@ -1,4 +1,4 @@
// Copyright (c) 2021 Ultimaker B.V.
// Copyright (c) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
pragma Singleton
@ -216,14 +216,14 @@ Item
Action
{
id: marketplaceMaterialsAction
text: catalog.i18nc("@action:inmenu", "Add more materials from Marketplace")
text: catalog.i18nc("@action:inmenu Marketplace is a brand name of Ultimaker's, so don't translate.", "Add more materials from Marketplace")
}
Action
{
id: updateProfileAction;
enabled: !Cura.MachineManager.stacksHaveErrors && Cura.MachineManager.hasUserSettings && Cura.MachineManager.activeQualityChangesGroup != null
text: catalog.i18nc("@action:inmenu menubar:profile","&Update profile with current settings/overrides");
text: catalog.i18nc("@action:inmenu menubar:profile", "&Update profile with current settings/overrides");
onTriggered: Cura.ContainerManager.updateQualityChanges();
}
@ -481,7 +481,7 @@ Item
Action
{
id: browsePackagesAction
text: catalog.i18nc("@action:menu", "&Marketplace")
text: "&Marketplace"
iconName: "plugins_browse"
}