3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Jaime van Kessel 2015-09-08 13:31:26 +02:00
commit 07031b6b65
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -132,7 +132,7 @@ class CuraApplication(QtApplication):
"message": "font color=UM.Theme.colors.message_text;",
})
self.showSplashMessage(self._i18n_catalog.i18nc("Splash screen message", "Setting up scene..."))
self.showSplashMessage(self._i18n_catalog.i18nc("@info:splashscreen", "Setting up scene..."))
controller = self.getController()
@ -166,7 +166,7 @@ class CuraApplication(QtApplication):
controller.getScene().setActiveCamera("3d")
self.showSplashMessage(self._i18n_catalog.i18nc("Splash screen message", "Loading interface..."))
self.showSplashMessage(self._i18n_catalog.i18nc("@info:splashscreen", "Loading interface..."))
self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml"))
self.initializeEngine()