3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update company name to UltiMaker

Browse source 
Contributes to CURA-9808
This commit is contained in:
jspijker 2022-11-28 09:05:21 +01:00
parent 772cc0d57f
commit 696c0f8547
27 changed files with 69 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CrashHandler.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
import platform import platform
@ -110,7 +110,7 @@ class CrashHandler:
layout = QVBoxLayout(dialog) layout = QVBoxLayout(dialog)
label = QLabel() label = QLabel()
label.setText(catalog.i18nc("@label crash message", """<p><b>Oops, Ultimaker Cura has encountered something that doesn't seem right.</p></b> label.setText(catalog.i18nc("@label crash message", """<p><b>Oops, UltiMaker Cura has encountered something that doesn't seem right.</p></b>
<p>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.</p> <p>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.</p>
<p>Backups can be found in the configuration folder.</p> <p>Backups can be found in the configuration folder.</p>
<p>Please send us this Crash Report to fix the problem.</p> <p>Please send us this Crash Report to fix the problem.</p>
@ -119,7 +119,7 @@ class CrashHandler:
layout.addWidget(label) layout.addWidget(label)
# "send report" check box and show details # "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) self._send_report_checkbox.setChecked(True)
show_details_button = QPushButton(catalog.i18nc("@action:button", "Show detailed crash report"), dialog) show_details_button = QPushButton(catalog.i18nc("@action:button", "Show detailed crash report"), dialog)

4
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -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. # 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. 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( self._slicing_error_message.addAction(
action_id = "report_bug", action_id = "report_bug",
name = catalog.i18nc("@message:button", "Report a 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]" icon = "[no_icon]"
) )
self._slicing_error_message.actionTriggered.connect(self._reportBackendError) self._slicing_error_message.actionTriggered.connect(self._reportBackendError)

4
plugins/Marketplace/CloudSync/CloudPackageChecker.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
import json import json
@ -142,7 +142,7 @@ class CloudPackageChecker(QObject):
sync_message = Message(self._i18n_catalog.i18nc( sync_message = Message(self._i18n_catalog.i18nc(
"@info:generic", "@info:generic",
"Do you want to sync material and software packages with your account?"), "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", sync_message.addAction("sync",
name = self._i18n_catalog.i18nc("@action:button", "Sync"), name = self._i18n_catalog.i18nc("@action:button", "Sync"),
icon = "", icon = "",

4
plugins/Marketplace/CloudSync/DownloadPresenter.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
import tempfile import tempfile
@ -92,7 +92,7 @@ class DownloadPresenter:
lifetime = 0, lifetime = 0,
use_inactivity_timer = False, use_inactivity_timer = False,
progress = 0.0, 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: def _onFinished(self, package_id: str, reply: QNetworkReply) -> None:
self._progress[package_id]["received"] = self._progress[package_id]["total"] self._progress[package_id]["received"] = self._progress[package_id]["total"]

5
plugins/Marketplace/resources/qml/ManagedPackages.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
@ -12,7 +13,7 @@ Packages
bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner"); bannerVisible: UM.Preferences.getValue("cura/market_place_show_manage_packages_banner");
bannerIcon: UM.Theme.getIcon("ArrowDoubleCircleRight") 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" bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/4411125921426/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-manage"
onRemoveBanner: function() { onRemoveBanner: function() {
UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false); UM.Preferences.setValue("cura/market_place_show_manage_packages_banner", false);

4
plugins/Marketplace/resources/qml/Materials.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import UM 1.4 as UM import UM 1.4 as UM
@ -9,7 +9,7 @@ Packages
bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner") bannerVisible: UM.Preferences.getValue("cura/market_place_show_material_banner")
bannerIcon: UM.Theme.getIcon("Spool") 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" bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-materials"
onRemoveBanner: function() { onRemoveBanner: function() {
UM.Preferences.setValue("cura/market_place_show_material_banner", false); UM.Preferences.setValue("cura/market_place_show_material_banner", false);

4
plugins/Marketplace/resources/qml/Plugins.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import UM 1.4 as UM import UM 1.4 as UM
@ -9,7 +9,7 @@ Packages
bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner") bannerVisible: UM.Preferences.getValue("cura/market_place_show_plugin_banner")
bannerIcon: UM.Theme.getIcon("Shop") 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" bannerReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360/?utm_source=cura&utm_medium=software&utm_campaign=marketplace-learn-plugins"
onRemoveBanner: function() { onRemoveBanner: function() {
UM.Preferences.setValue("cura/market_place_show_plugin_banner", false) UM.Preferences.setValue("cura/market_place_show_plugin_banner", false)

8
plugins/Marketplace/resources/qml/VerifiedIcon.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
@ -18,9 +18,9 @@ Control
{ {
switch(packageData.packageType) switch(packageData.packageType)
{ {
case "plugin": return catalog.i18nc("@info", "Ultimaker Verified Plug-in"); case "plugin": return catalog.i18nc("@info", "UltiMaker Verified Plug-in");
case "material": return catalog.i18nc("@info", "Ultimaker Certified Material"); case "material": return catalog.i18nc("@info", "UltiMaker Certified Material");
default: return catalog.i18nc("@info", "Ultimaker Verified Package"); default: return catalog.i18nc("@info", "UltiMaker Verified Package");
} }
} }
visible: parent.hovered visible: parent.hovered

4
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -70,7 +70,7 @@ Window
left: parent.left left: parent.left
right: parent.right 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 wrapMode: Text.WordWrap
} }

6
plugins/UFPReader/__init__.py
View file

@ -1,5 +1,5 @@
#Copyright (c) 2019 Ultimaker B.V. # Copyright (c) 2022 UltiMaker B.V.
#Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import sys import sys
@ -19,7 +19,7 @@ def getMetaData():
{ {
"mime_type": "application/x-ufp", "mime_type": "application/x-ufp",
"extension": "ufp", "extension": "ufp",
"description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package")
} }
] ]
} }

6
plugins/UFPWriter/__init__.py
View file

@ -1,5 +1,5 @@
#Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2022 UltiMaker B.V.
#Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import sys import sys
@ -25,7 +25,7 @@ def getMetaData():
"mime_type": "application/x-ufp", "mime_type": "application/x-ufp",
"mode": MeshWriter.OutputMode.BinaryMode, "mode": MeshWriter.OutputMode.BinaryMode,
"extension": "ufp", "extension": "ufp",
"description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package") "description": i18n_catalog.i18nc("@item:inlistbox", "UltiMaker Format Package")
} }
] ]
} }

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.3 import QtQuick 2.3
@ -284,7 +284,7 @@ Item
MonitorInfoBlurb MonitorInfoBlurb
{ {
id: cameraDisabledInfo 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.") " Click \"Manage printer\" to visit Ultimaker Digital Factory and view this webcam.")
target: cameraButton target: cameraButton
} }

