Merge branch 'master' of github.com:Ultimaker/cura

This commit is contained in:
Aleksei S 2018-03-26 13:52:18 +02:00
commit 4567388daa
2 changed files with 5 additions and 5 deletions

View File

@ -63,11 +63,11 @@ class ModelChecker(QObject, Extension):
self._caution_message.setText(catalog.i18nc( self._caution_message.setText(catalog.i18nc(
"@info:status", "@info:status",
"Some models may not be printed optimal due to object size and chosen material for models: {model_names}.\n" "Some models may not be printed optimally due to object size and chosen material for models: {model_names}.\n"
"Tips that may be useful to improve the print quality:\n" "Tips that may be useful to improve the print quality:\n"
"1) Use rounded corners\n" "1) Use rounded corners.\n"
"2) Turn the fan off (only if the are no tiny details on the model)\n" "2) Turn the fan off (only if there are no tiny details on the model).\n"
"3) Use a different material").format(model_names = ", ".join([n.getName() for n in warning_nodes]))) "3) Use a different material.").format(model_names = ", ".join([n.getName() for n in warning_nodes])))
return len(warning_nodes) > 0 return len(warning_nodes) > 0

View File

@ -247,7 +247,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
i18n_catalog.i18nc("@info:status", "Print job was successfully sent to the printer."), i18n_catalog.i18nc("@info:status", "Print job was successfully sent to the printer."),
lifetime=5, dismissable=True, lifetime=5, dismissable=True,
title=i18n_catalog.i18nc("@info:title", "Data Sent")) title=i18n_catalog.i18nc("@info:title", "Data Sent"))
self._success_message.addAction("View", i18n_catalog.i18nc("@action:button", "View in Montior"), icon=None, self._success_message.addAction("View", i18n_catalog.i18nc("@action:button", "View in Monitor"), icon=None,
description="") description="")
self._success_message.actionTriggered.connect(self._successMessageActionTriggered) self._success_message.actionTriggered.connect(self._successMessageActionTriggered)
self._success_message.show() self._success_message.show()