From 8386d094d3bc9226754b8e2d4b6728735283380b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 29 Apr 2020 02:08:09 +0200 Subject: [PATCH 1/2] Improve translation of 'tree support' in German As discussed in #7590. --- resources/i18n/de_DE/fdmprinter.def.json.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index c5157b5792..f68a80c40b 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -5118,7 +5118,7 @@ msgstr "Merkmale, die noch nicht vollständig ausgearbeitet wurden." #: fdmprinter.def.json msgctxt "support_tree_enable label" msgid "Tree Support" -msgstr "Baumstruktur" +msgstr "Baumstützstruktur" #: fdmprinter.def.json msgctxt "support_tree_enable description" From 64cfe423fed5b2552aa9f818e81f688b2de6a557 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 29 Apr 2020 11:49:45 +0200 Subject: [PATCH 2/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)