Merge branch '5.0'

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.

.gitignore

@@ -38,6 +38,7 @@ cura.desktop
 .settings
 
 #Externally located plug-ins commonly installed by our devs.
+plugins/BarbarianPlugin
 plugins/cura-big-flame-graph
 plugins/cura-camera-position
 plugins/cura-god-mode-plugin

cura/CuraApplication.py

@@ -349,7 +349,6 @@ class CuraApplication(QtApplication):
 
         app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable)))
         Resources.addSearchPath(os.path.join(app_root, "share", "cura", "resources"))
-        Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "share", "cura", "resources"))
 
         Resources.addSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources"))
         if not hasattr(sys, "frozen"):

plugins/3MFReader/WorkspaceDialog.qml

@@ -437,7 +437,6 @@ UM.Dialog
                 {
                     id: warningLabel
                     text: catalog.i18nc("@action:warning", "Loading a project will clear all models on the build plate.")
-                    wrapMode: Text.Wrap
                 }
             }
         }

plugins/CuraDrive/src/qml/pages/BackupsPage.qml

@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 import "../components"
@@ -22,28 +22,23 @@ Item
         width: parent.width
         anchors.fill: parent
 
-        Label
+        UM.Label
         {
             id: backupTitle
             text: catalog.i18nc("@title", "My Backups")
             font: UM.Theme.getFont("large")
-            color: UM.Theme.getColor("text")
             Layout.fillWidth: true
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@empty_state",
                 "You don't have any backups currently. Use the 'Backup Now' button to create one.")
             width: parent.width
-            font: UM.Theme.getFont("default")
-            color: UM.Theme.getColor("text")
             wrapMode: Label.WordWrap
             visible: backupList.model.length == 0
             Layout.fillWidth: true
             Layout.fillHeight: true
-            renderType: Text.NativeRendering
         }
 
         BackupList
@@ -54,16 +49,13 @@ Item
             Layout.fillHeight: true
         }
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@backup_limit_info",
                 "During the preview phase, you'll be limited to 5 visible backups. Remove a backup to see older ones.")
             width: parent.width
-            font: UM.Theme.getFont("default")
-            color: UM.Theme.getColor("text")
             wrapMode: Label.WordWrap
             visible: backupList.model.length > 4
-            renderType: Text.NativeRendering
         }
 
         BackupListFooter

plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml

@@ -5,7 +5,7 @@ import QtQuick 2.15
 import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
+import UM 1.5 as UM
 import Cura 1.6 as Cura
 
 import DigitalFactory 1.0 as DF
@@ -64,12 +64,10 @@ Popup
         }
     }
 
-    Label
+    UM.Label
     {
         id: projectNameLabel
         text: "Project Name"
-        font: UM.Theme.getFont("default")
-        color: UM.Theme.getColor("text")
         anchors
         {
             top: createNewLibraryProjectLabel.bottom
@@ -107,13 +105,12 @@ Popup
         }
     }
 
-    Label
+    UM.Label
     {
         id: errorWhileCreatingProjectLabel
         text: manager.projectCreationErrorText
         width: parent.width
         wrapMode: Text.WordWrap
-        font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("error")
         visible: manager.creatingNewProjectStatus == DF.RetrievalStatus.Failed
         anchors

plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml

@@ -83,13 +83,12 @@ Item
             }
         }
 
-        Label
+        UM.Label
         {
             id: emptyProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             text: "Select a project to view its files."
-            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
 
             Connections
@@ -102,14 +101,13 @@ Item
             }
         }
 
-        Label
+        UM.Label
         {
             id: noFilesInProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible)
             text: "No supported files in this project."
-            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
 

plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml

@@ -2,7 +2,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
+import UM 1.5 as UM
 import Cura 1.6 as Cura
 
 Cura.RoundedRectangle
@@ -58,34 +58,31 @@ Cura.RoundedRectangle
             width: parent.width - x - UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
 
-            Label
+            UM.Label
             {
                 id: displayNameLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
-                color: UM.Theme.getColor("text")
                 font: UM.Theme.getFont("default_bold")
             }
 
-            Label
+            UM.Label
             {
                 id: usernameLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
                 color: UM.Theme.getColor("small_button_text")
-                font: UM.Theme.getFont("default")
             }
 
-            Label
+            UM.Label
             {
                 id: lastUpdatedLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
                 color: UM.Theme.getColor("small_button_text")
-                font: UM.Theme.getFont("default")
             }
         }
     }

plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml

@@ -44,14 +44,13 @@ Item
         cardMouseAreaEnabled: false
     }
 
-    Label
+    UM.Label
     {
         id: fileNameLabel
         anchors.top: projectSummaryCard.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         text: "Cura project name"
         font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("text")
     }
 
 
@@ -110,13 +109,12 @@ Item
             }
         }
 
-        Label
+        UM.Label
         {
             id: emptyProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             text: "Select a project to view its files."
-            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
 
             Connections
@@ -129,14 +127,13 @@ Item
             }
         }
 
-        Label
+        UM.Label
         {
             id: noFilesInProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible)
             text: "No supported files in this project."
-            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
 

plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml

@@ -104,13 +104,12 @@ Item
                 width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
             }
 
-            Label
+            UM.Label
             {
                 id: noLibraryProjectsLabel
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: searchBar.text === "" ? "It appears that you don't have any projects in the Library yet." : "No projects found that match the search query."
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
             }
 
             Cura.TertiaryButton

plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml

@@ -5,7 +5,7 @@ import QtQuick 2.2
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.1
-import QtQuick.Dialogs 6.0 // For filedialog
+import QtQuick.Dialogs // For filedialog
 
 import UM 1.5 as UM
 import Cura 1.0 as Cura
@@ -147,8 +147,6 @@ Cura.MachineAction
                             return catalog.i18nc("@label","Firmware update failed due to missing firmware.");
                     }
                 }
-
-                wrapMode: Text.Wrap
             }
 
             UM.ProgressBar

plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -58,11 +58,10 @@ Item
 
             spacing: base.columnSpacing
 
-            Label   // Title Label
+            UM.Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Nozzle Settings")
                 font: UM.Theme.getFont("medium_bold")
-                renderType: Text.NativeRendering
             }
 
             Cura.NumericTextFieldWithUnit  // "Nozzle size"

plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -51,12 +51,10 @@ Item
 
             spacing: base.columnSpacing
 
-            Label   // Title Label
+            UM.Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Printer Settings")
                 font: UM.Theme.getFont("medium_bold")
-                color: UM.Theme.getColor("text")
-                renderType: Text.NativeRendering
                 width: parent.width
                 elide: Text.ElideRight
             }
@@ -182,12 +180,10 @@ Item
 
             spacing: base.columnSpacing
 
-            Label   // Title Label
+            UM.Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Printhead Settings")
                 font: UM.Theme.getFont("medium_bold")
-                color: UM.Theme.getColor("text")
-                renderType: Text.NativeRendering
                 width: parent.width
                 elide: Text.ElideRight
             }

plugins/Marketplace/resources/qml/LicenseDialog.qml

@@ -42,16 +42,13 @@ UM.Dialog
                 source: UM.Theme.getIcon("Certificate", "high")
             }
 
-            Label
+            UM.Label
             {
                 text: catalog.i18nc("@text", "Please read and agree with the plugin licence.")
-                color: UM.Theme.getColor("text")
                 font: UM.Theme.getFont("large")
                 anchors.verticalCenter: icon.verticalCenter
                 height: UM.Theme.getSize("marketplace_large_icon").height
                 verticalAlignment: Qt.AlignmentFlag.AlignVCenter
-                wrapMode: Text.Wrap
-                renderType: Text.NativeRendering
             }
         }
 

plugins/Marketplace/resources/qml/Marketplace.qml

@@ -6,7 +6,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.2
 
-import UM 1.2 as UM
+import UM 1.5 as UM
 import Cura 1.6 as Cura
 
 Window
@@ -67,7 +67,7 @@ Window
                 Layout.preferredWidth: parent.width
                 Layout.preferredHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
 
-                Label
+                UM.Label
                 {
                     id: pageTitle
                     anchors
@@ -80,7 +80,6 @@ Window
                     }
 
                     font: UM.Theme.getFont("large")
-                    color: UM.Theme.getColor("text")
                     text: content.item ? content.item.pageTitle: catalog.i18nc("@title", "Loading...")
                 }
             }

plugins/Marketplace/resources/qml/PackageCard.qml

@@ -29,16 +29,13 @@ Rectangle
 
             anchors.fill: parent
 
-            Label
+            UM.Label
             {
                 id: descriptionLabel
                 width: parent.width
 
                 text: packageData.description
-                font: UM.Theme.getFont("default")
-                color: UM.Theme.getColor("text")
                 maximumLineCount: 2
-                wrapMode: Text.Wrap
                 elide: Text.ElideRight
                 visible: text !== ""
             }

plugins/Marketplace/resources/qml/PackageCardHeader.qml

@@ -87,11 +87,10 @@ Item
             Layout.preferredWidth: parent.width
             Layout.preferredHeight: childrenRect.height
 
-            Label
+            UM.Label
             {
                 text: packageData.displayName
                 font: UM.Theme.getFont("medium_bold")
-                color: UM.Theme.getColor("text")
                 verticalAlignment: Text.AlignTop
             }
             VerifiedIcon
@@ -100,12 +99,10 @@ Item
                 visible: packageData.isCheckedByUltimaker
             }
 
-            Label
+            UM.Label
             {
                 id: packageVersionLabel
                 text: packageData.packageVersion
-                font: UM.Theme.getFont("default")
-                color: UM.Theme.getColor("text")
                 Layout.fillWidth: true
             }
 
@@ -155,7 +152,7 @@ Item
             spacing: UM.Theme.getSize("narrow_margin").width
 
             // label "By"
-            Label
+            UM.Label
             {
                 id: authorBy
                 Layout.alignment: Qt.AlignCenter

plugins/Marketplace/resources/qml/PackageDetails.qml

@@ -45,14 +45,13 @@ Item
             iconSize: height - leftPadding * 2
         }
 
-        Label
+        UM.Label
         {
             Layout.alignment: Qt.AlignmentFlag.AlignVCenter
             Layout.fillWidth: true
 
             text: detailPage.title
             font: UM.Theme.getFont("large")
-            color: UM.Theme.getColor("text")
         }
     }
 

plugins/Marketplace/resources/qml/PackagePage.qml

@@ -56,13 +56,9 @@ Rectangle
                         color: UM.Theme.getColor("text")
                     }
 
