GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 17:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/eMotion-Tech/Cura

Browse Source
This commit is contained in:
NicolasBOYARD 2023-05-25 14:32:15 +02:00
commit 98698321d7
23 changed files with 565 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Arranging/Nest2DArrange.py
View File

@ -99,6 +99,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
config = NfpConfig() config = NfpConfig()
config.accuracy = 1.0 config.accuracy = 1.0
config.alignment = NfpConfig.Alignment.DONT_ALIGN
num_bins = nest(node_items, build_plate_bounding_box, spacing, config) num_bins = nest(node_items, build_plate_bounding_box, spacing, config)

18
cura/BuildVolume.py
View File

@ -648,11 +648,13 @@ class BuildVolume(SceneNode):
self._width = self._global_container_stack.getProperty("machine_width", "value") self._width = self._global_container_stack.getProperty("machine_width", "value")
machine_height = self._global_container_stack.getProperty("machine_height", "value") machine_height = self._global_container_stack.getProperty("machine_height", "value")
if self._global_container_stack.getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1: if self._global_container_stack.getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1:
self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height) new_height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height)
if self._height < (machine_height * self._scale_vector.z):
if self._height > new_height:
self._build_volume_message.show() self._build_volume_message.show()
else: elif self._height < new_height:
self._build_volume_message.hide() self._build_volume_message.hide()
self._height = new_height
else: else:
self._height = self._global_container_stack.getProperty("machine_height", "value") self._height = self._global_container_stack.getProperty("machine_height", "value")
self._build_volume_message.hide() self._build_volume_message.hide()
@ -690,11 +692,15 @@ class BuildVolume(SceneNode):
if setting_key == "print_sequence": if setting_key == "print_sequence":
machine_height = self._global_container_stack.getProperty("machine_height", "value") machine_height = self._global_container_stack.getProperty("machine_height", "value")
if self._application.getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1: if self._application.getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1:
self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height) new_height = min(
if self._height < (machine_height * self._scale_vector.z): self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z,
machine_height)
if self._height > new_height:
self._build_volume_message.show() self._build_volume_message.show()
else: elif self._height < new_height:
self._build_volume_message.hide() self._build_volume_message.hide()
self._height = new_height
else: else:
self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z
self._build_volume_message.hide() self._build_volume_message.hide()

6
plugins/PostProcessingPlugin/scripts/FilamentChange.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2021 Ultimaker B.V. # Copyright (c) 2023 Ultimaker B.V.
# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
# Modification 06.09.2020 # Modification 06.09.2020
@ -199,7 +199,7 @@ class FilamentChange(Script):
if enable_before_macro: if enable_before_macro:
color_change = color_change + before_macro + "\n" color_change = color_change + before_macro + "\n"
color_change = color_change + "M600\n" color_change = color_change + "M600"
if not firmware_config: if not firmware_config:
if initial_retract is not None and initial_retract > 0.: if initial_retract is not None and initial_retract > 0.:
@ -220,6 +220,8 @@ class FilamentChange(Script):
if z_pos is not None and z_pos > 0.: if z_pos is not None and z_pos > 0.:
color_change = color_change + (" Z%.2f" % z_pos) color_change = color_change + (" Z%.2f" % z_pos)
color_change = color_change + "\n"
if enable_after_macro: if enable_after_macro:
color_change = color_change + after_macro + "\n" color_change = color_change + after_macro + "\n"

8
resources/i18n/cs_CZ/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2023-02-16 20:28+0100\n" "PO-Revision-Date: 2023-02-16 20:28+0100\n"
"Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n" "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n" "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
@ -3689,17 +3689,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Odstranit tiskárnu" msgstr "Odstranit tiskárnu"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Tisk přes síť" msgstr "Tisk přes síť"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Tisk přes síť" msgstr "Tisk přes síť"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Připojeno přes síť" msgstr "Připojeno přes síť"

932
resources/i18n/cura.pot
View File

File diff suppressed because it is too large Load Diff

8
resources/i18n/de_DE/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3675,17 +3675,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Drucker entfernen" msgstr "Drucker entfernen"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Drucken über Netzwerk" msgstr "Drucken über Netzwerk"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Drücken über Netzwerk" msgstr "Drücken über Netzwerk"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Über Netzwerk verbunden" msgstr "Über Netzwerk verbunden"

8
resources/i18n/es_ES/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.3\n" "Project-Id-Version: Cura 5.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3675,17 +3675,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Eliminar impresoras" msgstr "Eliminar impresoras"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Imprimir a través de la red" msgstr "Imprimir a través de la red"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Imprime a través de la red" msgstr "Imprime a través de la red"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Conectado a través de la red" msgstr "Conectado a través de la red"