4
plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
@ -114,7 +114,7 @@ Component
UM.Label UM.Label
{ {
anchors.horizontalCenter: parent.horizontalCenter 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") font: UM.Theme.getFont("medium")
width: sendToFactoryImage.width width: sendToFactoryImage.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap

4
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
from time import time from time import time
@ -275,7 +275,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
message.addAction("monitor print", message.addAction("monitor print",
name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), name=I18N_CATALOG.i18nc("@action:button", "Monitor print"),
icon="", 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) 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" 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())) message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide()))

4
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
import os import os
@ -419,7 +419,7 @@ class CloudOutputDeviceManager:
machine.setMetaDataEntry(self.META_HOST_GUID, device.clusterData.host_guid) machine.setMetaDataEntry(self.META_HOST_GUID, device.clusterData.host_guid)
machine.setMetaDataEntry("group_name", device.name) machine.setMetaDataEntry("group_name", device.name)
machine.setMetaDataEntry("group_size", device.clusterSize) 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"<a href='https://digitalfactory.ultimaker.com?utm_source=cura&utm_medium=software&" \ digital_factory_link = f"<a href='https://digitalfactory.ultimaker.com?utm_source=cura&utm_medium=software&" \
f"utm_campaign=change-account-remove-printer'>{digital_factory_string}</a>" f"utm_campaign=change-account-remove-printer'>{digital_factory_string}</a>"
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) \ 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) \

5
plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py
View file

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
from UM import i18nCatalog from UM import i18nCatalog
from UM.Message import Message from UM.Message import Message
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
@ -19,7 +20,7 @@ class RemovedPrintersMessage(Message):
) )
message_text += "<br/><ul>{}</ul><br/>".format(device_names) message_text += "<br/><ul>{}</ul><br/>".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"<a href='https://digitalfactory.ultimaker.com?utm_source=cura&" \ website_link = f"<a href='https://digitalfactory.ultimaker.com?utm_source=cura&" \
f"utm_medium=software&utm_campaign=change-account-connect-printer'>{digital_factory_string}</a>." f"utm_medium=software&utm_campaign=change-account-connect-printer'>{digital_factory_string}</a>."

