diff --git a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml index 23af3d6802b..d216ea61780 100644 --- a/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/helloworld/wizard_sample.xml @@ -39,11 +39,8 @@ leave room for the Qt 4 target page. id="A.HelloWorld" category="B.CustomProjects"> console.png Creates a hello-world-project with custom message. - Erzeugt ein Hello-Welt-Projekt mit einer Nachricht. - Hello World; - Hallo Welt; - Custom Projects - Benutzerdefinierte Projekte + Hello World; + Custom Projects diff --git a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml index c924b896db0..c81715fc860 100644 --- a/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml +++ b/share/qtcreator/templates/wizards/listmodel/wizard_sample.xml @@ -33,10 +33,10 @@ Custom class wizard example configuration file. --> Creates a QAbstractListModel implementation. Erzeugt eine Implementierung von QAbstractListModel. - QAbstractListModel implementation; - Implementierung von QAbstractListModel; - Custom Classes - Benutzerdefinierte Klassen + QAbstractListModel implementation; + Implementierung von QAbstractListModel; + Custom Classes + Benutzerdefinierte Klassen diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml index 14db77f70e3..39b1d675b39 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml +++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml @@ -38,8 +38,8 @@ leave room for the Qt 4 target page. class="qt4project" firstpage="10" id="QmlRuntimePlugin" category="F.Projects"> Creates a plug-in for the QML runtime. - QML Runtime Plug-in - QML Runtime Plug-in + QML Runtime Plug-in + QML Runtime Plug-in diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp index c64c62c8c15..982668ee684 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -46,14 +47,14 @@ enum { debug = 0 }; static const char customWizardElementC[] = "wizard"; static const char iconElementC[] = "icon"; static const char descriptionElementC[] = "description"; -static const char displayNameElementC[] = "displayName"; +static const char displayNameElementC[] = "displayname"; static const char idAttributeC[] = "id"; static const char kindAttributeC[] = "kind"; static const char klassAttributeC[] = "class"; static const char firstPageAttributeC[] = "firstpage"; static const char langAttributeC[] = "xml:lang"; static const char categoryAttributeC[] = "category"; -static const char displayCategoryElementC[] = "displayCategory"; +static const char displayCategoryElementC[] = "displaycategory"; static const char fieldPageTitleElementC[] = "fieldpagetitle"; static const char fieldsElementC[] = "fields"; static const char fieldElementC[] = "field"; @@ -144,7 +145,10 @@ static inline void assignLanguageElementText(QXmlStreamReader &reader, QString *target) { const QStringRef elementLanguage = reader.attributes().value(langAttributeC); - if (elementLanguage.isEmpty() || elementLanguage == desiredLanguage) { + if (elementLanguage.isEmpty()) { + // Try to find a translation for our built-in Wizards + *target = QCoreApplication::translate("ProjectExplorer::CustomWizard", reader.readElementText().toLatin1().constData()); + } else if (elementLanguage == desiredLanguage) { *target = reader.readElementText(); } else { // Language mismatch: forward to end element. @@ -161,7 +165,11 @@ static inline void assignLanguageElementText(QXmlStreamReader &reader, void (Core::BaseFileWizardParameters::*setter)(const QString &)) { const QStringRef elementLanguage = reader.attributes().value(langAttributeC); - if (elementLanguage.isEmpty() || elementLanguage == desiredLanguage) { + if (elementLanguage.isEmpty()) { + // Try to find a translation for our built-in Wizards + const QString translated = QCoreApplication::translate("ProjectExplorer::CustomWizard", reader.readElementText().toLatin1().constData()); + (bp->*setter)(translated); + } else if (elementLanguage == desiredLanguage) { (bp->*setter)(reader.readElementText()); } else { // Language mismatch: forward to end element.