3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Ghostkeeper 2016-01-13 17:05:25 +01:00
commit ac1ada87e6
7 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/CuraProfileWriter/__init__.py
View file

@ -4,7 +4,7 @@
from . import CuraProfileWriter
from UM.i18n import i18nCatalog
catalog = i18nCatalog("uranium")
catalog = i18nCatalog("cura")
def getMetaData():
return {

4
plugins/ImageReader/ConfigUI.qml
View file

@ -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: [

3
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -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

2
plugins/PerObjectSettingsTool/__init__.py
View file

@ -4,7 +4,7 @@
from . import PerObjectSettingsTool
from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("uranium")
i18n_catalog = i18nCatalog("cura")
def getMetaData():
return {