Merge branch 'dui-editor' of git@scm.dev.nokia.troll.no:creator/robraggis-creator into dui-editor

src/plugins/duieditor/DuiEditor.mimetypes.xml

@@ -2,8 +2,7 @@
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
     <mime-type type="application/x-dui">
         <sub-class-of type="text/plain"/>
-        <comment>DUI file</comment>
-        <glob pattern="*.dui"/>
+        <comment>QML file</comment>
         <glob pattern="*.qml"/>
     </mime-type>
 </mime-info>

src/plugins/duieditor/duieditorplugin.cpp

@@ -94,8 +94,8 @@ bool DuiEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
     addObject(m_editor);
 
     Core::BaseFileWizardParameters wizardParameters(Core::IWizard::FileWizard);
-    wizardParameters.setDescription(tr("Qt Script file"));
-    wizardParameters.setName(tr("Qt Script file"));
+    wizardParameters.setDescription(tr("Qt Declarative UI File"));
+    wizardParameters.setName(tr("Qt Declarative UI File"));
     wizardParameters.setCategory(QLatin1String("Qt"));
     wizardParameters.setTrCategory(tr("Qt"));
     m_wizard = new TextEditor::TextFileWizard(QLatin1String(DuiEditor::Constants::C_DUIEDITOR_MIMETYPE),