From 64cfe423fed5b2552aa9f818e81f688b2de6a557 Mon Sep 17 00:00:00 2001
From: Kostas Karmas <konskarm@gmail.com>
Date: Wed, 29 Apr 2020 11:49:45 +0200
Subject: [PATCH 1/2] Fix moving to next page when no printers in account

Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
---
 resources/qml/WelcomePages/CloudContent.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml
index a14c6600cd..36a7b9a923 100644
--- a/resources/qml/WelcomePages/CloudContent.qml
+++ b/resources/qml/WelcomePages/CloudContent.qml
@@ -16,8 +16,10 @@ Item
     UM.I18nCatalog { id: catalog; name: "cura" }
 
     property bool newCloudPrintersDetected: Cura.API.account.newCloudPrintersDetected
+    signal cloudPrintersDetected(bool newCloudPrintersDetected)
 
-    onNewCloudPrintersDetectedChanged:
+    Component.onCompleted: Cura.API.account.cloudPrintersDetectedChanged.connect(cloudPrintersDetected)
+    onCloudPrintersDetected:
     {
         // When the user signs in successfully, it will be checked whether he/she has cloud printers connected to
         // the account. If he/she does, then the welcome wizard can close. If not, then proceed to the next page (if any)

From 3604e75cce1eca8d150cbfa843a7f8d0083894f1 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Wed, 29 Apr 2020 13:02:48 +0200
Subject: [PATCH 2/2] CURA-7409 Update keep/discard dialog.

---
 .../qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index a7701cf059..294a2474d6 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -113,14 +113,14 @@ UM.Dialog
             TableViewColumn
             {
                 role: "original_value"
-                title: catalog.i18nc("@title:column", "Default")
+                title: Cura.MachineManager.activeQualityDisplayNameMap["main"]
                 width: (tableView.width * 0.3) | 0
                 delegate: defaultDelegate
             }
             TableViewColumn
             {
                 role: "user_value"
-                title: catalog.i18nc("@title:column", "Customized")
+                title: catalog.i18nc("@title:column", "Current changes")
                 width: (tableView.width * 0.3) | 0
             }
             section.property: "category"
@@ -192,7 +192,7 @@ UM.Dialog
         Button
         {
             id: discardButton
-            text: catalog.i18nc("@action:button", "Discard");
+            text: catalog.i18nc("@action:button", "Discard changes");
             anchors.right: parent.right
             onClicked:
             {
@@ -205,7 +205,7 @@ UM.Dialog
         Button
         {
             id: keepButton
-            text: catalog.i18nc("@action:button", "Keep");
+            text: catalog.i18nc("@action:button", "Keep changes");
             anchors.right: discardButton.left
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
             onClicked: