diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index 541a270058..af27193023 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import platform @@ -110,7 +110,7 @@ class CrashHandler: layout = QVBoxLayout(dialog) label = QLabel() - label.setText(catalog.i18nc("@label crash message", """

Oops, Ultimaker Cura has encountered something that doesn't seem right.

+ label.setText(catalog.i18nc("@label crash message", """

Oops, UltiMaker Cura has encountered something that doesn't seem right.

We encountered an unrecoverable error during start up. It was possibly caused by some incorrect configuration files. We suggest to backup and reset your configuration.

Backups can be found in the configuration folder.

Please send us this Crash Report to fix the problem.

@@ -119,7 +119,7 @@ class CrashHandler: layout.addWidget(label) # "send report" check box and show details - self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to Ultimaker"), dialog) + self._send_report_checkbox = QCheckBox(catalog.i18nc("@action:button", "Send crash report to UltiMaker"), dialog) self._send_report_checkbox.setChecked(True) show_details_button = QPushButton(catalog.i18nc("@action:button", "Show detailed crash report"), dialog) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index db27f8a6a3..4c6258880d 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import argparse #To run the engine in debug mode if the front-end is in debug mode. @@ -166,7 +166,7 @@ class CuraEngineBackend(QObject, Backend): self._slicing_error_message.addAction( action_id = "report_bug", name = catalog.i18nc("@message:button", "Report a bug"), - description = catalog.i18nc("@message:description", "Report a bug on Ultimaker Cura's issue tracker."), + description = catalog.i18nc("@message:description", "Report a bug on UltiMaker Cura's issue tracker."), icon = "[no_icon]" ) self._slicing_error_message.actionTriggered.connect(self._reportBackendError) diff --git a/plugins/Marketplace/CloudSync/CloudPackageChecker.py b/plugins/Marketplace/CloudSync/CloudPackageChecker.py index 53087e0502..a609052625 100644 --- a/plugins/Marketplace/CloudSync/CloudPackageChecker.py +++ b/plugins/Marketplace/CloudSync/CloudPackageChecker.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json @@ -142,7 +142,7 @@ class CloudPackageChecker(QObject): sync_message = Message(self._i18n_catalog.i18nc( "@info:generic", "Do you want to sync material and software packages with your account?"), - title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account", )) + title = self._i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account", )) sync_message.addAction("sync", name = self._i18n_catalog.i18nc("@action:button", "Sync"), icon = "", diff --git a/plugins/Marketplace/CloudSync/DownloadPresenter.py b/plugins/Marketplace/CloudSync/DownloadPresenter.py index 8325c27eb7..82755b3029 100644 --- a/plugins/Marketplace/CloudSync/DownloadPresenter.py +++ b/plugins/Marketplace/CloudSync/DownloadPresenter.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import tempfile @@ -92,7 +92,7 @@ class DownloadPresenter: lifetime = 0, use_inactivity_timer = False, progress = 0.0, - title = i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account")) + title = i18n_catalog.i18nc("@info:title", "Changes detected from your UltiMaker account")) def _onFinished(self, package_id: str, reply: QNetworkReply) -> None: self._progress[package_id]["received"] = self._progress[package_id]["total"] diff --git a/plugins/Marketplace/resources/qml/ManagedPackages.qml b/plugins/Marketplace/resources/qml/ManagedPackages.qml index 9358a04f07..6304705aa6 100644 --- a/plugins/Marketplace/resources/qml/ManagedPackages.qml +++ b/plugins/Marketplace/resources/qml/ManagedPackages.qml @@ -1,5 +1,6 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. + import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 @@ -12,7 +13,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner"); bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight") - bannerText: catalog.i18nc("@text", "Manage your Ultimaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") + bannerText: catalog.i18nc("@text", "Manage your UltiMaker Cura plugins and material profiles here. Make sure to keep your plugins up to date and backup your setup regularly.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); diff --git a/plugins/Marketplace/resources/qml/Materials.qml b/plugins/Marketplace/resources/qml/Materials.qml index c10a937d67..27cb75c332 100644 --- a/plugins/Marketplace/resources/qml/Materials.qml +++ b/plugins/Marketplace/resources/qml/Materials.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import UM 1.4 as UM @@ -9,7 +9,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner") bannerIcon: UM.Theme.getIcon("Spool") - bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your Ultimaker 3D printers.") + bannerText: catalog.i18nc("@text", "Select and install material profiles optimised for your UltiMaker 3D printers.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_material_banner", false); diff --git a/plugins/Marketplace/resources/qml/Plugins.qml b/plugins/Marketplace/resources/qml/Plugins.qml index 739e0c01a7..68c66a6013 100644 --- a/plugins/Marketplace/resources/qml/Plugins.qml +++ b/plugins/Marketplace/resources/qml/Plugins.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import UM 1.4 as UM @@ -9,7 +9,7 @@ Packages bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner") bannerIcon: UM.Theme.getIcon("Shop") - bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your Ultimaker Cura experience with plugins contributed by our amazing community of users.") + bannerText: catalog.i18nc("@text", "Streamline your workflow and customize your UltiMaker Cura experience with plugins contributed by our amazing community of users.") bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-plugins" onRemoveBanner: function() { UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) diff --git a/plugins/Marketplace/resources/qml/VerifiedIcon.qml b/plugins/Marketplace/resources/qml/VerifiedIcon.qml index e701c5a91b..e439d99860 100644 --- a/plugins/Marketplace/resources/qml/VerifiedIcon.qml +++ b/plugins/Marketplace/resources/qml/VerifiedIcon.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -18,9 +18,9 @@ Control { switch(packageData.packageType) { - case "plugin": return catalog.i18nc("@info", "Ultimaker Verified Plug-in"); - case "material": return catalog.i18nc("@info", "Ultimaker Certified Material"); - default: return catalog.i18nc("@info", "Ultimaker Verified Package"); + case "plugin": return catalog.i18nc("@info", "UltiMaker Verified Plug-in"); + case "material": return catalog.i18nc("@info", "UltiMaker Certified Material"); + default: return catalog.i18nc("@info", "UltiMaker Verified Package"); } } visible: parent.hovered diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 310fa29c17..9a56823b40 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -70,7 +70,7 @@ Window left: parent.left 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:") + 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:") wrapMode: Text.WordWrap } diff --git a/plugins/UFPReader/__init__.py b/plugins/UFPReader/__init__.py index cfea4b9882..33bdc14dae 100644 --- a/plugins/UFPReader/__init__.py +++ b/plugins/UFPReader/__init__.py @@ -1,5 +1,5 @@ -#Copyright (c) 2019 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. import sys @@ -19,7 +19,7 @@ def getMetaData(): { "mime_type": "application/x-ufp", "extension": "ufp", - "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") + "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package") } ] } diff --git a/plugins/UFPWriter/__init__.py b/plugins/UFPWriter/__init__.py index 9db6b042f8..48ffee327c 100644 --- a/plugins/UFPWriter/__init__.py +++ b/plugins/UFPWriter/__init__.py @@ -1,5 +1,5 @@ -#Copyright (c) 2018 Ultimaker B.V. -#Cura is released under the terms of the LGPLv3 or higher. +# Copyright (c) 2022 UltiMaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. import sys @@ -25,7 +25,7 @@ def getMetaData(): "mime_type": "application/x-ufp", "mode": MeshWriter.OutputMode.BinaryMode, "extension": "ufp", - "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") + "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package") } ] } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 9d6ffba17b..3340bc6f46 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 @@ -284,7 +284,7 @@ Item MonitorInfoBlurb { id: cameraDisabledInfo - text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura." + + text: catalog.i18nc("@info", "Webcam feeds for cloud printers cannot be viewed from UltiMaker Cura." + " Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam.") target: cameraButton } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index 33e8adf256..816bc8f8e8 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -114,7 +114,7 @@ Component UM.Label { anchors.horizontalCenter: parent.horizontalCenter - text: catalog.i18nc("@info", "Monitor your printers from everywhere using Ultimaker Digital Factory") + text: catalog.i18nc("@info", "Monitor your printers from everywhere using UltiMaker Digital Factory") font: UM.Theme.getFont("medium") width: sendToFactoryImage.width wrapMode: Text.WordWrap diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 9daf563460..d2363217b8 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from time import time @@ -275,7 +275,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): message.addAction("monitor print", name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), icon="", - description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in Ultimaker Digital Factory"), + description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in UltiMaker Digital Factory"), button_align=message.ActionButtonAlignment.ALIGN_RIGHT) df_url = f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=message-printjob-sent" message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide())) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index abfe863749..346a55bf95 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os @@ -419,7 +419,7 @@ class CloudOutputDeviceManager: machine.setMetaDataEntry(self.META_HOST_GUID, device.clusterData.host_guid) machine.setMetaDataEntry("group_name", device.name) machine.setMetaDataEntry("group_size", device.clusterSize) - digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") + digital_factory_string = self.i18n_catalog.i18nc("info:name", "UltiMaker Digital Factory") digital_factory_link = f"{digital_factory_string}" removal_warning_string = self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "{printer_name} will be removed until the next account sync.").format(printer_name = device.name) \ diff --git a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py index caed6ddf91..4323c4ba21 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py @@ -1,5 +1,6 @@ -# Copyright (c) 2022 Ultimaker B.V. +# Copyright (c) 2022 UltiMaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from UM import i18nCatalog from UM.Message import Message from cura.CuraApplication import CuraApplication @@ -19,7 +20,7 @@ class RemovedPrintersMessage(Message): ) message_text += "

".format(device_names) - digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") + digital_factory_string = self.i18n_catalog.i18nc("info:name", "UltiMaker Digital Factory") website_link = f"{digital_factory_string}." diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml index 8136e63a47..abd3462fc6 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -27,7 +27,7 @@ Cura.MachineAction anchors.topMargin: UM.Theme.getSize("default_margin").height width: parent.width wrapMode: Text.WordWrap - text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original") + text: catalog.i18nc("@label","Please select any upgrades made to this UltiMaker Original") font: UM.Theme.getFont("medium") } diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index da62124f3f..bdc2a37aca 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -16,7 +16,7 @@ Column { id: title anchors.horizontalCenter: parent.horizontalCenter - text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") + text: catalog.i18nc("@label", "Sign in to the UltiMaker platform") font: UM.Theme.getFont("large_bold") } @@ -36,7 +36,7 @@ Column id: generalInformationPoints anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignLeft - text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community") + text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the UltiMaker community") lineHeight: 1.4 wrapMode: Text.NoWrap } @@ -55,7 +55,7 @@ Column { anchors.horizontalCenter: parent.horizontalCenter height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Create a free Ultimaker account") + text: catalog.i18nc("@button", "Create a free UltiMaker account") onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=menu-signup") } } diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index 9e5d082738..144e9a1b65 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -104,7 +104,7 @@ Column width: parent.width height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Ultimaker Account") + text: catalog.i18nc("@button", "UltiMaker Account") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-account") fixedWidthMode: false } diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 00089dd85b..be94c53bef 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -214,7 +214,7 @@ Item Action { id: marketplaceMaterialsAction - text: catalog.i18nc("@action:inmenu Marketplace is a brand name of Ultimaker's, so don't translate.", "Add more materials from Marketplace") + text: catalog.i18nc("@action:inmenu Marketplace is a brand name of UltiMaker's, so don't translate.", "Add more materials from Marketplace") } Action diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 90fdd2be91..a91cef0ef7 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.15 @@ -193,12 +193,12 @@ Item if (addPrinterByIpScreen.hasRequestFinished) { return catalog.i18nc("@label", "Could not connect to device.") + "

" - + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + ""; + + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + ""; } else { return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "

" - + catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + ""; + + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + ""; } } onLinkActivated: Qt.openUrlExternally(link) diff --git a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml index f25cdccbf1..598209760a 100644 --- a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml +++ b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -99,7 +99,7 @@ Item id: backButton anchors.left: parent.left anchors.bottom: parent.bottom - text: catalog.i18nc("@button", "Add Ultimaker printer via Digital Factory") + text: catalog.i18nc("@button", "Add UltiMaker printer via Digital Factory") onClicked: goToUltimakerPrinter() } diff --git a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml index c76979fecf..4b7a07881a 100644 --- a/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -52,7 +52,7 @@ Control id: ultimakerPrinterCard Layout.alignment: Qt.AlignBottom onClicked: goToUltimakerPrinter - text: catalog.i18nc("@button", "Ultimaker printer") + text: catalog.i18nc("@button", "UltiMaker printer") imageSource: UM.Theme.getImage("ultimaker_printer") } diff --git a/resources/qml/WelcomePages/AddUltimakerPrinter.qml b/resources/qml/WelcomePages/AddUltimakerPrinter.qml index d3e29dca8a..54d1b55483 100644 --- a/resources/qml/WelcomePages/AddUltimakerPrinter.qml +++ b/resources/qml/WelcomePages/AddUltimakerPrinter.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -30,7 +30,7 @@ Control UM.Label { Layout.fillWidth: true - text: catalog.i18nc("@label", "New Ultimaker printers can be connected to Digital Factory and monitored remotely.") + text: catalog.i18nc("@label", "New UltiMaker printers can be connected to Digital Factory and monitored remotely.") wrapMode: Text.WordWrap } @@ -67,7 +67,7 @@ Control Layout.alignment: Qt.AlignTop wrapMode: Text.WordWrap font: UM.Theme.getFont("default_bold") - text: catalog.i18nc("@label", "If you are trying to add a new Ultimaker printer to Cura") + text: catalog.i18nc("@label", "If you are trying to add a new UltiMaker printer to Cura") } ColumnLayout @@ -77,7 +77,7 @@ Control Repeater { model: [ - catalog.i18nc("@info", "Sign in into Ultimaker Digilal Factory"), + catalog.i18nc("@info", "Sign in into UltiMaker Digilal Factory"), catalog.i18nc("@info", "Follow the procedure to add a new printer"), catalog.i18nc("@info", "Your new printer will automatically appear in Cura"), ] diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index cf830a9b36..7d9dd79142 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -61,7 +61,7 @@ Item id: titleLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") + text: catalog.i18nc("@label", "Sign in to the UltiMaker platform") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") } @@ -172,7 +172,7 @@ Item 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") + text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the UltiMaker Community") horizontalAlignment: Text.AlignHCenter } } diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index ece437890e..16e6e07899 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -21,7 +21,7 @@ Item anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura") + text: catalog.i18nc("@label", "Help us to improve UltiMaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") } @@ -53,7 +53,7 @@ Item width: parent.width anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:") + 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") } diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 4123535cc9..d3a3404c28 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -53,7 +53,7 @@ Item id: titleLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") + text: catalog.i18nc("@label", "Welcome to UltiMaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge_bold") } @@ -64,7 +64,7 @@ Item 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.") + text: catalog.i18nc("@text", "Please follow these steps to set up UltiMaker Cura. This will only take a few moments.") font: UM.Theme.getFont("medium") }