8
resources/i18n/fi_FI/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2022-07-15 10:53+0200\n" "PO-Revision-Date: 2022-07-15 10:53+0200\n"
"Last-Translator: Bothof <info@bothof.nl>\n" "Last-Translator: Bothof <info@bothof.nl>\n"
"Language-Team: Finnish\n" "Language-Team: Finnish\n"
@ -3650,17 +3650,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "" msgstr ""
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Tulosta verkon kautta" msgstr "Tulosta verkon kautta"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Tulosta verkon kautta" msgstr "Tulosta verkon kautta"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "" msgstr ""

8
resources/i18n/fr_FR/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3678,17 +3678,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Supprimer des imprimantes" msgstr "Supprimer des imprimantes"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Imprimer sur le réseau" msgstr "Imprimer sur le réseau"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Imprimer sur le réseau" msgstr "Imprimer sur le réseau"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Connecté sur le réseau" msgstr "Connecté sur le réseau"

8
resources/i18n/hu_HU/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2020-03-24 09:36+0100\n" "PO-Revision-Date: 2020-03-24 09:36+0100\n"
"Last-Translator: Nagy Attila <vokroot@gmail.com>\n" "Last-Translator: Nagy Attila <vokroot@gmail.com>\n"
"Language-Team: ATI-SZOFT\n" "Language-Team: ATI-SZOFT\n"
@ -3666,17 +3666,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "" msgstr ""
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Hálózati nyomtatás" msgstr "Hálózati nyomtatás"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Hálózati nyomtatás" msgstr "Hálózati nyomtatás"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Csatlakozva hálózaton keresztül" msgstr "Csatlakozva hálózaton keresztül"

8
resources/i18n/it_IT/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3678,17 +3678,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Rimuovere le stampanti" msgstr "Rimuovere le stampanti"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Stampa sulla rete" msgstr "Stampa sulla rete"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Stampa sulla rete" msgstr "Stampa sulla rete"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Collegato alla rete" msgstr "Collegato alla rete"

8
resources/i18n/ja_JP/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3666,17 +3666,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "プリンターを取り除く" msgstr "プリンターを取り除く"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "ネットワーク上のプリント" msgstr "ネットワーク上のプリント"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "ネットワークのプリント" msgstr "ネットワークのプリント"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "ネットワーク上で接続" msgstr "ネットワーク上で接続"

8
resources/i18n/ko_KR/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3665,17 +3665,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "프린터 제거" msgstr "프린터 제거"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "네트워크를 통해 프린팅" msgstr "네트워크를 통해 프린팅"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "네트워크를 통해 프린팅" msgstr "네트워크를 통해 프린팅"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "네트워크를 통해 연결됨" msgstr "네트워크를 통해 연결됨"

8
resources/i18n/nl_NL/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3678,17 +3678,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Printers verwijderen" msgstr "Printers verwijderen"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Printen via netwerk" msgstr "Printen via netwerk"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Printen via netwerk" msgstr "Printen via netwerk"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Via het netwerk verbonden" msgstr "Via het netwerk verbonden"

8
resources/i18n/pl_PL/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2021-09-07 08:02+0200\n" "PO-Revision-Date: 2021-09-07 08:02+0200\n"
"Last-Translator: Mariusz Matłosz <matliks@gmail.com>\n" "Last-Translator: Mariusz Matłosz <matliks@gmail.com>\n"
"Language-Team: Mariusz Matłosz <matliks@gmail.com>, reprapy.pl\n" "Language-Team: Mariusz Matłosz <matliks@gmail.com>, reprapy.pl\n"
@ -3667,17 +3667,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "" msgstr ""
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Drukuj przez sieć" msgstr "Drukuj przez sieć"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Drukuj przez sieć" msgstr "Drukuj przez sieć"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Połączone przez sieć" msgstr "Połączone przez sieć"

8
resources/i18n/pt_BR/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.0\n" "Project-Id-Version: Cura 5.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2023-02-17 17:37+0100\n" "PO-Revision-Date: 2023-02-17 17:37+0100\n"
"Last-Translator: Cláudio Sampaio <patola@gmail.com>\n" "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
"Language-Team: Cláudio Sampaio <patola@gmail.com>\n" "Language-Team: Cláudio Sampaio <patola@gmail.com>\n"
@ -3678,17 +3678,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Remover impressoras" msgstr "Remover impressoras"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Imprimir pela rede" msgstr "Imprimir pela rede"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Imprime pela rede" msgstr "Imprime pela rede"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Conectado pela rede" msgstr "Conectado pela rede"

8
resources/i18n/pt_PT/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3676,17 +3676,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Remover impressoras" msgstr "Remover impressoras"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Imprimir através da rede" msgstr "Imprimir através da rede"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Imprimir através da rede" msgstr "Imprimir através da rede"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Ligado através da rede" msgstr "Ligado através da rede"

