diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 4abab245e8..3742806716 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -145,9 +145,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """Set all the interface elements and texts for this output device.""" self.setPriority(2) # Make sure we end up below the local networking and above 'save to file'. - self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via Cloud")) - self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via Cloud")) - self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via Cloud")) + self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via cloud")) + self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via cloud")) + self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via cloud")) def _update(self) -> None: """Called when the network data should be updated.""" diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index 92b17437a5..a5ce7bc23a 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -262,7 +262,7 @@ class CloudOutputDeviceManager: message_text = self.I18N_CATALOG.i18nc( "info:status", - "Cloud printers added from your account:", + "Printers added from Digital Factory:", device_names ) message.setText(message_text) @@ -321,21 +321,21 @@ class CloudOutputDeviceManager: self._removed_printers_message = Message( title = self.I18N_CATALOG.i18ncp( "info:status", - "Cloud connection is not available for a printer", - "Cloud connection is not available for some printers", + "A cloud connection is not available for a printer", + "A cloud connection is not available for some printers", len(self.reported_device_ids) ) ) - device_names = "\n".join(["
  • {} ({})
  • ".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids]) + device_names = "".join(["
  • {} ({})
  • ".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids]) message_text = self.I18N_CATALOG.i18ncp( "info:status", - "The following cloud printer is not linked to your account:\n", - "The following cloud printers are not linked to your account:\n", + "This printer is not linked to the Digital Factory:", + "These printers are not linked to the Digital Factory:", len(self.reported_device_ids) ) message_text += self.I18N_CATALOG.i18nc( "info:status", - "\nTo establish a connection, please visit the " + "To establish a connection, please visit the " "Ultimaker Digital Factory.", device_names ) @@ -343,12 +343,12 @@ class CloudOutputDeviceManager: self._removed_printers_message.addAction("keep_printer_configurations_action", name = self.I18N_CATALOG.i18nc("@action:button", "Keep printer configurations"), icon = "", - description = "Keep the configuration of the cloud printer(s) synced with Cura which are not linked to your account.", + description = "Keep cloud printers in Ultimaker Cura when not connected to your account.", button_align = Message.ActionButtonAlignment.ALIGN_RIGHT) self._removed_printers_message.addAction("remove_printers_action", name = self.I18N_CATALOG.i18nc("@action:button", "Remove printers"), icon = "", - description = "Remove the cloud printer(s) which are not linked to your account.", + description = "Remove cloud printer(s) which aren't linked to your account.", button_style = Message.ActionButtonStyle.SECONDARY, button_align = Message.ActionButtonAlignment.ALIGN_LEFT) self._removed_printers_message.actionTriggered.connect(self._onRemovedPrintersMessageActionTriggered) diff --git a/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py index 311356de8e..c453537d81 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py @@ -30,7 +30,7 @@ class CloudFlowMessage(Message): option_state=False, image_source=QUrl.fromLocalFile(image_path), image_caption=I18N_CATALOG.i18nc("@info:status Ultimaker Cloud should not be translated.", - "Connect to Ultimaker Cloud"), + "Connect to Ultimaker Digital Factory"), ) self._address = address self.addAction("", I18N_CATALOG.i18nc("@action", "Get started"), "", "")