-                    Label
+                    UM.Label
                     {
-
                         anchors.verticalCenter: downloadsIcon.verticalCenter
-
-                        color: UM.Theme.getColor("text")
-                        font: UM.Theme.getFont("default")
                         text: packageData.downloadCount
                     }
                 }
@@ -78,25 +74,22 @@ Rectangle
             topPadding: 0
             spacing: UM.Theme.getSize("default_margin").height
 
-            Label
+            UM.Label
             {
                 width: parent.width - parent.padding * 2
 
                 text: catalog.i18nc("@header", "Description")
                 font: UM.Theme.getFont("medium_bold")
-                color: UM.Theme.getColor("text")
                 elide: Text.ElideRight
             }
 
-            Label
+            UM.Label
             {
                 width: parent.width - parent.padding * 2
 
                 text: packageData.formattedDescription
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")
-                wrapMode: Text.Wrap
                 textFormat: Text.RichText
 
                 onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
@@ -110,13 +103,12 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible printers")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
@@ -124,25 +116,23 @@ Rectangle
                 {
                     model: packageData.compatiblePrinters
 
-                    Label
+                    UM.Label
                     {
                         width: compatiblePrinterColumn.width
 
                         text: modelData
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     visible: packageData.compatiblePrinters.length == 0
                     text: "(" + catalog.i18nc("@info", "No compatibility information") + ")"
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -155,13 +145,12 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible support materials")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
@@ -169,25 +158,23 @@ Rectangle
                 {
                     model: packageData.compatibleSupportMaterials
 
-                    Label
+                    UM.Label
                     {
                         width: compatibleSupportMaterialColumn.width
 
                         text: modelData
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     visible: packageData.compatibleSupportMaterials.length == 0
                     text: "(" + catalog.i18nc("@info No materials", "None") + ")"
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -199,23 +186,21 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Compatible with Material Station")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: packageData.isCompatibleMaterialStation ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }
@@ -227,23 +212,21 @@ Rectangle
                 visible: packageData.packageType === "material"
                 spacing: 0
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: catalog.i18nc("@header", "Optimized for Air Manager")
                     font: UM.Theme.getFont("medium_bold")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
 
-                Label
+                UM.Label
                 {
                     width: parent.width
 
                     text: packageData.isCompatibleAirManager ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
                     elide: Text.ElideRight
                 }
             }

plugins/Marketplace/resources/qml/PackageTypeTab.qml

@@ -3,7 +3,7 @@
 
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import UM 1.0 as UM
+import UM 1.5 as UM
 
 TabButton
 {
@@ -22,11 +22,10 @@ TabButton
         border.width: UM.Theme.getSize("thick_lining").width
     }
 
-    contentItem: Label
+    contentItem: UM.Label
     {
         text: parent.text
         font: UM.Theme.getFont("medium_bold")
-        color: UM.Theme.getColor("text")
         width: contentWidth
         anchors.centerIn: parent
     }

plugins/Marketplace/resources/qml/Packages.qml

@@ -40,7 +40,7 @@ ListView
 
         color: UM.Theme.getColor("detail_background")
 
-        Label
+        UM.Label
         {
             id: sectionHeaderText
             anchors.verticalCenter: parent.verticalCenter
@@ -48,7 +48,6 @@ ListView
 
             text: section
             font: UM.Theme.getFont("large")
-            color: UM.Theme.getColor("text")
         }
     }
 

plugins/MonitorStage/MonitorMain.qml

@@ -132,7 +132,7 @@ Rectangle
                 width: UM.Theme.getSize("icon_indicator").width
                 height: UM.Theme.getSize("icon_indicator").height
             }
-            Label
+            UM.Label
             {
                 id: manageQueueText
                 anchors
@@ -144,7 +144,6 @@ Rectangle
                 color: UM.Theme.getColor("text_link")
                 font: UM.Theme.getFont("medium")
                 text: catalog.i18nc("@label link to technical assistance", "View user manuals online")
-                renderType: Text.NativeRendering
             }
             MouseArea
             {
@@ -155,14 +154,13 @@ Rectangle
                 onExited: manageQueueText.font.underline = false
             }
         }
-        Label
+        UM.Label
         {
             id: noConnectionLabel
             anchors.horizontalCenter: parent.horizontalCenter
             visible: !isNetworkConfigurable
             text: catalog.i18nc("@info", "In order to monitor your print from Cura, please connect the printer.")
             font: UM.Theme.getFont("medium")
-            color: UM.Theme.getColor("text")
             wrapMode: Text.WordWrap
             width: contentWidth
         }

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -245,7 +245,7 @@ UM.Dialog
             height: parent.height
             id: settingsPanel
 
-            Label
+            UM.Label
             {
                 id: scriptSpecsHeader
                 text: manager.selectedScriptIndex == -1 ? catalog.i18nc("@label", "Settings") : base.activeScriptName
@@ -262,7 +262,6 @@ UM.Dialog
                 elide: Text.ElideRight
                 height: 20 * screenScaleFactor
                 font: UM.Theme.getFont("large_bold")
-                color: UM.Theme.getColor("text")
             }
 
             ListView

plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -286,9 +286,7 @@ Cura.ExpandableComponent
                 UM.Label
                 {
                     text: label
-                    font: UM.Theme.getFont("default")
                     elide: Text.ElideRight
-                    renderType: Text.NativeRendering
                     color: UM.Theme.getColor("setting_control_text")
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.left: legendModelCheckBox.left

plugins/SliceInfoPlugin/MoreInfoWindow.qml

@@ -61,7 +61,7 @@ Window
                 right: parent.right
             }
 
-            Label
+            UM.Label
             {
                 id: headerText
                 anchors
@@ -71,9 +71,7 @@ Window
                     right: parent.right
                 }
                 text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:")
-                color: UM.Theme.getColor("text")
                 wrapMode: Text.WordWrap
-                renderType: Text.NativeRendering
             }
 
             Cura.ScrollableTextArea

plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml

@@ -295,7 +295,6 @@ Cura.MachineAction
             UM.Label
             {
                 text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.")
-                renderType: Text.NativeRendering
             }
 
             Cura.TextField

plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml

@@ -3,7 +3,7 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 2.0
-import UM 1.3 as UM
+import UM 1.5 as UM
 
 import Cura 1.6 as Cura
 
@@ -57,32 +57,25 @@ Item
         width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme!
         radius: 2 * screenScaleFactor // TODO: Theme!
 
-        Label
+        UM.Label
         {
             id: materialLabel
             anchors.top: parent.top
 
-            color: UM.Theme.getColor("text")
             elide: Text.ElideRight
-            font: UM.Theme.getFont("default") // 12pt, regular
             text: ""
             visible: text !== ""
-
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: printCoreLabel
             anchors.top: materialLabel.bottom
 
-            color: UM.Theme.getColor("text")
             elide: Text.ElideRight
             font: UM.Theme.getFont("default_bold") // 12pt, bold
             text: ""
             visible: text !== ""
-
-            renderType: Text.NativeRendering
         }
     }
 }

plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml

@@ -3,7 +3,7 @@
 
 import QtQuick 2.3
 import QtQuick.Controls 2.0
