Merge branch 'master' into top_most_skin_feature

This commit is contained in:
Tim Kuipers 2017-07-20 12:37:48 +02:00
commit d25e227707
18 changed files with 8825 additions and 125 deletions

View file

@ -304,7 +304,7 @@
"options":
{
"RepRap (Marlin/Sprinter)": "Marlin",
"RepRap (Volumatric)": "Marlin (Volumetric)",
"RepRap (Volumetric)": "Marlin (Volumetric)",
"RepRap (RepRap)": "RepRap",
"UltiGCode": "Ultimaker 2",
"Griffin": "Griffin",

3543
resources/i18n/pl/cura.po Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,180 @@
# Cura JSON setting files
# Copyright (C) 2017 Ultimaker
# This file is distributed under the same license as the Cura package.
# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: Cura 2.6\n"
"Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n"
"POT-Creation-Date: 2017-05-30 15:32+0000\n"
"PO-Revision-Date: 2017-07-13 16:08+0200\n"
"Last-Translator: jagus85\n"
"Language-Team: reprapy.pl\n"
"Language: Polish\n"
"Lang-Code: pl\n"
"Country-Code: PL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.2\n"
msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr ""
"Urządzenie do drukowania stosuje się głowicę drukującą. Służy do multi-"
"ekstruzji."
msgctxt "extruder_nr label"
msgid "Extruder"
msgstr "Extruder"
msgctxt "extruder_prime_pos_x description"
msgid ""
"The X coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""
"Die X-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
msgctxt "extruder_prime_pos_x label"
msgid "Extruder Prime X Position"
msgstr "X-Position Extruder-Einzug"
msgctxt "extruder_prime_pos_y description"
msgid ""
"The Y coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""
"Die Y-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
msgctxt "extruder_prime_pos_y label"
msgid "Extruder Prime Y Position"
msgstr "Y-Position Extruder-Einzug"
msgctxt "extruder_prime_pos_z description"
msgid ""
"The Z coordinate of the position where the nozzle primes at the start of "
"printing."
msgstr ""
"Die Z-Koordinate der Position, an der die Düse am Druckbeginn einzieht."
msgctxt "extruder_prime_pos_z label"
msgid "Extruder Prime Z Position"
msgstr "Z-Position Extruder-Einzug"
msgctxt "machine_extruder_end_code description"
msgid "End g-code to execute whenever turning the extruder off."
msgstr "Beenden Sie den G-Code jedes Mal, wenn Sie den Extruder ausschalten."
msgctxt "machine_extruder_end_code label"
msgid "Extruder End G-Code"
msgstr "G-Code Extruder-Ende"
msgctxt "machine_extruder_end_pos_abs description"
msgid ""
"Make the extruder ending position absolute rather than relative to the last-"
"known location of the head."
msgstr ""
"Bevorzugen Sie eine absolute Endposition des Extruders anstelle einer "
"relativen Position zur zuletzt bekannten Kopfposition."
msgctxt "machine_extruder_end_pos_abs label"
msgid "Extruder End Position Absolute"
msgstr "Pozycja końca absolutnym głowicy drukującej"
msgctxt "machine_extruder_end_pos_x description"
msgid "The x-coordinate of the ending position when turning the extruder off."
msgstr "Die X-Koordinate der Endposition beim Ausschalten des Extruders."
msgctxt "machine_extruder_end_pos_x label"
msgid "Extruder End Position X"
msgstr "Extruder-Endposition X"
msgctxt "machine_extruder_end_pos_y description"
msgid "The y-coordinate of the ending position when turning the extruder off."
msgstr "Die Y-Koordinate der Endposition beim Ausschalten des Extruders."
msgctxt "machine_extruder_end_pos_y label"
msgid "Extruder End Position Y"
msgstr "Extruder-Endposition Y"
msgctxt "machine_extruder_start_code description"
msgid "Start g-code to execute whenever turning the extruder on."
msgstr "Zacznij każdym razem, gdy G-kod po włączeniu wytłaczarki."
msgctxt "machine_extruder_start_code label"
msgid "Extruder Start G-Code"
msgstr "G-kodu startowego głowicy drukującej"
msgctxt "machine_extruder_start_pos_abs description"
msgid ""
"Make the extruder starting position absolute rather than relative to the "
"last-known location of the head."
msgstr ""
"Bevorzugen Sie eine absolute Startposition des Extruders anstelle einer "
"relativen Position zur zuletzt bekannten Kopfposition."
msgctxt "machine_extruder_start_pos_abs label"
msgid "Extruder Start Position Absolute"
msgstr "Absolutną pozycję wyjściową wytłaczarki"
msgctxt "machine_extruder_start_pos_x description"
msgid "The x-coordinate of the starting position when turning the extruder on."
msgstr "Die X-Koordinate der Startposition beim Einschalten des Extruders."
msgctxt "machine_extruder_start_pos_x label"
msgid "Extruder Start Position X"
msgstr "X-Position Extruder-Start"
msgctxt "machine_extruder_start_pos_y description"
msgid "The y-coordinate of the starting position when turning the extruder on."
msgstr "Die Y-Koordinate der Startposition beim Einschalten des Extruders."
msgctxt "machine_extruder_start_pos_y label"
msgid "Extruder Start Position Y"
msgstr "Y-Position Extruder-Start"
msgctxt "machine_nozzle_offset_x description"
msgid "The x-coordinate of the offset of the nozzle."
msgstr "Współrzędnej X podziałki dysz."
msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "X przesunięcie dyszy"
msgctxt "machine_nozzle_offset_y description"
msgid "The y-coordinate of the offset of the nozzle."
msgstr "Współrzędnej Y podziałki dysz."
msgctxt "machine_nozzle_offset_y label"
msgid "Nozzle Y Offset"
msgstr "Y przesunięcie dyszę"
msgctxt "machine_nozzle_size description"
msgid ""
"The inner diameter of the nozzle. Change this setting when using a non-"
"standard nozzle size."
msgstr ""
"Wewnętrzna średnica dyszy. Użyj tego ustawienia, jeśli używasz dyszę o "
"niestandardowym rozmiarze."
msgctxt "machine_nozzle_size label"
msgid "Nozzle Diameter"
msgstr "średnica dyszy"
msgctxt "machine_settings description"
msgid "Machine specific settings"
msgstr "Ustawienia specyficzne dla urządzenia"
msgctxt "machine_settings label"
msgid "Machine"
msgstr "urządzenie"
msgctxt "platform_adhesion description"
msgid "Adhesion"
msgstr "odpowiedzialność"
msgctxt "platform_adhesion label"
msgid "Build Plate Adhesion"
msgstr "Druckplattenhaftung"

File diff suppressed because it is too large Load diff

View file

@ -125,7 +125,7 @@ UM.Dialog
projectsModel.append({ name:"PyQt", description: catalog.i18nc("@label", "GUI framework bindings"), license: "GPL", url: "https://riverbankcomputing.com/software/pyqt" });
projectsModel.append({ name:"SIP", description: catalog.i18nc("@label", "C/C++ Binding library"), license: "GPL", url: "https://riverbankcomputing.com/software/sip" });
projectsModel.append({ name:"Protobuf", description: catalog.i18nc("@label", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" });
projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing "), license: "BSD-new", url: "https://www.scipy.org/" });
projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing"), license: "BSD-new", url: "https://www.scipy.org/" });
projectsModel.append({ name:"NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" });
projectsModel.append({ name:"NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" });
projectsModel.append({ name:"libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "AGPLv3", url: "https://github.com/ultimaker/libsavitar" });

View file

@ -1,4 +1,4 @@
// Copyright (c) 2016 Ultimaker B.V.
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.2
@ -23,7 +23,7 @@ Menu
if(printerConnected && Cura.MachineManager.printerOutputDevices[0].hotendIds.length > extruderIndex)
{
var nozzleName = Cura.MachineManager.printerOutputDevices[0].hotendIds[extruderIndex];
return catalog.i18nc("@title:menuitem %1 is the value from the printer", "Automatic: %1").arg(nozzleName);
return catalog.i18nc("@title:menuitem %1 is the nozzle currently loaded in the printer", "Automatic: %1").arg(nozzleName);
}
return "";
}

View file

@ -157,6 +157,7 @@ UM.PreferencesPage
append({ text: "日本語", code: "jp" })
append({ text: "한국어", code: "ko" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Polski", code: "pl" })
append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" })