diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2022-02-21 13:52:28 +0300 |
| commit | c7d7dd11d143c804d0c1b3ff67fc6f89ed5171e6 (patch) | |
| tree | db5f78d4f88e85e01c408c03d3298c95cd14ebb9 /cura/Machines | |
| parent | 28924a1c87032e29306d0fca067bb39abc2accf2 (diff) | |
| parent | 614fe6fd4f0b6370b731c11d3cf5395f788b9ad4 (diff) | |
Merge branch 'master' into PyQt6_upgrade
Conflicts:
cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
Diffstat (limited to 'cura/Machines')
| -rw-r--r-- | cura/Machines/Models/MaterialManagementModel.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index ab904573c2..53d0cca0a2 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -60,7 +60,7 @@ class MaterialManagementModel(QObject): sync_materials_message.addAction( "sync", - name = catalog.i18nc("@action:button", "Sync materials with printers"), + name = catalog.i18nc("@action:button", "Sync materials"), icon = "", description = "Sync your newly installed materials with your printers.", button_align = Message.ActionButtonAlignment.ALIGN_RIGHT |