-import UM 1.3 as UM
+import UM 1.5 as UM
 
 /**
  * A MonitorInfoBlurb is an extension of the GenericPopUp used to show static information (vs. interactive context
@@ -31,7 +31,7 @@ Item
             id: contentWrapper
             implicitWidth: childrenRect.width
             implicitHeight: innerLabel.contentHeight + 2 * innerLabel.padding
-            Label
+            UM.Label
             {
                 id: innerLabel
                 padding: 12 * screenScaleFactor // TODO: Theme!
@@ -39,7 +39,6 @@ Item
                 wrapMode: Text.WordWrap
                 width: 240 * screenScaleFactor // TODO: Theme!
                 color: UM.Theme.getColor("monitor_tooltip_text")
-                font: UM.Theme.getFont("default")
             }
         }
     }

plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml

@@ -4,7 +4,7 @@ import QtQuick 2.2
 import QtQuick.Window 2.2
 import QtQuick.Controls 2.15
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 UM.Dialog {
 
@@ -70,7 +70,7 @@ UM.Dialog {
             name: "cura";
         }
 
-        Label {
+        UM.Label {
             id: manualPrinterSelectionLabel;
             anchors {
                 left: parent.left;
@@ -79,8 +79,6 @@ UM.Dialog {
             }
             height: 20 * screenScaleFactor;
             text: catalog.i18nc("@label", "Printer selection");
-            wrapMode: Text.Wrap;
-            renderType: Text.NativeRendering;
         }
 
         ComboBox {

plugins/UltimakerMachineActions/BedLevelMachineAction.qml

@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -23,18 +23,16 @@ Cura.MachineAction
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width * 3 / 4
 
-        Label
+        UM.Label
         {
             id: pageTitle
             width: parent.width
             text: catalog.i18nc("@title", "Build Plate Leveling")
             wrapMode: Text.WordWrap
             font: UM.Theme.getFont("medium")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: pageDescription
             anchors.top: pageTitle.bottom
@@ -42,12 +40,9 @@ Cura.MachineAction
             width: parent.width
             wrapMode: Text.WordWrap
             text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.")
-            font: UM.Theme.getFont("default")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: bedlevelingText
             anchors.top: pageDescription.bottom
@@ -55,9 +50,6 @@ Cura.MachineAction
             width: parent.width
             wrapMode: Text.WordWrap
             text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.")
-            font: UM.Theme.getFont("default")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
         Row

plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml

@@ -20,7 +20,7 @@ Cura.MachineAction
         anchors.topMargin: UM.Theme.getSize("default_margin").width * 5
         anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4
 
-        Label
+        UM.Label
         {
             id: pageDescription
             anchors.top: parent.top
@@ -29,8 +29,6 @@ Cura.MachineAction
             wrapMode: Text.WordWrap
             text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original")
             font: UM.Theme.getFont("medium")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
         UM.CheckBox

resources/definitions/ultimaker2_plus_connect.def.json

@@ -81,7 +81,7 @@
         "material_bed_temperature_layer_0": { "maximum_value": 110 },
         "material_print_temperature": { "maximum_value": 260 },
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
-        "meshfix_maximum_deviation": { "value": "layer_height / 4" },
+        "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" },
         "meshfix_maximum_travel_resolution": { "value": 0.5 },
         "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" },
         "retraction_prime_speed": { "value": "15" },

resources/i18n/cs_CZ/cura.po

@@ -6563,42 +6563,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB tisk"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Zjistit Více"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Pro instalaci balíčku musíte přijmout licenční ujednání"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Zjištěny změny z vašeho účtu Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Změny z vašeho účtu"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Schovat"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Odmítnout a odstranit z účtu"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Chcete synchronizovat materiálové a softwarové balíčky s vaším účtem?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Synchronizuji..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Následující balíčky byly přidány:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Než se změny projeví, musíte ukončit a restartovat {}."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Nepovedlo se stáhnout {} zásuvných modulů"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Licenční ujednání zásuvného modulu"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Synchronizovat materiály s tiskárnami"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Než se změny projeví, musíte ukončit a restartovat {}."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Synchronizuji..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Zjištěny změny z vašeho účtu Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Chcete synchronizovat materiál a softwarové balíčky s vaším účtem?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Synchronizovat"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Odmítnout a odstranit z účtu"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Nepovedlo se stáhnout {} zásuvných modulů"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Licenční ujednání zásuvného modulu"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Konvertovat obrázek.."
@@ -6787,22 +6820,6 @@ msgstr "USB tisk"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Nelze se připojit k databázi balíčku Cura. Zkontrolujte připojení."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Pro instalaci balíčku musíte přijmout licenční ujednání"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Změny z vašeho účtu"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Schovat"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Následující balíčky byly přidány:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Následující balíčky nelze nainstalovat z důvodu nekompatibilní verze Cura:"
@@ -7233,22 +7250,6 @@ msgstr "USB tisk"
 #~ msgid "Create an account"
 #~ msgstr "Vytvořit účet"
 
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Do you want to sync material and software packages with your account?"
-#~ msgstr ""
-#~ "\n"
-#~ "Chcete synchronizovat materiálové a softwarové balíčky s vaším účtem?"
-
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Syncing..."
-#~ msgstr ""
-#~ "\n"
-#~ "Synchronizuji..."
-
 #~ msgctxt "@info:status"
 #~ msgid "Nothing to slice because none of the models fit the build volume or are assigned to a disabled extruder. Please scale or rotate models to fit, or enable an extruder."
 #~ msgstr "Nic ke slicování, protože žádný z modelů neodpovídá objemu sestavení nebo není přiřazen k vytlačovacímu stroji s deaktivací. Změňte měřítko nebo otočte modely, aby se vešly, nebo povolte extrudér."

resources/i18n/de_DE/cura.po

@@ -6801,42 +6801,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB-Drucken"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Mehr Erfahren"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Sie müssen die Lizenz akzeptieren, um das Paket zu installieren"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Von Ihrem Ultimaker-Konto erkannte Änderungen"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Änderungen in deinem Konto"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Verwerfen"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Ablehnen und vom Konto entfernen"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisieren?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Synchronisierung läuft..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Die folgenden Pakete werden hinzugefügt:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr"Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Plugin für Lizenzvereinbarung"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Materialien synchronisieren"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Synchronisierung läuft ..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Von Ihrem Ultimaker-Konto erkannte Änderungen"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisieren?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Synchronisieren"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Ablehnen und vom Konto entfernen"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{} Plugins konnten nicht heruntergeladen werden"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Plugin für Lizenzvereinbarung"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Bild konvertieren..."
@@ -7025,22 +7058,6 @@ msgstr "USB-Drucken"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Verbindung zur Cura Paket-Datenbank konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Verbindung."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Sie müssen die Lizenz akzeptieren, um das Paket zu installieren"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Änderungen in deinem Konto"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Verwerfen"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Die folgenden Pakete werden hinzugefügt:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Die folgenden Pakete können nicht hinzugefügt werden, weil die Cura-Version nicht kompatibel ist:"
@@ -7467,22 +7484,6 @@ msgstr "USB-Drucken"
 #~ msgid "Create an account"
 #~ msgstr "Ein Konto erstellen"
 
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Do you want to sync material and software packages with your account?"
-#~ msgstr ""
-#~ "\n"
-#~ "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisieren?"
-
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Syncing..."
-#~ msgstr ""
-#~ "\n"
-#~ "Synchronisierung läuft ..."
-
 #~ msgctxt "@info:status"
 #~ msgid "Nothing to slice because none of the models fit the build volume or are assigned to a disabled extruder. Please scale or rotate models to fit, or enable an extruder."
 #~ msgstr "Es ist kein Objekt zum Schneiden vorhanden, da keines der Modelle den Druckabmessungen entspricht oder weil sie einem deaktivierten Extruder zugewiesen wurden. Bitte die Modelle passend skalieren oder drehen."
@@ -9584,10 +9585,6 @@ msgstr "USB-Drucken"
 #~ msgid "Cura collects anonymised slicing statistics. You can disable this in the preferences."
 #~ msgstr "Cura erfasst anonymisierte Slice-Informationen. Sie können dies in den Einstellungen deaktivieren."
 
-#~ msgctxt "@action:button"
-#~ msgid "Dismiss"
-#~ msgstr "Verwerfen"
-
 #~ msgctxt "@menuitem"
 #~ msgid "Global"
 #~ msgstr "Global"

resources/i18n/es_ES/cura.po

@@ -6803,42 +6803,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Impresión USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Más Información"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Tiene que aceptar la licencia para instalar el paquete"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Se han detectado cambios desde su cuenta de Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Cambios desde su cuenta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Descartar"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Rechazar y eliminar de la cuenta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "¿Desea sincronizar el material y los paquetes de software con su cuenta?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Sincronizando..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Se añadirán los siguientes paquetes:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Tiene que salir y reiniciar {} para que los cambios surtan efecto."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Error al descargar los complementos {}"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Acuerdo de licencia de complemento"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Sincronizar materiales"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Tiene que salir y reiniciar {} para que los cambios surtan efecto."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Sincronizando..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Se han detectado cambios desde su cuenta de Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "¿Desea sincronizar el material y los paquetes de software con su cuenta?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Sincronizar"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Rechazar y eliminar de la cuenta"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Error al descargar los complementos {}"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Acuerdo de licencia de complemento"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Convertir imagen..."
@@ -7027,22 +7060,6 @@ msgstr "Impresión USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "No se ha podido conectar con la base de datos del Paquete Cura. Compruebe la conexión."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Tiene que aceptar la licencia para instalar el paquete"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Cambios desde su cuenta"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Descartar"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Se añadirán los siguientes paquetes:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Los siguientes paquetes no se pueden instalar debido a una versión no compatible de Cura:"
@@ -7469,22 +7486,6 @@ msgstr "Impresión USB"
 #~ msgid "Create an account"
 #~ msgstr "Crear una cuenta"
 
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Do you want to sync material and software packages with your account?"
-#~ msgstr ""
-#~ "\n"
-#~ "¿Desea sincronizar el material y los paquetes de software con su cuenta?"
-
-#~ msgctxt "@info:generic"
-#~ msgid ""
-#~ "\n"
-#~ "Syncing..."
-#~ msgstr ""
-#~ "\n"
-#~ "Sincronizando..."
-
 #~ msgctxt "@info:status"
 #~ msgid "Nothing to slice because none of the models fit the build volume or are assigned to a disabled extruder. Please scale or rotate models to fit, or enable an extruder."
 #~ msgstr "No hay nada que segmentar porque ninguno de los modelos se adapta al volumen de impresión o los modelos están asignados a un extrusor deshabilitado. Escale o rote los modelos para que se adapten o habilite un extrusor."

resources/i18n/fr_FR/cura.po

@@ -6804,42 +6804,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Impression par USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "En Savoir Plus"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Vous devez accepter la licence pour installer le package"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Changements détectés à partir de votre compte Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Changements à partir de votre compte"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Ignorer"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Décliner et supprimer du compte"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Vous souhaitez synchroniser du matériel et des logiciels avec votre compte ?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Synchronisation..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Les packages suivants seront ajoutés:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Vous devez quitter et redémarrer {} avant que les changements apportés ne prennent effet."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Échec de téléchargement des plugins {}"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Plug-in d'accord de licence"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Synchroniser les matériaux"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Vous devez quitter et redémarrer {} avant que les changements apportés ne prennent effet."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Synchronisation..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Changements détectés à partir de votre compte Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Vous souhaitez synchroniser du matériel et des logiciels avec votre compte ?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Synchroniser"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Décliner et supprimer du compte"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Échec de téléchargement des plugins {}"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Plug-in d'accord de licence"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Conversion de l'image..."
@@ -7028,22 +7061,6 @@ msgstr "Impression par USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Impossible de se connecter à la base de données Cura Package. Veuillez vérifier votre connexion."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Vous devez accepter la licence pour installer le package"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Changements à partir de votre compte"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Ignorer"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Les packages suivants seront ajoutés :"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Les packages suivants ne peuvent pas être installés en raison d'une version incompatible de Cura :"
@@ -9587,10 +9604,6 @@ msgstr "Impression par USB"
 #~ msgid "Cura collects anonymised slicing statistics. You can disable this in the preferences."
 #~ msgstr "Cura collecte des statistiques anonymes sur le découpage. Vous pouvez désactiver cette fonctionnalité dans les préférences."
 
-#~ msgctxt "@action:button"
-#~ msgid "Dismiss"
-#~ msgstr "Ignorer"
-
 #~ msgctxt "@menuitem"
 #~ msgid "Global"
 #~ msgstr "Global"

resources/i18n/it_IT/cura.po

@@ -6798,42 +6798,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Stampa USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Ulteriori Informazioni"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "È necessario accettare la licenza per installare il pacchetto"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Modifiche rilevate dal tuo account Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Modifiche dall'account"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Rimuovi"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Rifiuta e rimuovi dall'account"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Desiderate sincronizzare pacchetti materiale e software con il vostro account?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Sincronizzazione in corso..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Verranno aggiunti i seguenti pacchetti:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Affinché le modifiche diventino effettive, è necessario chiudere e riavviare {}."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Impossibile scaricare i plugin {}"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Accordo di licenza plugin"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Sincronizza materiali"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Affinché le modifiche diventino effettive, è necessario chiudere e riavviare {}."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Sincronizzazione in corso..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Modifiche rilevate dal tuo account Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Desiderate sincronizzare pacchetti materiale e software con il vostro account?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Sincronizza"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Rifiuta e rimuovi dall'account"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Impossibile scaricare i plugin {}"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Accordo di licenza plugin"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Converti immagine..."
@@ -7022,22 +7055,6 @@ msgstr "Stampa USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Impossibile connettersi al database pacchetto Cura. Verificare la connessione."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "È necessario accettare la licenza per installare il pacchetto"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Modifiche dall'account"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Rimuovi"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Verranno aggiunti i seguenti pacchetti:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Impossibile installare i seguenti pacchetti a causa di una versione di Cura non compatibile:"

resources/i18n/ja_JP/cura.po

@@ -6750,42 +6750,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USBプリンティング"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "詳しく見る"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "パッケージをインストールするにはライセンスに同意する必要があります"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Ultimakerアカウントから変更が検出されました"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "アカウントにおける変更"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "無視"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "拒否してアカウントから削除"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "材料パッケージとソフトウェアパッケージをアカウントと同期しますか？"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "同期中..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "次のパッケージが追加されます:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "変更を有効にするために{}を終了して再始動する必要があります。"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{}プラグインのダウンロードに失敗しました"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "プラグインライセンス同意書"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "材料をプリンターと同期"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "変更を有効にするために{}を終了して再始動する必要があります。"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "同期中..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Ultimakerアカウントから変更が検出されました"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "材料パッケージとソフトウェアパッケージをアカウントと同期しますか？"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "同期"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "拒否してアカウントから削除"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{}プラグインのダウンロードに失敗しました"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "プラグインライセンス同意書"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "画像を変換する..."
@@ -6974,22 +7007,6 @@ msgstr "USBプリンティング"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Curaパッケージデータベースに接続できません。接続を確認してください。"
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "パッケージをインストールするにはライセンスに同意する必要があります"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "アカウントにおける変更"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "無視"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "次のパッケージが追加されます:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "次のパッケージは、Curaバージョンに互換性がないため、インストールできません:"
@@ -9529,10 +9546,6 @@ msgstr "USBプリンティング"
 #~ msgid "Cura collects anonymised slicing statistics. You can disable this in the preferences."
 #~ msgstr "Curaが非特定なスライスされた数字を集めました。プレファレンス内で無効にできます。"
 
-#~ msgctxt "@action:button"
-#~ msgid "Dismiss"
-#~ msgstr "却下する"
-
 #~ msgctxt "@menuitem"
 #~ msgid "Global"
 #~ msgstr "グローバル"

resources/i18n/ko_KR/cura.po

@@ -6752,42 +6752,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB 프린팅"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "자세히 알아보기"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "패키지를 설치하려면 라이선스를 수락해야 합니다"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Ultimaker 계정에서 변경 사항이 감지되었습니다"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "계정의 변경 사항"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "취소"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "계정에서 거절 및 제거"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "귀하의 계정으로 재료와 소프트웨어 패키지를 동기화하시겠습니까?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "동기화 중..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "다음 패키지가 추가됩니다:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "변경 사항이 적용되기 전에 {}을(를) 멈추고 다시 시작해야 합니다."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{}개의 플러그인을 다운로드하지 못했습니다"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "플러그인 사용 계약"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "재료를 프린터와 동기화"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "변경 사항이 적용되기 전에 {}을(를) 멈추고 다시 시작해야 합니다."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "동기화 중..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Ultimaker 계정에서 변경 사항이 감지되었습니다"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "귀하의 계정으로 재료와 소프트웨어 패키지를 동기화하시겠습니까?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "동기화"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "계정에서 거절 및 제거"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{}개의 플러그인을 다운로드하지 못했습니다"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "플러그인 사용 계약"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "이미지 변환 ..."
@@ -6976,22 +7009,6 @@ msgstr "USB 프린팅"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Cura 패키지 데이터베이스에 연결할 수 없습니다. 연결을 확인하십시오."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "패키지를 설치하려면 라이선스를 수락해야 합니다"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "계정의 변경 사항"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "취소"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "다음 패키지가 추가됩니다:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "호환되지 않는 Cura 버전이기 때문에 다음 패키지를 설치할 수 없습니다:"

resources/i18n/nl_NL/cura.po

@@ -6800,42 +6800,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB-printen"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Meer Informatie"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "U moet de licentie accepteren om de package te installeren"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Wijzigingen van uw account"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Verwijderen"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Weigeren en verwijderen uit account"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Synchroniseren ..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "De volgende packages worden toegevoegd:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "U moet {} afsluiten en herstarten voordat de wijzigingen van kracht worden."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{} plug-ins zijn niet gedownload"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Licentieovereenkomst plug-in"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Synchroniseer materialen"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "U moet {} afsluiten en herstarten voordat de wijzigingen van kracht worden."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Synchroniseren ..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Synchroniseren"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Weigeren en verwijderen uit account"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{} plug-ins zijn niet gedownload"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Licentieovereenkomst plug-in"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Afbeelding Converteren..."
@@ -7024,22 +7057,6 @@ msgstr "USB-printen"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Kan geen verbinding maken met de Cura Package-database. Controleer uw verbinding."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "U moet de licentie accepteren om de package te installeren"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Wijzigingen van uw account"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Verwijderen"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "De volgende packages worden toegevoegd:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "De volgende packages kunnen niet worden geïnstalleerd omdat de Cura-versie niet compatibel is:"

resources/i18n/pt_BR/cura.po

@@ -6389,42 +6389,76 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Impressão USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Saiba mais"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Você precisa aceitar a licença para que o pacote possa ser instalado"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Alterações detectadas de sua conta Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Alterações da sua conta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Dispensar"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Recusar e remover da conta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Você quer sincronizar os pacotes de material e software com sua conta?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Sincronizando..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Os seguintes pacotes serão adicionados:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Você precisa sair e reiniciar {} para que as alterações tenham efeito."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{} complementos falharam em baixar"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Acordo de Licença do Complemento"
+
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Sincronizar materiais"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Você precisa sair e reiniciar {} para que as alterações tenham efeito."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Sincronizando..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Alterações detectadas de sua conta Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Você quer sincronizar os pacotes de material e software com sua conta?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Sincronizar"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Recusar e remover da conta"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{} complementos falharam em baixar"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Acordo de Licença do Complemento"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Converter imagem..."
@@ -6613,22 +6647,6 @@ msgstr "Impressão USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Não foi possível conectar-se à base de dados de Pacotes do Cura. Por favor verifique sua conexão."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Você precisa aceitar a licença para que o pacote possa ser instalado"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Alterações da sua conta"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Dispensar"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Os seguintes pacotes serão adicionados:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Os seguintes pacotes não podem ser instalados por incompatibilidade de versão do Cura:"

resources/i18n/pt_PT/cura.po

@@ -6803,42 +6803,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Impressão USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Saber Mais"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "É necessário aceitar a licença para instalar o pacote"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Foram detetadas alterações da sua conta Ultimaker"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Alterações feitas desde a sua conta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Descartar"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Rejeitar e remover da conta"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Pretende sincronizar o material e os pacotes de software com a sua conta?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "A sincronizar..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Os seguintes pacotes vão ser instalados:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "É necessário reiniciar o {} para que as alterações tenham efeito."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Falhou a transferência de {} plug-ins"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Contrato de licença do plug-in"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Sincronizar materiais"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "É necessário reiniciar o {} para que as alterações tenham efeito."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "A sincronizar..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Foram detetadas alterações da sua conta Ultimaker"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Pretende sincronizar o material e os pacotes de software com a sua conta?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Sincronizar"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Rejeitar e remover da conta"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Falhou a transferência de {} plug-ins"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Contrato de licença do plug-in"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Converter imagem..."
@@ -7027,22 +7060,6 @@ msgstr "Impressão USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Não foi possível aceder á base de dados de Pacotes do Cura. Por favor verifique a sua ligação."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "É necessário aceitar a licença para instalar o pacote"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Alterações feitas desde a sua conta"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Descartar"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Os seguintes pacotes vão ser instalados:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Os seguintes pacotes não podem ser instalados devido a uma versão incompatível do Cura:"

resources/i18n/ru_RU/cura.po

@@ -6806,42 +6806,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "Печать через USB"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Узнать Больше"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Для установки пакета необходимо принять лицензию"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "В вашей учетной записи Ultimaker обнаружены изменения"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Изменения в вашей учетной записи"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Отклонить"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Отклонить и удалить из учетной записи"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Хотите синхронизировать пакеты материалов и программного обеспечения со своей учетной записью?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Синхронизация..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Будут добавлены следующие пакеты:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Для активации изменений вам потребуется завершить работу программного обеспечения {} и перезапустить его."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "Встраиваемые модули ({} шт.) не загружены"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Лицензионное соглашение плагина"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Синхронизация материалов"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Для активации изменений вам потребуется завершить работу программного обеспечения {} и перезапустить его."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Синхронизация..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "В вашей учетной записи Ultimaker обнаружены изменения"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Хотите синхронизировать пакеты материалов и программного обеспечения со своей учетной записью?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Синхронизация"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Отклонить и удалить из учетной записи"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "Встраиваемые модули ({} шт.) не загружены"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Лицензионное соглашение плагина"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Преобразование изображения..."
@@ -7030,22 +7063,6 @@ msgstr "Печать через USB"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Не удалось подключиться к базе данных пакета Cura. Проверьте свое подключение."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Для установки пакета необходимо принять лицензию"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Изменения в вашей учетной записи"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Отклонить"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Будут добавлены следующие пакеты:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Следующие пакеты невозможно установить из-за несовместимой версии Cura:"

resources/i18n/tr_TR/cura.po

@@ -6790,42 +6790,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB yazdırma"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "Daha Fazla Bilgi Edinin"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "Paketi yüklemek için lisansı kabul etmeniz gerekir"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "Ultimaker hesabınızda değişiklik tespit edildi"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "Hesabınızda değişiklik var"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "Kapat"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "Reddet ve hesaptan kaldır"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "Malzeme ve yazılım paketlerini hesabınızla senkronize etmek istiyor musunuz?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "Senkronize ediliyor..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "Aşağıdaki paketler eklenecek:"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "Değişikliklerin etkili olması için {} uygulamasını kapatarak yeniden başlatmalısınız."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{} eklenti indirilemedi"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "Eklenti Lisans Anlaşması"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "Malzemeleri yazıcılarla senkronize et"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "Değişikliklerin etkili olması için {} uygulamasını kapatarak yeniden başlatmalısınız."
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "Senkronize ediliyor..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "Ultimaker hesabınızda değişiklik tespit edildi"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "Malzeme ve yazılım paketlerini hesabınızla senkronize etmek istiyor musunuz?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "Senkronize et"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "Reddet ve hesaptan kaldır"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{} eklenti indirilemedi"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "Eklenti Lisans Anlaşması"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "Resim Dönüştürülüyor..."
@@ -7014,22 +7047,6 @@ msgstr "USB yazdırma"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "Cura Paket veri tabanına bağlanılamadı. Lütfen bağlantınızı kontrol edin."
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "Paketi yüklemek için lisansı kabul etmeniz gerekir"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "Hesabınızda değişiklik var"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "Kapat"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "Aşağıdaki paketler eklenecek:"
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "Aşağıdaki paketler uyumsuz Cura sürümü nedeniyle yüklenemiyor:"

resources/i18n/zh_CN/cura.po

@@ -1676,7 +1676,7 @@ msgstr "所提供的状态不正确。"
 #: /home/remco/dev/code/ulti/trans/Cura/cura/OAuth2/AuthorizationRequestHandler.py:80
 msgctxt "@message"
 msgid "Timeout when authenticating with the account server."
-msgstr "Timeout when authenticating with the account server."
+msgstr "使用帐户服务器进行身份验证超时。"
 
 #: /home/remco/dev/code/ulti/trans/Cura/cura/OAuth2/AuthorizationRequestHandler.py:97
 msgctxt "@message"
@@ -3939,7 +3939,7 @@ msgstr "管理设置可见性..."
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/SettingsMenu.qml:34
 msgctxt "@title:menu"
 msgid "&Material"
-msgstr "材料（&M）"
+msgstr "材料(&M)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/SettingsMenu.qml:49
 msgctxt "@action:inmenu"
@@ -3984,7 +3984,7 @@ msgstr "文件(&F)"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/FileMenu.qml:44
 msgctxt "@title:menu menubar:file"
 msgid "&Save Project..."
-msgstr "保存项目(＆S)..."
+msgstr "保存项目(&S)..."
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/FileMenu.qml:77
 msgctxt "@title:menu menubar:file"
@@ -3999,17 +3999,17 @@ msgstr "导出选择..."
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/PreferencesMenu.qml:21
 msgctxt "@title:menu menubar:toplevel"
 msgid "P&references"
-msgstr "偏好设置（&R）"
+msgstr "偏好设置(&R)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/EditMenu.qml:12
 msgctxt "@title:menu menubar:toplevel"
 msgid "&Edit"
-msgstr "编辑（&E）"
+msgstr "编辑(&E)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/PrinterMenu.qml:13
 msgctxt "@title:menu menubar:settings"
 msgid "&Printer"
-msgstr "打印机（&P）"
+msgstr "打印机(&P)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Menus/PrinterMenu.qml:17
 msgctxt "@label:category menu label"
@@ -4696,7 +4696,7 @@ msgstr "要自动将材料配置文件与连接到 Digital Factory 的所有打
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:587
 msgctxt "@button"
 msgid "Sync materials with USB"
-msgstr "Sync materials with USB"
+msgstr "使用 USB 同步材料"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml:190
 msgctxt "@title:header"
@@ -5868,12 +5868,12 @@ msgstr "显示联机故障排除"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:88
 msgctxt "@action:inmenu"
 msgid "Toggle Full Screen"
-msgstr "切换完整界面"
+msgstr "切换全屏"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:96
 msgctxt "@action:inmenu"
 msgid "Exit Full Screen"
-msgstr "退出完整界面"
+msgstr "退出全屏"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:103
 msgctxt "@action:inmenu menubar:edit"
@@ -5950,17 +5950,17 @@ msgstr "从市场添加更多材料"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:223
 msgctxt "@action:inmenu menubar:profile"
 msgid "&Update profile with current settings/overrides"
-msgstr "使用当前设置 / 重写值更新配置文件（&U）"
+msgstr "使用当前设置 / 重写值更新配置文件(&U)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:231
 msgctxt "@action:inmenu menubar:profile"
 msgid "&Discard current changes"
-msgstr "舍弃当前更改（&D）"
+msgstr "舍弃当前更改(&D)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:243
 msgctxt "@action:inmenu menubar:profile"
 msgid "&Create profile from current settings/overrides..."
-msgstr "从当前设置 / 重写值创建配置文件（&C）..."
+msgstr "从当前设置 / 重写值创建配置文件(&C)..."
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:249
 msgctxt "@action:inmenu menubar:profile"
@@ -6010,12 +6010,12 @@ msgstr "删除模型"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:330
 msgctxt "@action:inmenu"
 msgid "Ce&nter Model on Platform"
-msgstr "使模型居于平台中央（&N）"
+msgstr "使模型居于平台中央(&N)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:336
 msgctxt "@action:inmenu menubar:edit"
 msgid "&Group Models"
-msgstr "绑定模型（&G）"
+msgstr "绑定模型(&G)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:356
 msgctxt "@action:inmenu menubar:edit"
@@ -6025,12 +6025,12 @@ msgstr "拆分模型"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:366
 msgctxt "@action:inmenu menubar:edit"
 msgid "&Merge Models"
-msgstr "合并模型（&M）"
+msgstr "合并模型(&M)"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:376
 msgctxt "@action:inmenu"
 msgid "&Multiply Model..."
-msgstr "复制模型…（&M）"
+msgstr "复制模型(&M)…"
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:383
 msgctxt "@action:inmenu menubar:edit"
@@ -6070,12 +6070,12 @@ msgstr "复位所有模型的变动"
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:443
 msgctxt "@action:inmenu menubar:file"
 msgid "&Open File(s)..."
-msgstr "打开文件（&O）..."
+msgstr "打开文件(&O)..."
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:453
 msgctxt "@action:inmenu menubar:file"
 msgid "&New Project..."
-msgstr "新建项目（&N）..."
+msgstr "新建项目(&N)..."
 
 #: /home/remco/dev/code/ulti/trans/Cura/resources/qml/Actions.qml:460
 msgctxt "@action:inmenu menubar:help"
@@ -6749,42 +6749,75 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB 联机打印"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/OnboardBanner.qml:35
+msgctxt "@button:label"
+msgid "Learn More"
+msgstr "详细了解"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "需要接受许可证才能安装该程序包"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "检测到您的 Ultimaker 帐户有更改"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "您的帐户有更改"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "解除"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "拒绝并从帐户中删除"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "是否要与您的帐户同步材料和软件包?"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "正在同步..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "将添加以下程序包："
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "需要退出并重新启动 {}，然后更改才能生效。"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "{} 个插件下载失败"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "插件许可协议"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "同步材料与打印机"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "需要退出并重新启动 {}，然后更改才能生效。"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "正在同步..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "检测到您的 Ultimaker 帐户有更改"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "是否要与您的帐户同步材料和软件包?"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "同步"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "拒绝并从帐户中删除"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "{} 个插件下载失败"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "插件许可协议"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "转换图像..."
@@ -6973,22 +7006,6 @@ msgstr "USB 联机打印"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "无法连接到Cura包数据库。请检查您的连接。"
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "需要接受许可证才能安装该程序包"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "您的帐户有更改"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "解除"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "将添加以下程序包："
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "由于 Cura 版本不兼容，无法安装以下程序包："

resources/i18n/zh_TW/cura.po

@@ -6530,42 +6530,70 @@ msgctxt "name"
 msgid "USB printing"
 msgstr "USB 連線列印"
 
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml:35
+msgctxt "@label"
+msgid "You need to accept the license to install the package"
+msgstr "你必需同意授權協議才能安裝套件"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:145
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:95
+msgctxt "@info:title"
+msgid "Changes detected from your Ultimaker account"
+msgstr "從你的 Ultimaker 帳號偵測到資料更動"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:15
+msgctxt "@title"
+msgid "Changes from your account"
+msgstr "你帳戶的更動"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:24
+msgctxt "@button"
+msgid "Dismiss"
+msgstr "捨棄"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicensePresenter.py:42
+msgctxt "@button"
+msgid "Decline and remove from account"
+msgstr "拒絕並從帳號中刪除"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/CloudPackageChecker.py:144
+msgctxt "@info:generic"
+msgid "Do you want to sync material and software packages with your account?"
+msgstr "你要使用你的帳號同步線材資料和軟體套件嗎？"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/DownloadPresenter.py:91
+msgctxt "@info:generic"
+msgid "Syncing..."
+msgstr "同步中..."
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/resources/qml/CompatibilityDialog.qml:52
+msgctxt "@label"
+msgid "The following packages will be added:"
+msgstr "將新增下列套件："
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/RestartApplicationPresenter.py:22
+msgctxt "@info:generic"
+msgid "You need to quit and restart {} before changes have effect."
+msgstr "你需要結束並重新啟動 {} ，更動才能生效。"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/SyncOrchestrator.py:79
+msgctxt "@info:generic"
+msgid "{} plugins failed to download"
+msgstr "下載外掛 {} 失敗"
+
+#: /Users/j.delarago/development/cura_installation/Cura/plugins/Marketplace/CloudSync/LicenseModel.py:77
+msgctxt "@title:window"
+msgid "Plugin License Agreement"
+msgstr "外掛授權協議"
+
 #~ msgctxt "@action:button"
 #~ msgid "Sync materials with printers"
 #~ msgstr "列印機同步線材資料"
 
-#~ msgctxt "@info:generic"
-#~ msgid "You need to quit and restart {} before changes have effect."
-#~ msgstr "你需要結束並重新啟動 {} ，更動才能生效。"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Syncing..."
-#~ msgstr "同步中..."
-
-#~ msgctxt "@info:title"
-#~ msgid "Changes detected from your Ultimaker account"
-#~ msgstr "從你的 Ultimaker 帳號偵測到資料更動"
-
-#~ msgctxt "@info:generic"
-#~ msgid "Do you want to sync material and software packages with your account?"
-#~ msgstr "你要使用你的帳號同步線材資料和軟體套件嗎？"
-
 #~ msgctxt "@action:button"
 #~ msgid "Sync"
 #~ msgstr "同步"
 
-#~ msgctxt "@button"
-#~ msgid "Decline and remove from account"
-#~ msgstr "拒絕並從帳號中刪除"
-
-#~ msgctxt "@info:generic"
-#~ msgid "{} plugins failed to download"
-#~ msgstr "下載外掛 {} 失敗"
-
-#~ msgctxt "@title:window"
-#~ msgid "Plugin License Agreement"
-#~ msgstr "外掛授權協議"
-
 #~ msgctxt "@title:window"
 #~ msgid "Convert Image..."
 #~ msgstr "轉換圖片..."
@@ -6754,22 +6782,6 @@ msgstr "USB 連線列印"
 #~ msgid "Could not connect to the Cura Package database. Please check your connection."
 #~ msgstr "無法連上 Cura 套件資料庫。請檢查你的網路連線。"
 
-#~ msgctxt "@label"
-#~ msgid "You need to accept the license to install the package"
-#~ msgstr "你必需同意授權協議才能安裝套件"
-
-#~ msgctxt "@title"
-#~ msgid "Changes from your account"
-#~ msgstr "你帳戶的更動"
-
-#~ msgctxt "@button"
-#~ msgid "Dismiss"
-#~ msgstr "捨棄"
-
-#~ msgctxt "@label"
-#~ msgid "The following packages will be added:"
-#~ msgstr "將新增下列套件："
-
 #~ msgctxt "@label"
 #~ msgid "The following packages can not be installed because of an incompatible Cura version:"
 #~ msgstr "下列套件因 Cura 版本不相容，無法安裝："

resources/qml/ActionPanel/PrintJobInformation.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.1
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 Column
@@ -26,15 +26,14 @@ Column
         leftPadding: UM.Theme.getSize("default_margin").width
         rightPadding: UM.Theme.getSize("default_margin").width
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "Time estimation").toUpperCase()
             color: UM.Theme.getColor("primary")
             font: UM.Theme.getFont("default_bold")
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: byLineType
 
@@ -76,16 +75,13 @@ Column
                         Repeater
                         {
                             model: modelData
-                            Label
+                            UM.Label
                             {
                                 width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index])
                                 height: contentHeight
                                 horizontalAlignment: byLineType.columnHorizontalAligns[index]
-                                color: UM.Theme.getColor("text")
-                                font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData
-                                renderType: Text.NativeRendering
                             }
                         }
                     }
@@ -94,9 +90,6 @@ Column
 
             width: parent.width - 2 * UM.Theme.getSize("default_margin").width
             height: childrenRect.height
-            color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("default")
-            renderType: Text.NativeRendering
             textFormat: Text.RichText
         }
     }
@@ -109,15 +102,14 @@ Column
         leftPadding: UM.Theme.getSize("default_margin").width
         rightPadding: UM.Theme.getSize("default_margin").width
 
-        Label
+        UM.Label
         {
             text: catalog.i18nc("@label", "Material estimation").toUpperCase()
             color: UM.Theme.getColor("primary")
             font: UM.Theme.getFont("default_bold")
-            renderType: Text.NativeRendering
         }
         
-        Label
+        UM.Label
         {
             id: byMaterialType
 
@@ -180,16 +172,13 @@ Column
                         Repeater
                         {
                             model: modelData
-                            Label
+                            UM.Label
                             {
                                 width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index])
                                 height: contentHeight
                                 horizontalAlignment: byMaterialType.columnHorizontalAligns[index]
-                                color: UM.Theme.getColor("text")
-                                font: UM.Theme.getFont("default")
                                 wrapMode: Text.WrapAnywhere
                                 text: modelData
-                                renderType: Text.NativeRendering
                             }
                         }
                     }
@@ -198,9 +187,6 @@ Column
 
             width: parent.width - 2 * UM.Theme.getSize("default_margin").width
             height: childrenRect.height
-            color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("default")
-            renderType: Text.NativeRendering
             textFormat: Text.RichText
         }
     }

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 
-import UM 1.4 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 
@@ -45,16 +45,13 @@ Column
         }
     }
 
-    Label
+    UM.Label
     {
         id: autoSlicingLabel
         width: parent.width
         visible: progressBar.visible
 
         text: catalog.i18nc("@label:PrintjobStatus", "Slicing...")
-        color: UM.Theme.getColor("text")
-        font: UM.Theme.getFont("default")
-        renderType: Text.NativeRendering
     }
     Item
     {
@@ -71,7 +68,7 @@ Column
             height: width
             status: UM.StatusIcon.Status.WARNING
         }
-        Label
+        UM.Label
         {
             id: label
             anchors.left: warningIcon.right
@@ -79,9 +76,6 @@ Column
             anchors.verticalCenter: parent.verticalCenter
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice")
-            color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("default")
-            renderType: Text.NativeRendering
             wrapMode: Text.WordWrap
         }
     }

resources/qml/ApplicationSwitcher/ApplicationButton.qml

@@ -82,7 +82,6 @@ Button
 
             height: base.height - applicationIcon.height - 2 * UM.Theme.getSize("default_margin").width  // Account for the top and bottom margins
             horizontalAlignment: Text.AlignHCenter
-            wrapMode: Text.Wrap
             elide: Text.ElideRight
         }
     }

resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml

@@ -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
         }
 

resources/qml/MachineSettings/ComboBoxWithOptions.qml

@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 import "../Widgets"
@@ -52,15 +52,13 @@ UM.TooltipArea
         watchedProperties: [ "value", "options", "description" ]
     }
 
-    Label
+    UM.Label
     {
         id: fieldLabel
         anchors.left: parent.left
         anchors.verticalCenter: comboBox.verticalCenter
         visible: text != ""
         font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("text")
-        renderType: Text.NativeRendering
     }
 
     ListModel

resources/qml/MachineSettings/NumericTextFieldWithUnit.qml

@@ -62,15 +62,12 @@ UM.TooltipArea
         watchedProperties: [ "value", "description" ]
     }
 
-    Label
+    UM.Label
     {
         id: fieldLabel
         anchors.left: parent.left
         anchors.verticalCenter: textFieldWithUnit.verticalCenter
         visible: text != ""
-        font: UM.Theme.getFont("default")
-        color: UM.Theme.getColor("text")
-        renderType: Text.NativeRendering
     }
 
     TextField

resources/qml/MachineSettings/SimpleCheckBox.qml

@@ -46,15 +46,13 @@ UM.TooltipArea
         watchedProperties: [ "value", "description" ]
     }
 
-    Label
+    UM.Label
     {
         id: fieldLabel
         anchors.left: parent.left
         anchors.verticalCenter: checkBox.verticalCenter
         visible: text != ""
         font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("text")
-        renderType: Text.NativeRendering
     }
 
     UM.CheckBox

resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 Item
@@ -12,14 +12,13 @@ Item
     width: parent.width
     height: childrenRect.height
 
-    Label
+    UM.Label
     {
         id: header
         text: catalog.i18nc("@header", "Configurations")
         font: UM.Theme.getFont("medium")
         color: UM.Theme.getColor("small_button_text")
         height: contentHeight
-        renderType: Text.NativeRendering
 
         anchors
         {

resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

@@ -39,7 +39,7 @@ Item
             anchors.verticalCenter: parent.verticalCenter
             status: UM.StatusIcon.Status.WARNING
         }
-        Label
+        UM.Label
         {
             id: label
             anchors.left: icon.right
@@ -51,9 +51,6 @@ Item
             text: Cura.MachineManager.printerConnected ?
                     catalog.i18nc("@label", "Loading available configurations from the printer...") :
                     catalog.i18nc("@label", "The configurations are not available because the printer is disconnected.")
-            color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("default")
-            renderType: Text.NativeRendering
             wrapMode: Text.WordWrap
         }
     }

resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml

@@ -36,6 +36,8 @@ Cura.ExpandablePopup
 
     headerItem: Item
     {
+        id: headerBase
+
         // Horizontal list that shows the extruders and their materials
         RowLayout
         {
@@ -51,9 +53,12 @@ Cura.ExpandablePopup
                 {
                     id: extruderItem
 
-                    Layout.preferredWidth: Math.round(parent.width / extrudersModel.count)
+                    Layout.preferredWidth: Math.floor(headerBase.width / extrudersModel.count)
-                    Layout.maximumWidth: Math.round(parent.width / extrudersModel.count)
+                    Layout.maximumWidth: Math.floor(headerBase.width / extrudersModel.count)
+                    Layout.preferredHeight: headerBase.height
+                    Layout.maximumHeight: headerBase.height
                     Layout.fillHeight: true
+                    Layout.alignment: Qt.AlignCenter
 
                     property var extruderStack: activeMachine ? activeMachine.extruderList[model.index]: null
                     property bool valueWarning: !Cura.ExtruderManager.getExtruderHasQualityForMaterial(extruderStack)

resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml

@@ -97,13 +97,16 @@ Item
                 checked: model.index == 0
                 contentItem: Item
                 {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: Math.floor(tabBar.height / extrudersModel.count)
+                    height: tabBar.height
                     Cura.ExtruderIcon
                     {
                         anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.verticalCenter: parent.verticalCenter
                         materialColor: model.color
                         extruderEnabled: model.enabled
-                        width: parent.height
-                        height: parent.height
                     }
                 }
                 onClicked:

resources/qml/Preferences/Materials/MaterialsSyncDialog.qml

@@ -231,7 +231,6 @@ Window
                     {
                         id: syncStatusLabel
                         anchors.left: parent.left
-                        wrapMode: Text.Wrap
                         elide: Text.ElideRight
                         visible: text !== ""
                         font: UM.Theme.getFont("medium")
@@ -559,7 +558,6 @@ Window
                     text: catalog.i18nc("@text", "It seems like you don't have any compatible printers connected to Digital Factory. Make sure your printer is connected and it's running the latest firmware.")
                     Layout.fillWidth: true
                     horizontalAlignment: Text.AlignHCenter
-                    wrapMode: Text.Wrap
                 }
 
                 Item
@@ -633,7 +631,6 @@ Window
                 {
                     text: catalog.i18nc("@text In the UI this is followed by a list of steps the user needs to take.", "Follow the following steps to load the new material profiles to your printer.")
                     font: UM.Theme.getFont("medium")
-                    wrapMode: Text.Wrap
                     Layout.fillWidth: true
                 }
 

resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml

@@ -133,7 +133,6 @@ Item
                             visible: (index % 20) == 0 // Only show steps of 20%
                             anchors.horizontalCenter: parent.horizontalCenter
                             y: UM.Theme.getSize("thin_margin").height
-                            renderType: Text.NativeRendering
                             color: UM.Theme.getColor("quality_slider_available")
                         }
                     }

resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.2 as UM
+import UM 1.5 as UM
 import Cura 1.6 as Cura
 import ".."
 
@@ -111,7 +111,7 @@ Item
                 }
                 height: intentCategoryLabel.height
 
-                Label
+                UM.Label
                 {
                     id: intentCategoryLabel
                     text: model.name
@@ -119,8 +119,6 @@ Item
                     anchors.left: parent.left
                     anchors.leftMargin: UM.Theme.getSize("section_icon").width + UM.Theme.getSize("narrow_margin").width
                     font: UM.Theme.getFont("medium")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
                     elide: Text.ElideRight
                 }
 

resources/qml/PrintSetupTooltip.qml

@@ -90,7 +90,6 @@ UM.PointingRectangle
             y: UM.Theme.getSize("tooltip_margins").height
             width: textScroll.width - 2 * UM.Theme.getSize("tooltip_margins").width
 
-            wrapMode: Text.Wrap
             textFormat: Text.RichText
             color: UM.Theme.getColor("tooltip_text")
         }

resources/qml/PrinterOutput/OutputDeviceHeader.qml

@@ -33,7 +33,6 @@ Item
         {
             id: outputDeviceNameLabel
             font: UM.Theme.getFont("large_bold")
-            color: UM.Theme.getColor("text")
             anchors.left: parent.left
             anchors.top: parent.top
             anchors.margins: UM.Theme.getSize("default_margin").width

resources/qml/PrinterTypeLabel.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.1
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 // This component creates a label with the abbreviated name of a printer, with a rectangle surrounding the label.
 // It is created in a separated place in order to be reused whenever needed.
@@ -24,14 +24,11 @@ Item
         radius: UM.Theme.getSize("checkbox_radius").width
     }
 
-    Label
+    UM.Label
     {
         id: printerTypeLabel
         text: "CFFFP" // As an abbreviated name of the Custom FFF Printer
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
-        renderType: Text.NativeRendering
-        font: UM.Theme.getFont("default")
-        color: UM.Theme.getColor("text")
     }
 }

resources/qml/Settings/SettingItem.qml

@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 import "."
@@ -135,7 +135,7 @@ Item
             }
         }
 
-        Label
+        UM.Label
         {
             id: label
 
@@ -146,7 +146,6 @@ Item
 
             text: definition.label
             elide: Text.ElideMiddle
-            renderType: Text.NativeRendering
             textFormat: Text.PlainText
 
             color: UM.Theme.getColor("setting_control_text")

resources/qml/TableView.qml

@@ -171,6 +171,12 @@ Item
 
                 acceptedButtons: Qt.LeftButton
                 text: (cellTextMetrics.elidedText == cellContent.text) ? "" : cellContent.text //Show full text in tooltip if it was elided.
+            }
+
+            MouseArea
+            {
+                anchors.fill: parent
+                propagateComposedEvents: true
                 onClicked:
                 {
                     if(tableBase.allowSelection)

resources/qml/Toolbar.qml

@@ -210,12 +210,11 @@ Item
         width: toolHint.width + UM.Theme.getSize("default_margin").width
         height: toolHint.height;
         color: UM.Theme.getColor("tooltip")
-        Label
+        UM.Label
         {
             id: toolHint
             text: UM.ActiveTool.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : ""
             color: UM.Theme.getColor("tooltip_text")
-            font: UM.Theme.getFont("default")
             anchors.horizontalCenter: parent.horizontalCenter
         }
 

resources/qml/WelcomePages/AddCloudPrintersView.qml

@@ -38,7 +38,7 @@ Item
             bottomMargin: UM.Theme.getSize("default_margin").height
         }
 
-        Label
+        UM.Label
         {
             id: titleLabel
             anchors.top: parent.top
@@ -47,7 +47,6 @@ Item
             text: catalog.i18nc("@label", "Add a Cloud printer")
             color: UM.Theme.getColor("primary_button")
             font: UM.Theme.getFont("huge")
-            renderType: Text.NativeRendering
         }
 
         // Component that contains a busy indicator and a message, while it waits for Cura to discover a cloud printer
@@ -65,7 +64,7 @@ Item
                 running: searchingForCloudPrinters
                 palette.dark: UM.Theme.getColor("text")
             }
-            Label
+            UM.Label
             {
                 id: waitingLabel
                 anchors.top: waitingIndicator.bottom
@@ -73,10 +72,8 @@ Item
                 horizontalAlignment: Text.AlignHCenter
                 text: catalog.i18nc("@label", "Waiting for Cloud response")
                 font: UM.Theme.getFont("large")
-                renderType: Text.NativeRendering
-                color: UM.Theme.getColor("text")
             }
-            Label
+            UM.Label
             {
                 id: noPrintersFoundLabel
                 anchors.top: waitingLabel.bottom
@@ -85,9 +82,8 @@ Item
                 horizontalAlignment: Text.AlignHCenter
                 text: catalog.i18nc("@label", "No printers found in your account?")
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
             }
-            Label
+            UM.Label
             {
                 text: "Sign in with a different account"
                 anchors.top: noPrintersFoundLabel.bottom
@@ -112,7 +108,7 @@ Item
         }
 
         // Label displayed when a new cloud printer is discovered
-        Label
+        UM.Label
         {
             anchors.top: titleLabel.bottom
             anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height
@@ -121,7 +117,6 @@ Item
             text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:")
             height: contentHeight + 2 * UM.Theme.getSize("default_margin").height
             visible: discoveredCloudPrintersModel.count > 0
-            color: UM.Theme.getColor("text")
         }
 
         // The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when
@@ -153,32 +148,29 @@ Item
                 Column
                 {
                     id: contentColumn
-                    Label
+                    UM.Label
                     {
                         id: cloudPrinterNameLabel
                         leftPadding: UM.Theme.getSize("default_margin").width
                         text: model.name ? model.name : ""
                         font: UM.Theme.getFont("large_bold")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
-                    Label
+                    UM.Label
                     {
                         id: cloudPrinterTypeLabel
                         leftPadding: 2 * UM.Theme.getSize("default_margin").width
                         topPadding: UM.Theme.getSize("thin_margin").height
-                        text: {"Type: " + model.machine_type}
+                        text: "Type: " + model.machine_type
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
-                    Label
+                    UM.Label
                     {
                         id: cloudPrinterFirmwareVersionLabel
                         leftPadding: 2 * UM.Theme.getSize("default_margin").width
-                        text: {"Firmware version: " + model.firmware_version}
+                        text: "Firmware version: " + model.firmware_version
                         font: UM.Theme.getFont("medium")
-                        color: UM.Theme.getColor("text")
                         elide: Text.ElideRight
                     }
                 }

resources/qml/WelcomePages/AddLocalPrinterScrollView.qml

@@ -183,7 +183,6 @@ Item
             UM.Label
             {
                 width: parent.width - (2 * UM.Theme.getSize("default_margin").width)
-                wrapMode: Text.Wrap
                 text: base.getMachineName()
                 color: UM.Theme.getColor("primary_button")
                 font: UM.Theme.getFont("huge")

resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -15,7 +15,7 @@ Item
 {
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    Label
+    UM.Label
     {
         id: titleLabel
         anchors.top: parent.top
@@ -24,7 +24,6 @@ Item
         text: catalog.i18nc("@label", "Add a printer")
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
-        renderType: Text.NativeRendering
     }
 
     DropDownWidget

resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml

@@ -218,7 +218,6 @@ Item
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 text: catalog.i18nc("@label", "Troubleshooting")
-                font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text_link")
             }
 

resources/qml/WelcomePages/AddPrinterByIpContent.qml

@@ -5,7 +5,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.5 as Cura
 
 
@@ -61,7 +61,7 @@ Item
         }
     }
 
-    Label
+    UM.Label
     {
         id: titleLabel
         anchors.top: parent.top
@@ -70,7 +70,6 @@ Item
         text: catalog.i18nc("@label", "Add printer by IP address")
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
-        renderType: Text.NativeRendering
     }
 
     Item
@@ -88,17 +87,13 @@ Item
             anchors.right: parent.right
             anchors.margins: UM.Theme.getSize("default_margin").width
 
-            Label
+            UM.Label
             {
                 id: explainLabel
                 height: contentHeight
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.top: parent.top
-
-                font: UM.Theme.getFont("default")
-                color: UM.Theme.getColor("text")
-                renderType: Text.NativeRendering
                 text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.")
             }
 
@@ -136,7 +131,7 @@ Item
                     onAccepted: addPrinterButton.clicked()
                 }
 
-                Label
+                UM.Label
                 {
                     id: invalidInputLabel
                     anchors.top: hostnameField.bottom
@@ -144,9 +139,6 @@ Item
                     anchors.left: parent.left
                     visible: false
                     text: catalog.i18nc("@text", "Please enter a valid IP address.")
-                    font: UM.Theme.getFont("default")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
                 }
 
                 Cura.SecondaryButton
@@ -188,14 +180,11 @@ Item
                 anchors.top: userInputFields.bottom
                 anchors.margins: UM.Theme.getSize("default_margin").width
 
-                Label
+                UM.Label
                 {
                     id: waitResponseLabel
                     anchors.top: parent.top
                     anchors.margins: UM.Theme.getSize("default_margin").width
-                    font: UM.Theme.getFont("default")
-                    color: UM.Theme.getColor("text")
-                    renderType: Text.NativeRendering
 
                     visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered)
                     textFormat: Text.RichText
@@ -225,18 +214,15 @@ Item
 
                     visible: addPrinterByIpScreen.isPrinterDiscovered
 
-                    Label
+                    UM.Label
                     {
                         id: printerNameLabel
                         anchors.top: parent.top
                         font: UM.Theme.getFont("large")
-                        color: UM.Theme.getColor("text")
-                        renderType: Text.NativeRendering
-
                         text: !addPrinterByIpScreen.isPrinterDiscovered ? "???" : addPrinterByIpScreen.discoveredPrinter.name
                     }
 
-                    Label
+                    UM.Label
                     {
                         id: printerCannotBeAddedLabel
                         width: parent.width
@@ -245,8 +231,6 @@ Item
                         text: catalog.i18nc("@label", "This printer cannot be added because it's an unknown printer or it's not the host of a group.")
                         visible: addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.canAddPrinter
                         font: UM.Theme.getFont("default_bold")
-                        color: UM.Theme.getColor("text")
-                        renderType: Text.NativeRendering
                         wrapMode: Text.WordWrap
                     }
 
@@ -258,52 +242,33 @@ Item
                         columns: 2
                         columnSpacing: UM.Theme.getSize("default_margin").width
 
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@label", "Type")
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
-                        Label
+                        UM.Label
                         {
                             id: typeText
                             text: !addPrinterByIpScreen.isPrinterDiscovered ? "?" : addPrinterByIpScreen.discoveredPrinter.readableMachineType
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
-
+                        UM.Label
-                        Label
                         {
                             text: catalog.i18nc("@label", "Firmware version")
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
-                        Label
+                        UM.Label
                         {
                             id: firmwareText
                             text: !addPrinterByIpScreen.isPrinterDiscovered ? "0.0.0.0" : addPrinterByIpScreen.discoveredPrinter.device.getProperty("firmware_version")
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
 
-                        Label
+                        UM.Label
                         {
                             text: catalog.i18nc("@label", "Address")
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
-                        Label
+                        UM.Label
                         {
                             id: addressText
                             text: !addPrinterByIpScreen.isPrinterDiscovered ? "0.0.0.0" : addPrinterByIpScreen.discoveredPrinter.address
-                            font: UM.Theme.getFont("default")
-                            color: UM.Theme.getColor("text")
-                            renderType: Text.NativeRendering
                         }
                     }
 

resources/qml/WelcomePages/CloudContent.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -56,7 +56,7 @@ Item
 
             spacing: UM.Theme.getSize("thick_margin").height
 
-            Label
+            UM.Label
             {
                 id: titleLabel
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -64,7 +64,6 @@ Item
                 text: catalog.i18nc("@label", "Sign in to the Ultimaker platform")
                 color: UM.Theme.getColor("primary_button")
                 font: UM.Theme.getFont("huge")
-                renderType: Text.NativeRendering
             }
 
             // Filler item
@@ -116,17 +115,13 @@ Item
                         sourceSize.width: width
                         sourceSize.height: height
                     }
-                    Label
+                    UM.Label
                     {
                         id: marketplaceTextLabel
                         anchors.horizontalCenter: parent.horizontalCenter
                         width: parent.width
                         text: catalog.i18nc("@text", "Add material settings and plugins from the Marketplace")
-                        wrapMode: Text.Wrap
                         horizontalAlignment: Text.AlignHCenter
-                        color: UM.Theme.getColor("text")
-                        font: UM.Theme.getFont("default")
-                        renderType: Text.NativeRendering
                     }
                 }
 
@@ -146,17 +141,13 @@ Item
                         sourceSize.width: width
                         sourceSize.height: height
                     }
-                    Label
+                    UM.Label
                     {
                         id: syncTextLabel
                         anchors.horizontalCenter: parent.horizontalCenter
                         width: parent.width
                         text: catalog.i18nc("@text", "Backup and sync your material settings and plugins")
-                        wrapMode: Text.Wrap
                         horizontalAlignment: Text.AlignHCenter
-                        color: UM.Theme.getColor("text")
-                        font: UM.Theme.getFont("default")
-                        renderType: Text.NativeRendering
                     }
                 }
 
@@ -176,17 +167,13 @@ Item
                         sourceSize.width: width
                         sourceSize.height: height
                     }
-                    Label
+                    UM.Label
                     {
                         id: communityTextLabel
                         anchors.horizontalCenter: communityColumn.horizontalCenter
                         width: parent.width
                         text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the Ultimaker Community")
-                        wrapMode: Text.Wrap
                         horizontalAlignment: Text.AlignHCenter
-                        color: UM.Theme.getColor("text")
-                        font: UM.Theme.getFont("default")
-                        renderType: Text.NativeRendering
                     }
                 }
             }

resources/qml/WelcomePages/DataCollectionsContent.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -15,7 +15,7 @@ Item
 {
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    Label
+    UM.Label
     {
         id: titleLabel
         anchors.top: parent.top
@@ -24,7 +24,6 @@ Item
         text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
-        renderType: Text.NativeRendering
     }
 
     // Area where the cloud contents can be put. Pictures, texts and such.
@@ -48,7 +47,7 @@ Item
 
             spacing: UM.Theme.getSize("wide_margin").height
 
-            Label
+            UM.Label
             {
                 id: topLabel
                 width: parent.width
@@ -57,8 +56,6 @@ Item
                 text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
                 wrapMode: Text.WordWrap
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
-                renderType: Text.NativeRendering
             }
 
             Grid {
@@ -91,7 +88,7 @@ Item
                 }
             }
 
-            Label
+            UM.Label
             {
                 id: bottomLabel
                 width: parent.width
@@ -107,10 +104,8 @@ Item
                 textFormat: Text.RichText
                 wrapMode: Text.WordWrap
                 font: UM.Theme.getFont("medium")
-                color: UM.Theme.getColor("text")
                 linkColor: UM.Theme.getColor("text_link")
                 onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
-                renderType: Text.NativeRendering
             }
         }
     }

resources/qml/WelcomePages/FirstStartMachineActionsContent.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -36,7 +36,7 @@ Item
         }
     }
 
-    Label
+    UM.Label
     {
         id: titleLabel
         anchors.top: parent.top
@@ -45,7 +45,6 @@ Item
         text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
-        renderType: Text.NativeRendering
     }
 
     Item

resources/qml/WelcomePages/ImageTile.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 
 
 //
@@ -18,7 +18,7 @@ Column
     property alias text: label.text
     property alias imageSource: image.source
 
-    Label
+    UM.Label
     {
         id: label
         width: image.width
@@ -26,9 +26,6 @@ Column
         horizontalAlignment: Text.AlignHCenter
         text: ""
         wrapMode: Text.WordWrap
-        font: UM.Theme.getFont("default")
-        color: UM.Theme.getColor("text")
-        renderType: Text.NativeRendering
     }
 
     Image

resources/qml/WelcomePages/WelcomeContent.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 //
@@ -48,7 +48,7 @@ Item
             width: parent.width
         }
 
-        Label
+        UM.Label
         {
             id: titleLabel
             anchors.horizontalCenter: parent.horizontalCenter
@@ -56,20 +56,16 @@ Item
             text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
             color: UM.Theme.getColor("primary_button")
             font: UM.Theme.getFont("huge_bold")
-            renderType: Text.NativeRendering
         }
 
-        Label
+        UM.Label
         {
             id: textLabel
             anchors.horizontalCenter: parent.horizontalCenter
             horizontalAlignment: Text.AlignHCenter
             width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width
             text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.")
-            wrapMode: Text.Wrap
             font: UM.Theme.getFont("medium")
-            color: UM.Theme.getColor("text")
-            renderType: Text.NativeRendering
         }
 
         // Filler item

resources/qml/WelcomePages/WhatsNewContent.qml

@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.3 as UM
+import UM 1.5 as UM
 import Cura 1.1 as Cura
 
 
@@ -19,7 +19,7 @@ Item
 
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    Label
+    UM.Label
     {
         id: titleLabel
         anchors.top: parent.top
@@ -28,7 +28,6 @@ Item
         text: catalog.i18nc("@label", "What's New")
         color: UM.Theme.getColor("primary_button")
         font: UM.Theme.getFont("huge")
-        renderType: Text.NativeRendering
     }
 
     Rectangle

scripts/update_po_with_changes.py

@@ -0,0 +1,114 @@
+import argparse
+
+from typing import List
+
+"""
+    Takes in one of the po files in resources/i18n/[LANG_CODE]/cura.po and updates it with translations from a 
+    new po file without changing the translation ordering. 
+    This script should be used when we get a po file that has updated translations but is no longer correctly ordered 
+    so the merge becomes messy.
+    
+    If you are importing files from lionbridge/smartling use lionbridge_import.py.
+    
+    Note: This does NOT include new strings, it only UPDATES existing strings   
+"""
+
+
+class Msg:
+    def __init__(self, msgctxt: str = "", msgid: str = "", msgstr: str = "") -> None:
+        self.msgctxt = msgctxt
+        self.msgid = msgid
+        self.msgstr = msgstr
+
+    def __str__(self):
+        return self.msgctxt + self.msgid + self.msgstr
+
+
+def parsePOFile(filename: str) -> List[Msg]:
+    messages = []
+    with open(filename) as f:
+        iterator = iter(f.readlines())
+        for line in iterator:
+            if line.startswith("msgctxt"):
+                #  Start of a translation item block
+                msg = Msg()
+                msg.msgctxt = line
+
+                while True:
+                    line = next(iterator)
+                    if line.startswith("msgid"):
+                        msg.msgid = line
+                        break
+
+                while True:
+                    #  msgstr can be split over multiple lines
+                    line = next(iterator)
+                    if line == "\n":
+                        break
+                    if line.startswith("msgstr"):
+                        msg.msgstr = line
+                    else:
+                        msg.msgstr += line
+
+                messages.append(msg)
+
+        return messages
+
+
+def getDifferentMessages(messages_original: List[Msg], messages_new: List[Msg]) -> List[Msg]:
+    #  Return messages that have changed in messages_new
+    different_messages = []
+
+    for m_new in messages_new:
+        for m_original in messages_original:
+            if m_new.msgstr != m_original.msgstr \
+                    and m_new.msgid == m_original.msgid and m_new.msgctxt == m_original.msgctxt \
+                    and m_new.msgid != 'msgid ""\n':
+                different_messages.append(m_new)
+
+    return different_messages
+
+
+def updatePOFile(input_filename: str, output_filename: str, messages: List[Msg]) -> None:
+    # Takes a list of changed messages and writes a copy of input file with updated message strings
+    with open(input_filename, "r") as input_file, open(output_filename, "w") as output_file:
+        iterator = iter(input_file.readlines())
+        for line in iterator:
+            output_file.write(line)
+            if line.startswith("msgctxt"):
+                #  Start of translation block
+                msgctxt = line
+
+                msgid = next(iterator)
+                output_file.write(msgid)
+
+                #  Check for updated version of msgstr
+                message = list(filter(lambda m: m.msgctxt == msgctxt and m.msgid == msgid, messages))
+                if message and message[0]:
+                    #  Write update translation
+                    output_file.write(message[0].msgstr)
+
+                    # Skip lines until next translation. This should skip multiline msgstr
+                    while True:
+                        line = next(iterator)
+                        if line == "\n":
+                            output_file.write(line)
+                            break
+
+
+if __name__ == "__main__":
+    print("********************************************************************************************************************")
+    print("This creates a new file 'updated.po' that is a copy of original_file with any changed translations from updated_file")
+    print("This does not change the order of translations")
+    print("This does not include new translations, only existing changed translations")
+    print("Do not use this to import lionbridge/smarting translations")
+    print("********************************************************************************************************************")
+    parser = argparse.ArgumentParser(description="Update po file with translations from new po file. This ")
+    parser.add_argument("original_file", type=str, help="Input .po file inside resources/i18n/[LANG]/")
+    parser.add_argument("updated_file", type=str, help="Input .po file with updated translations added")
+    args = parser.parse_args()
+
+    messages_updated = parsePOFile(args.updated_file)
+    messages_original = parsePOFile(args.original_file)
+    different_messages = getDifferentMessages(messages_original, messages_updated)
+    updatePOFile(args.original_file, "updated.po", different_messages)