From 9176240798986c9ea9d16275071a740eaf773dd9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 18 Mar 2019 13:45:05 +0100 Subject: [PATCH 1/2] Fix replacement keys Translators translated '%1' to '1%' apparently. Contributes to issue CURA-6257. --- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/it_IT/cura.po | 4 ++-- resources/i18n/ko_KR/cura.po | 4 ++-- resources/i18n/nl_NL/cura.po | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 6d3b1757dc..7a08130af6 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -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" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index ea3e1c2c11..4d2ea5070b 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -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% all’inizio della coda?" +msgstr "Sei sicuro di voler spostare %1 all’inizio 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" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 4737e8691b..e27a6a05c6 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -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" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 11a65f4300..22c9ee4857 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -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" From 61e031bf1abc7642c15e969a5a47a3513271b5b8 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 18 Mar 2019 13:45:31 +0100 Subject: [PATCH 2/2] Fix format for two of the translated messages. The format needs to be done on the result of whatever the translate spits out instead of the string that is passed to the translate. --- plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py index 6ca6b0cd10..549f512f4c 100644 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py @@ -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()