Merge branch '4.0' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-03-18 14:56:49 +01:00
commit c1ed8ba9d0
5 changed files with 11 additions and 11 deletions

View file

@ -395,9 +395,9 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
newly_finished_jobs = [job for job in finished_jobs if job not in self._finished_jobs and job.owner == username]
for job in newly_finished_jobs:
if job.assignedPrinter:
job_completed_text = i18n_catalog.i18nc("@info:status", "Printer '{printer_name}' has finished printing '{job_name}'.".format(printer_name=job.assignedPrinter.name, job_name = job.name))
job_completed_text = i18n_catalog.i18nc("@info:status", "Printer '{printer_name}' has finished printing '{job_name}'.").format(printer_name=job.assignedPrinter.name, job_name = job.name)
else:
job_completed_text = i18n_catalog.i18nc("@info:status", "The print job '{job_name}' was finished.".format(job_name = job.name))
job_completed_text = i18n_catalog.i18nc("@info:status", "The print job '{job_name}' was finished.").format(job_name = job.name)
job_completed_message = Message(text=job_completed_text, title = i18n_catalog.i18nc("@info:status", "Print finished"))
job_completed_message.show()

View file

@ -2318,7 +2318,7 @@ msgstr[1] "Es necesario realizar los siguientes cambios de configuración en la
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:68
msgctxt "@label"
msgid "The printer %1 is assigned, but the job contains an unknown material configuration."
msgstr "Se ha asignado la impresora 1%, pero el trabajo tiene una configuración de material desconocido."
msgstr "Se ha asignado la impresora %1, pero el trabajo tiene una configuración de material desconocido."
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:78
msgctxt "@label"

View file

@ -2288,7 +2288,7 @@ msgstr "Interrompi"
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:143
msgctxt "@label %1 is the name of a print job."
msgid "Are you sure you want to move %1 to the top of the queue?"
msgstr "Sei sicuro di voler spostare 1% allinizio della coda?"
msgstr "Sei sicuro di voler spostare %1 allinizio della coda?"
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:144
msgctxt "@window:title"
@ -4240,7 +4240,7 @@ msgstr "Utilizzare la colla per una migliore adesione con questa combinazione di
#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml:128
msgctxt "@label"
msgid "This configuration is not available because %1 is not recognized. Please visit %2 to download the correct material profile."
msgstr "Questa configurazione non è disponibile perché 1% non viene riconosciuto. Visitare %2 per scaricare il profilo materiale corretto."
msgstr "Questa configurazione non è disponibile perché %1 non viene riconosciuto. Visitare %2 per scaricare il profilo materiale corretto."
#: /home/ruben/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml:129
msgctxt "@label"

View file

@ -2149,7 +2149,7 @@ msgstr "이 프린터는 프린터 그룹을 호스트하도록 설정되어 있
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:321
msgctxt "@label"
msgid "This printer is the host for a group of %1 printers."
msgstr "이 프린터는 1%개 프린터 그룹의 호스트입니다."
msgstr "이 프린터는 %1개 프린터 그룹의 호스트입니다."
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:332
msgctxt "@label"
@ -5802,7 +5802,7 @@ msgstr "X3GWriter"
#~ msgctxt "@label"
#~ msgid "This printer is the host for a group of %1 Ultimaker 3 printers."
#~ msgstr "이 프린터는 1% Ultimaker 3 프린터 그룹의 호스트입니다."
#~ msgstr "이 프린터는 %1 Ultimaker 3 프린터 그룹의 호스트입니다."
#~ msgctxt "@label: arg 1 is group name"
#~ msgid "%1 is not set up to host a group of connected Ultimaker 3 printers"

View file

@ -2307,13 +2307,13 @@ msgstr "Overschrijven"
msgctxt "@label"
msgid "The assigned printer, %1, requires the following configuration change:"
msgid_plural "The assigned printer, %1, requires the following configuration changes:"
msgstr[0] "Voor de toegewezen printer, 1%, is de volgende configuratiewijziging vereist:"
msgstr[1] "Voor de toegewezen printer, 1%, zijn de volgende configuratiewijzigingen vereist:"
msgstr[0] "Voor de toegewezen printer, %1, is de volgende configuratiewijziging vereist:"
msgstr[1] "Voor de toegewezen printer, %1, zijn de volgende configuratiewijzigingen vereist:"
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:68
msgctxt "@label"
msgid "The printer %1 is assigned, but the job contains an unknown material configuration."
msgstr "De printer 1% is toegewezen. De taak bevat echter een onbekende materiaalconfiguratie."
msgstr "De printer %1 is toegewezen. De taak bevat echter een onbekende materiaalconfiguratie."
#: /home/ruben/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:78
msgctxt "@label"
@ -5015,7 +5015,7 @@ msgstr "X3G-schrijver"
#~ msgctxt "@label"
#~ msgid "The assigned printer, %1, requires the following configuration change(s):"
#~ msgstr "Voor de toegewezen printer, 1%, is/zijn de volgende configuratiewijziging/configuratiewijzigingen vereist:"
#~ msgstr "Voor de toegewezen printer, %1, is/zijn de volgende configuratiewijziging/configuratiewijzigingen vereist:"
#~ msgctxt "@label"
#~ msgid "Override"