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

Merge remote-tracking branch 'origin/3.3'

Browse Source
This commit is contained in:
Lipu Fei 2018-04-24 14:28:50 +02:00
commit 585888f84a
9 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/ChangeLogPlugin/ChangeLog.txt
View File

@ -24,6 +24,9 @@ Refactored machine manager resulted in less manager classes. Changing settings,
*Multiply models faster
Significant speed increase when multiplying models.
*Auto slicing disabled by default
The auto slice tool is now disabled by default. Users can still enable the feature in the user preferences dialog.
*Updated fonts
Default font changed to NotoSans to increase readability and consistency with Cura Connect.

4
plugins/ModelChecker/ModelChecker.py
View File

@ -31,9 +31,10 @@ class ModelChecker(QObject, Extension):
Application.getInstance().initializationFinished.connect(self._pluginsInitialized)
Application.getInstance().getController().getScene().sceneChanged.connect(self._onChanged)
Application.getInstance().globalContainerStackChanged.connect(self._onChanged)
## Pass-through to allow UM.Signal to connect with a pyqtSignal.
def _onChanged(self, _):
def _onChanged(self, *args, **kwargs):
self.onChanged.emit()
## Called when plug-ins are initialized.
@ -53,7 +54,6 @@ class ModelChecker(QObject, Extension):
# has not done yet.
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack is None:
Application.getInstance().callLater(lambda: self.onChanged.emit())
return False
material_shrinkage = self._getMaterialShrinkage()

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

@ -18,6 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.4\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "Verwenden Sie eiene Klebefolie oder Klebstoff mit dieser Materialcombination"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"

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

@ -18,6 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.6\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "Use láminas de adherencia o pegamento con esta combinación de materiales"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"

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

@ -18,6 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 2.0.6\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "Utilisez feuilles d'adhérence ou de la colle avec cette combinaison des matériaux"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"

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

@ -16,6 +16,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "Utilizzare un foglio di adesione o colla con questa combinazione di materiali"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"

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

@ -16,6 +16,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "Gebruik een hechtingsvel of lijm met deze materiaalcombinatie"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"

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

@ -28,6 +28,11 @@ msgctxt "@item:inlistbox"
msgid "X-Ray view"
msgstr "透视视图"
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "在此材料组合的情况下，请使用附着垫片或者胶水"
#: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:13
msgctxt "@item:inlistbox"
msgid "X3D File"

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

@ -18,6 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.6\n"
#Added after the string freeze.
#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528
msgctxt "@label"
msgid "Use adhesion sheet or glue with this material combination"
msgstr "在此耗材組合下使用膠水或是附著墊片"
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22
msgctxt "@action"
msgid "Machine Settings"