4
plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -27,7 +27,7 @@ Cura.MachineAction
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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") font: UM.Theme.getFont("medium")
} }

8
resources/qml/Account/GeneralOperations.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -16,7 +16,7 @@ Column
{ {
id: title id: title
anchors.horizontalCenter: parent.horizontalCenter 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") font: UM.Theme.getFont("large_bold")
} }
@ -36,7 +36,7 @@ Column
id: generalInformationPoints id: generalInformationPoints
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignLeft 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 lineHeight: 1.4
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -55,7 +55,7 @@ Column
{ {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
height: UM.Theme.getSize("account_button").height 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") onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=menu-signup")
} }
} }

4
resources/qml/Account/UserOperations.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -104,7 +104,7 @@ Column
width: parent.width width: parent.width
height: UM.Theme.getSize("account_button").height 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") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-account")
fixedWidthMode: false fixedWidthMode: false
} }

4
resources/qml/Actions.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
pragma Singleton pragma Singleton
@ -214,7 +214,7 @@ Item
Action Action
{ {
id: marketplaceMaterialsAction 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 Action

6
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.15 import QtQuick 2.15
@ -193,12 +193,12 @@ Item
if (addPrinterByIpScreen.hasRequestFinished) if (addPrinterByIpScreen.hasRequestFinished)
{ {
return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">" return catalog.i18nc("@label", "Could not connect to device.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>"; + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + "</a>";
} }
else else
{ {
return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">" return catalog.i18nc("@label", "The printer at this address has not responded yet.") + "<br /><br /><a href=\"https://ultimaker.com/in/cura/troubleshooting/network?utm_source=cura&utm_medium=software&utm_campaign=add-network-printer-error\">"
+ catalog.i18nc("@label", "Can't connect to your Ultimaker printer?") + "</a>"; + catalog.i18nc("@label", "Can't connect to your UltiMaker printer?") + "</a>";
} }
} }
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)

4
resources/qml/WelcomePages/AddThirdPartyPrinter.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -99,7 +99,7 @@ Item
id: backButton id: backButton
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom 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() onClicked: goToUltimakerPrinter()
} }

4
resources/qml/WelcomePages/AddUltimakerOrThirdPartyPrinter.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -52,7 +52,7 @@ Control
id: ultimakerPrinterCard id: ultimakerPrinterCard
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
onClicked: goToUltimakerPrinter onClicked: goToUltimakerPrinter
text: catalog.i18nc("@button", "Ultimaker printer") text: catalog.i18nc("@button", "UltiMaker printer")
imageSource: UM.Theme.getImage("ultimaker_printer") imageSource: UM.Theme.getImage("ultimaker_printer")
} }

8
resources/qml/WelcomePages/AddUltimakerPrinter.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -30,7 +30,7 @@ Control
UM.Label UM.Label
{ {
Layout.fillWidth: true 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 wrapMode: Text.WordWrap
} }
@ -67,7 +67,7 @@ Control
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("default_bold") 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 ColumnLayout
@ -77,7 +77,7 @@ Control
Repeater { Repeater {
model: [ 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", "Follow the procedure to add a new printer"),
catalog.i18nc("@info", "Your new printer will automatically appear in Cura"), catalog.i18nc("@info", "Your new printer will automatically appear in Cura"),
] ]

6
resources/qml/WelcomePages/CloudContent.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -61,7 +61,7 @@ Item
id: titleLabel id: titleLabel
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter 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") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge") font: UM.Theme.getFont("huge")
} }
@ -172,7 +172,7 @@ Item
id: communityTextLabel id: communityTextLabel
anchors.horizontalCenter: communityColumn.horizontalCenter anchors.horizontalCenter: communityColumn.horizontalCenter
width: parent.width 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 horizontalAlignment: Text.AlignHCenter
} }
} }

6
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -21,7 +21,7 @@ Item
anchors.top: parent.top anchors.top: parent.top
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter 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") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge") font: UM.Theme.getFont("huge")
} }
@ -53,7 +53,7 @@ Item
width: parent.width width: parent.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter 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 wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
} }

6
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -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. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10 import QtQuick 2.10
@ -53,7 +53,7 @@ Item
id: titleLabel id: titleLabel
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter 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") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("huge_bold") font: UM.Theme.getFont("huge_bold")
} }
@ -64,7 +64,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width 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") font: UM.Theme.getFont("medium")
} }