8
resources/i18n/ru_RU/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3687,17 +3687,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Удалить принтеры" msgstr "Удалить принтеры"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Печать через сеть" msgstr "Печать через сеть"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Печать через сеть" msgstr "Печать через сеть"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Подключен по сети" msgstr "Подключен по сети"

8
resources/i18n/tr_TR/cura.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3678,17 +3678,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "Yazıcıları kaldır" msgstr "Yazıcıları kaldır"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "Ağ üzerinden yazdır" msgstr "Ağ üzerinden yazdır"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "Ağ üzerinden yazdır" msgstr "Ağ üzerinden yazdır"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "Ağ üzerinden bağlandı" msgstr "Ağ üzerinden bağlandı"

8
resources/i18n/zh_CN/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2022-07-15 11:06+0200\n" "PO-Revision-Date: 2022-07-15 11:06+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -3667,17 +3667,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "删除打印机" msgstr "删除打印机"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "通过网络打印" msgstr "通过网络打印"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "通过网络打印" msgstr "通过网络打印"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "已通过网络连接" msgstr "已通过网络连接"

8
resources/i18n/zh_TW/cura.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 5.1\n" "Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-27 12:22+0000\n" "POT-Creation-Date: 2023-05-15 14:32+0000\n"
"PO-Revision-Date: 2022-01-02 19:59+0800\n" "PO-Revision-Date: 2022-01-02 19:59+0800\n"
"Last-Translator: Valen Chang <carf17771@gmail.com>\n" "Last-Translator: Valen Chang <carf17771@gmail.com>\n"
"Language-Team: Valen Chang <carf17771@gmail.com>\n" "Language-Team: Valen Chang <carf17771@gmail.com>\n"
@ -3668,17 +3668,17 @@ msgctxt "@action:button"
msgid "Remove printers" msgid "Remove printers"
msgstr "移除印表機" msgstr "移除印表機"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:62 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63
msgctxt "@action:button Preceded by 'Ready to'." msgctxt "@action:button Preceded by 'Ready to'."
msgid "Print over network" msgid "Print over network"
msgstr "網路連線列印" msgstr "網路連線列印"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:63 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64
msgctxt "@properties:tooltip" msgctxt "@properties:tooltip"
msgid "Print over network" msgid "Print over network"
msgstr "網路連線列印" msgstr "網路連線列印"
#: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:64 #: plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py:65
msgctxt "@info:status" msgctxt "@info:status"
msgid "Connected over the network" msgid "Connected over the network"
msgstr "透過網路連接" msgstr "透過網路連接"

15
resources/qml/PrinterSelector/PrintSelectorCard.qml
View File

@ -35,8 +35,9 @@ Rectangle
id: printerTitle id: printerTitle
Layout.preferredWidth: parent.width / 3 Layout.preferredWidth: parent.width / 3
Layout.preferredHeight: childrenRect.height
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
Layout.fillHeight: false Layout.fillHeight: false
source: UM.Theme.getIcon("Printer") source: UM.Theme.getIcon("Printer")
@ -45,13 +46,14 @@ Rectangle
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
} }
ColumnLayout Column
{ {
id: extruderInformation id: extruderInformation
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: parent.width / 2 Layout.preferredWidth: parent.width / 2
Layout.alignment: Qt.AlignTop Layout.preferredHeight: childrenRect.height
spacing: UM.Theme.getSize("narrow_margin").width Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
spacing: UM.Theme.getSize("narrow_margin").height
Repeater Repeater
{ {
@ -59,7 +61,7 @@ Rectangle
Item Item
{ {
Layout.preferredWidth: extruderInformation.width width: extruderInformation.width
height: childrenRect.height height: childrenRect.height
Cura.ExtruderIcon Cura.ExtruderIcon
@ -117,7 +119,8 @@ Rectangle
implicitWidth: UM.Theme.getSize("large_button").width implicitWidth: UM.Theme.getSize("large_button").width
implicitHeight: implicitWidth implicitHeight: implicitWidth
Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop: Qt.AlignCenter Layout.alignment: extruders[0].materials.length > 1 ? Qt.AlignTop : Qt.AlignCenter
Layout.preferredHeight: childrenRect.height
padding: 0 padding: 0
background: Rectangle background: Rectangle

6
resources/themes/cura-dark/theme.json
View File

@ -81,9 +81,9 @@
"text_detail": [255, 255, 255, 172], "text_detail": [255, 255, 255, 172],
"text_link": "accent_1", "text_link": "accent_1",
"text_inactive": [118, 118, 118, 255], "text_inactive": [118, 118, 118, 255],
"text_hover": [255, 255, 255, 204], "text_hover": [255, 255, 255, 255],
"text_scene": [255, 255, 255, 162], "text_scene": [250, 250, 250, 255],
"text_scene_hover": [255, 255, 255, 204], "text_scene_hover": [255, 255, 255, 255],
"printer_type_label_background": [95, 95, 95, 255], "printer_type_label_background": [95, 95, 95, 255],