diff --git a/plugins/CuraProfileWriter/__init__.py b/plugins/CuraProfileWriter/__init__.py index ad8e6efe2e..43890de469 100644 --- a/plugins/CuraProfileWriter/__init__.py +++ b/plugins/CuraProfileWriter/__init__.py @@ -4,7 +4,7 @@ from . import CuraProfileWriter from UM.i18n import i18nCatalog -catalog = i18nCatalog("uranium") +catalog = i18nCatalog("cura") def getMetaData(): return { diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index efc98da946..ebd2d36bb0 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -18,12 +18,14 @@ UM.Dialog minimumHeight: 200*Screen.devicePixelRatio; maximumHeight: 200*Screen.devicePixelRatio; + modality: Qt.Modal title: catalog.i18nc("@title:window", "Convert Image...") GridLayout { + UM.I18nCatalog{id: catalog; name:"cura"} anchors.fill: parent; Layout.fillWidth: true columnSpacing: 16 @@ -82,8 +84,6 @@ UM.Dialog onValueChanged: { manager.onSmoothingChanged(value) } } } - - UM.I18nCatalog{id: catalog; name:"ultimaker"} } rightButtons: [ diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 6095b9ad96..442b664b43 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -13,6 +13,8 @@ Item { property int currentIndex: UM.ActiveTool.properties.SelectedIndex; property string printSequence: UM.ActiveTool.properties.PrintSequence; + UM.I18nCatalog { id: catalog; name: "cura"; } + width: childrenRect.width; height: childrenRect.height; @@ -157,7 +159,6 @@ Item { } } - UM.I18nCatalog { id: catalog; name: "uranium"; } UM.Dialog { id: settingPickDialog diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index 99b33a55af..0d49b2c892 100644 --- a/plugins/PerObjectSettingsTool/__init__.py +++ b/plugins/PerObjectSettingsTool/__init__.py @@ -4,7 +4,7 @@ from . import PerObjectSettingsTool from UM.i18n import i18nCatalog -i18n_catalog = i18nCatalog("uranium") +i18n_catalog = i18nCatalog("cura") def getMetaData(): return { diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 56fae1b0b8..b9966cdeea 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -184,7 +184,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter font: UM.Theme.fonts.small color: UM.Theme.colors.text_subtext - text: (!base.printDuration || !base.printDuration.valid) ? "00h 00min" : base.printDuration.getDisplayString(UM.DurationFormat.Short) + text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short) } UM.RecolorImage { id: lengthIcon @@ -204,7 +204,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter font: UM.Theme.fonts.small color: UM.Theme.colors.text_subtext - text: base.printMaterialAmount <= 0 ? "0.0 m" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount) + text: base.printMaterialAmount <= 0 ? catalog.i18nc("@label", "0.0 m") : catalog.i18nc("@label", "%1 m").arg(base.printMaterialAmount) } } }