Merge remote-tracking branch 'origin/5.3'

# Conflicts:
#	conanfile.py

plugins/Marketplace/plugin.json

@@ -3,6 +3,6 @@
     "author": "Ultimaker B.V.",
     "version": "1.0.0",
     "api": 8,
-    "description": "Manages extensions to the application and allows browsing extensions from the Ultimaker website.",
+    "description": "Manages extensions to the application and allows browsing extensions from the UltiMaker website.",
     "i18n-catalog": "cura"
 }

plugins/Marketplace/resources/qml/Marketplace.qml

@@ -285,4 +285,33 @@ Window
             }
         }
     }
+
+    Rectangle
+    {
+        color: UM.Theme.getColor("main_background")
+        anchors.fill: parent
+        visible: !Cura.API.account.isLoggedIn && CuraApplication.isEnterprise
+
+        UM.Label
+        {
+            id: signInLabel
+            anchors.centerIn: parent
+            width: Math.round(UM.Theme.getSize("modal_window_minimum").width / 2.5)
+            text: catalog.i18nc("@description","Please sign in to get verified plugins and materials for UltiMaker Cura Enterprise")
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Cura.PrimaryButton
+        {
+            id: loginButton
+            width: UM.Theme.getSize("account_button").width
+            height: UM.Theme.getSize("account_button").height
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: signInLabel.bottom
+            anchors.topMargin: UM.Theme.getSize("default_margin").height * 2
+            text: catalog.i18nc("@button", "Sign in")
+            fixedWidthMode: true
+            onClicked: Cura.API.account.login()
+        }
+    }
 }

plugins/UM3NetworkPrinting/plugin.json

@@ -1,7 +1,7 @@
 {
-    "name": "Ultimaker Network Connection",
+    "name": "UltiMaker Network Connection",
     "author": "Ultimaker B.V.",
-    "description": "Manages network connections to Ultimaker networked printers.",
+    "description": "Manages network connections to UltiMaker networked printers.",
     "version": "2.0.0",
     "api": 8,
     "i18n-catalog": "cura"

plugins/UM3NetworkPrinting/src/Messages/LegacyDeviceNoLongerSupportedMessage.py

@@ -16,7 +16,7 @@ class LegacyDeviceNoLongerSupportedMessage(Message):
     def __init__(self) -> None:
         super().__init__(
             text = I18N_CATALOG.i18nc("@info:status", "You are attempting to connect to a printer that is not "
-                                                      "running Ultimaker Connect. Please update the printer to the "
+                                                      "running UltiMaker Connect. Please update the printer to the "
                                                       "latest firmware."),
             title = I18N_CATALOG.i18nc("@info:title", "Update your printer"),
             lifetime = 10,

plugins/UltimakerMachineActions/plugin.json

@@ -1,5 +1,5 @@
 {
-    "name": "Ultimaker machine actions",
+    "name": "UltiMaker machine actions",
     "author": "Ultimaker B.V.",
     "version": "1.0.1",
     "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).",