From f5414a4a794fe5a77d3c24178a32399a0c485838 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin <daniel.molkentin@nokia.com> Date: Fri, 10 Jul 2009 12:55:44 +0100 Subject: [PATCH] Revert "Make revision sting show up in German translation. Also fix the Spanish one a bit." This reverts commit 33dd9deaeaaa0da7521a402f36cce2005dde8477. --- share/qtcreator/translations/qtcreator_de.ts | 2 +- share/qtcreator/translations/qtcreator_es.ts | 2 +- src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro | 8 ++------ src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp | 3 --- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 1b34e8675bf..4e38da0f5c2 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -1759,7 +1759,7 @@ Sollen sie überschrieben werden?</translation> <location line="+11"/> <source>From revision %1<br/></source> <extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment> - <translation>Revision %1<br/></translation> + <translation>Revision:</translation> </message> <message> <location line="+3"/> diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 8e1a7b4b968..e564f6e1bb8 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -1721,7 +1721,7 @@ Would you like to overwrite them?</source> <location line="+11"/> <source>From revision %1<br/></source> <extracomment>This gets conditionally inserted as argument %8 into the description string.</extracomment> - <translation>Revisión %1<br/></translation> + <translation>Revisión %1</translation> </message> <message> <location line="+3"/> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro index 5a675d5a936..fe516111f6e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro @@ -10,9 +10,7 @@ HEADERS = cmakeproject.h \ makestep.h \ cmakerunconfiguration.h \ cmakeopenprojectwizard.h \ - cmakebuildenvironmentwidget.h \ - cmakeprojectwizard.h - + cmakebuildenvironmentwidget.h SOURCES = cmakeproject.cpp \ cmakeprojectplugin.cpp \ cmakeprojectmanager.cpp \ @@ -20,9 +18,7 @@ SOURCES = cmakeproject.cpp \ makestep.cpp \ cmakerunconfiguration.cpp \ cmakeopenprojectwizard.cpp \ - cmakebuildenvironmentwidget.cpp \ - cmakeprojectwizard.cpp - + cmakebuildenvironmentwidget.cpp RESOURCES += cmakeproject.qrc FORMS += diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index b89ac2f7942..06c52ec62c2 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -30,7 +30,6 @@ #include "cmakeprojectplugin.h" #include "cmakeprojectmanager.h" #include "cmakerunconfiguration.h" -#include "cmakeprojectwizard.h" #include "makestep.h" #include <coreplugin/icore.h> @@ -60,8 +59,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * addAutoReleasedObject(new CMakeManager(cmp)); addAutoReleasedObject(new MakeStepFactory()); addAutoReleasedObject(new CMakeRunConfigurationFactory()); - addAutoReleasedObject(new CMakeProjectWizard); - return true; } -- GitLab