From 4932cc1e853b8ad1c94b01e312541526d4555972 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 29 Sep 2017 10:49:38 +0200 Subject: [PATCH 1/3] Revert string changes that can easily be reverted These strings can be re-used from other places. Contributes to issue CL-506. --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 161fdca36e..dc91fff016 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -248,7 +248,7 @@ Rectangle } else if (printJob.status == "pre_print" || printJob.status == "sent_to_printer") { - return catalog.i18nc("@label:status", "Preparing to print") + return catalog.i18nc("@label", "Preparing to print") } else if (printJob.configuration_changes_required != undefined && printJob.status == "queued") { @@ -327,13 +327,13 @@ Rectangle return catalog.i18nc("@label", "Clear build plate") case "sent_to_printer": case "pre_print": - return catalog.i18nc("@label", "Leveling and heating") + return catalog.i18nc("@label", "Preparing to print") case "wait_for_configuration": return catalog.i18nc("@label", "Not accepting print jobs") case "queued": if (printJob.configuration_changes_required != undefined) { - return catalog.i18nc("@label", "Configuration change"); + return catalog.i18nc("@label", "Waiting for configuration change"); } default: return ""; From b7dd756427048baa579a1f85cf27228a7fc90c6f Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Fri, 29 Sep 2017 11:21:15 +0200 Subject: [PATCH 2/3] CL-506 changed Aborted to Print aborted and added it to all translations on the top --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 6 +++--- resources/i18n/cura.pot | 7 +++++++ resources/i18n/de_DE/cura.po | 7 ++++++- resources/i18n/es_ES/cura.po | 7 ++++++- resources/i18n/fi_FI/cura.po | 7 ++++++- resources/i18n/fr_FR/cura.po | 7 ++++++- resources/i18n/it_IT/cura.po | 7 ++++++- resources/i18n/ja_JP/cura.po | 5 +++++ resources/i18n/ko_KR/cura.po | 5 +++++ resources/i18n/nl_NL/cura.po | 7 ++++++- resources/i18n/pl_PL/cura.po | 5 +++++ resources/i18n/pt_BR/cura.po | 5 +++++ resources/i18n/ru_RU/cura.po | 5 +++++ resources/i18n/tr_TR/cura.po | 7 ++++++- resources/i18n/zh_CN/cura.po | 7 ++++++- 15 files changed, 83 insertions(+), 11 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index dc91fff016..7fce36b6e3 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -61,7 +61,7 @@ Rectangle anchors.fill:parent onClicked: OutputDevice.selectPrinter(printer.unique_name, printer.friendly_name) hoverEnabled: true; - + // Only clickable if no printer is selected enabled: OutputDevice.selectedPrinterName == "" } @@ -256,10 +256,10 @@ Rectangle } else if (printJob.Status == "aborted") { - return catalog.i18nc("@label:status", "Aborted") + return catalog.i18nc("@label:status", "Print aborted") } else - { + { return ""; } } diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index e228325a47..809ecded80 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -18,6 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "" + + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 72e04b2b61..5e16a60617 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Drucken wurde abgebrochen" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4949,4 +4954,4 @@ msgstr "Cura-Profil-Reader" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Erneut drucken" \ No newline at end of file +#~ msgstr "Erneut drucken" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 4971703962..f7d3d33a2e 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Impresión cancelada" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4949,4 +4954,4 @@ msgstr "Lector de perfiles de Cura" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Volver a imprimir" \ No newline at end of file +#~ msgstr "Volver a imprimir" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 74788a4c3f..a072a73faa 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Tulostus keskeytetty" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4949,4 +4954,4 @@ msgstr "Cura-profiilin lukija" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Tulosta uudelleen" \ No newline at end of file +#~ msgstr "Tulosta uudelleen" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index d5cc344828..6d20ae0695 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Abandon de l'impression" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4948,4 +4953,4 @@ msgstr "Lecteur de profil Cura" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Imprimer à nouveau" \ No newline at end of file +#~ msgstr "Imprimer à nouveau" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index aca74f4611..3bb1cfa633 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Stampa interrotta" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4948,4 +4953,4 @@ msgstr "Lettore profilo Cura" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Ripeti stampa" \ No newline at end of file +#~ msgstr "Ripeti stampa" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 5880cb9255..d956265d7c 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -17,6 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Print aborted" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index b76295ebb3..9fd8031a4d 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -18,6 +18,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 2444bf6a4c..5a547385da 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Print afgebroken" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4968,4 +4973,4 @@ msgstr "Cura-profiellezer" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Opnieuw Printen" \ No newline at end of file +#~ msgstr "Opnieuw Printen" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index e8f40af92d..215d06c9d0 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -18,6 +18,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.3\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Wydruk został przerwany" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 641f113c8b..1d61d7813c 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -17,6 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Impressão abortada" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 156494efdc..a444d61996 100755 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -18,6 +18,11 @@ msgstr "" "X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Печать прервана" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 6d3b884525..49827ba45b 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -16,6 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "Yazdırma durduruldu" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4949,4 +4954,4 @@ msgstr "Cura Profil Okuyucu" #~ msgctxt "@label:" #~ msgid "Print Again" -#~ msgstr "Yeniden Yazdır" \ No newline at end of file +#~ msgstr "Yeniden Yazdır" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 3fd9f30fd2..5e03ff0e31 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -18,6 +18,11 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.7.3\n" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Print aborted" +msgstr "打印已中止" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" @@ -4666,4 +4671,4 @@ msgstr "Cura 配置文件读取器" #~ msgctxt "@label" #~ msgid "Print Selected Model with %1" #~ msgid_plural "Print Selected Models With %1" -#~ msgstr[0] "用 %1 打印所选模型" \ No newline at end of file +#~ msgstr[0] "用 %1 打印所选模型" From 89de83254dc02daf39cd97cc62b56d019761f429 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 29 Sep 2017 13:38:17 +0200 Subject: [PATCH 3/3] Update end g-code for Ultimaker 3 As requested by Coen. Contributes to issue EM-1859. --- resources/definitions/ultimaker3.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 6221fa6228..2f4ad4e1a8 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -67,7 +67,7 @@ "machine_extruder_count": { "default_value": 2 }, "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, + "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F2400 Z3 E-{retraction_amount}\nG90 ;Disable relative movement" }, "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, "prime_tower_wipe_enabled": { "default_value": false },