diff --git a/CMakeLists.txt b/CMakeLists.txt
index da5df6f3..48a240b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,7 @@ option( WITH_VCS_SUBVERSION "Enable subversion support" ${WITH_VCS_ALL} )
 
 option( BUILD_ALL "Build all components" OFF )
 option( BUILD_KDEVDESIGNER "Build kdevdesigner" ${BUILD_ALL} )
+option( BUILD_DOC "Build doc" ${BUILD_ALL} )
 
 
 ##### optional stuff ############################
@@ -164,6 +165,7 @@ add_subdirectory( mimetypes )
 add_subdirectory( pics )
 add_subdirectory( vcs )
 tde_conditional_add_subdirectory( BUILD_KDEVDESIGNER kdevdesigner )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
 
 
 ##### write configure files #####################
diff --git a/ChangeLog b/ChangeLog
index 9b89c682..05eb7ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -214,10 +214,10 @@
    Qt classes is possible in the wizard.
 
 2004-12-15 Alexander Dymo <adymo@tdevelop.org>
- * Finished the implementation of plugin profiles for KDevelop shell
+ * Finished the implementation of plugin profiles for TDevelop shell
    and shell extension architecture.
-   This means that KDevelop IDE becomes a KDevelop Platform now. And
-   KDevelop IDE is now only a program built on KDevelop Platform.
+   This means that TDevelop IDE becomes a KDevelop Platform now. And
+   TDevelop IDE is now only a program built on KDevelop Platform.
  * Made KDevelop Assistant to use KDevelop Platfrom.
  * Implemented profile detection for projects. Now, for example, when you open
    C++ language project KDevelop loads "CppIDE" profile. If a project file
@@ -268,7 +268,7 @@
    as the gdb debugger uses stdin and stdout to send and receive.
 
 2004-11-17 Alexander Dymo <adymo@tdevelop.org>
- * KDevelop interfaces cleanup and enchancements. Interfaces are now smaller, additional, not so important
+ * TDevelop interfaces cleanup and enchancements. Interfaces are now smaller, additional, not so important
    interfaces are available through extension mechanism (see KDevPlugin::extension() methods).
    Also added a lot of API documentation.
 
@@ -340,7 +340,7 @@
     * KDevelop Platform:
       - implemented profiles library and editor engine;
       - implemented profiles editor (kdevprofileeditor application);
-      - set up X-KDevelop-Property properties in .desktop files of KDevelop parts.
+      - set up X-TDevelop-Property properties in .desktop files of KDevelop parts.
 
 2004-10-21  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
@@ -1722,7 +1722,7 @@
         * Added toolbarbuttons in the project tree
 
 2002-08-06 Harald Fernengel <harry@tdevelop.org>
-        * AppWizard fix, KDevelop plugin template ported to new architecture
+        * AppWizard fix, TDevelop plugin template ported to new architecture
 
 2002-08-05 Matthias Hlzer-Klpfel <mhk@kde.org>
         * Removed tdevelop source, to prepare for an alpha release
@@ -2139,7 +2139,7 @@
 2002-04-20  Bernd Gehrmann  <bernd@mail.berlios.de>
         * If no compiler is set explicitly by the user,
           use the options widget of the default compiler
-          (Property X-KDevelop-Default in the .desktop file)
+          (Property X-TDevelop-Default in the .desktop file)
 2002-04-19  Bernd Gehrmann  <bernd@mail.berlios.de>
         * In script projects, scan the source file list
           at loading time with configurable include
@@ -2238,7 +2238,7 @@
         * centralized the trader queries for KDevelop/Part (Plugin) with
         the additional constraint for the plugin scope into a static
         PluginController::pluginServices method
-        * moved the duplicated code for extracting the X-KDevelop-Args
+        * moved the duplicated code for extracting the X-TDevelop-Args
         property of a service into a QStringList into a static private
         method of PluginController
         * install tdevelop components as KDE modules, not as libraries
diff --git a/HACKING b/HACKING
index e81196b5..8727a4ac 100644
--- a/HACKING
+++ b/HACKING
@@ -1,6 +1,6 @@
 To change KDevelop's code please read the API documentation generated by doxygen at:
 
-http://www.tdevelop.org
+http://www.kdevelop.org
 
 or generate it yourself:
 
diff --git a/HACKING.language b/HACKING.language
index c025c1e4..de80e530 100644
--- a/HACKING.language
+++ b/HACKING.language
@@ -1,7 +1,7 @@
 To find how to add support for a new programming language to KDevelop
 please read the API documentation generated by doxygen at:
 
-http://www.tdevelop.org
+http://www.kdevelop.org
 
 or generate it yourself:
 
diff --git a/INSTALL b/INSTALL
index 95d6a89b..68fda7fa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 To compile your own KDevelop you should follow the instructions at:
 
-http://www.tdevelop.org/index.html?filename=branches_compiling.html (latest stable version)
-http://www.tdevelop.org/index.html?filename=HEAD/branches_compiling.html (latest development version)
+http://www.kdevelop.org/index.html?filename=branches_compiling.html (latest stable version)
+http://www.kdevelop.org/index.html?filename=HEAD/branches_compiling.html (latest development version)
 
 For more generic and not so detailed information, continue to read this file.
 
diff --git a/README b/README
index 3a68218a..f73734e2 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ as follows:
 
 After that you should follow the instructions at:
 
-http://www.tdevelop.org/index.html?filename=branches_compiling.html
+http://www.kdevelop.org/index.html?filename=branches_compiling.html
 
 to compile KDevelop
 
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 2e788896..32d3f257 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -37,7 +37,7 @@ AdaGlobalOptionsDlg::AdaGlobalOptionsDlg(AdaProjectPart *part, TQWidget* parent,
     delete mainSourceUrl;
     delete defaultopts_button;
 
-    offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
+    offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
 
     ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs);
 
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 5d47b818..f487fcb0 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -389,10 +389,10 @@ void AdaProjectPart::loadProjectConfig( )
 
     if (m_compilerExec.isEmpty())
     {
-        KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
+        KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = offers.begin(); it != offers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 m_compilerExec = (*it)->exec();
                 break;
             }
@@ -425,7 +425,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
     }
 
     TQStringList args;
-    TQVariant prop = service->property("X-KDevelop-Args");
+    TQVariant prop = service->property("X-TDevelop-Args");
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 15bb0498..14547cb7 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -29,7 +29,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren
 {
     config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
 
-    offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
+    offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
 
     ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs);
 
@@ -106,10 +106,10 @@ void AdaProjectOptionsDlg::readConfig( TQString config )
 
     if (compiler.isEmpty())
     {
-        offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
+        offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = offers.begin(); it != offers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 compiler = (*it)->name();
                 kdDebug() << "compiler is " << compiler << endl;
                 break;
diff --git a/buildtools/ada/service.cpp b/buildtools/ada/service.cpp
index 710b8f9c..9d113ce3 100644
--- a/buildtools/ada/service.cpp
+++ b/buildtools/ada/service.cpp
@@ -64,10 +64,10 @@ int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names)
 
 TQString ServiceComboBox::defaultCompiler()
 {
-    KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Ada'");
+    KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Ada'");
     TQValueList<KService::Ptr>::ConstIterator it;
     for (it = offers.begin(); it != offers.end(); ++it) {
-        if ((*it)->property("X-KDevelop-Default").toBool()) {
+        if ((*it)->property("X-TDevelop-Default").toBool()) {
             return (*it)->name();;
         }
     }
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 9e1a6526..9c72999f 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -1,5 +1,5 @@
 /*
-   KDevelop Autotools Support
+   TDevelop Autotools Support
    Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
    Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
@@ -294,7 +294,7 @@ void AutoDetailsView::slotAddNewFile()
 	if ( !titem )
 		return;
 
-	KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("KDevelop/CreateFile");
+	KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("TDevelop/CreateFile");
 	if (createFileSupport)
 	{
 		KDevCreateFile::CreatedFile crFile =
diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h
index d5017152..d1673cdd 100644
--- a/buildtools/autotools/autodetailsview.h
+++ b/buildtools/autotools/autodetailsview.h
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 79f0a1b2..7ffa0ef0 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -1,5 +1,5 @@
 /*
-   KDevelop Autotools Support
+   TDevelop Autotools Support
    Copyright (c) 2001-2002 by Bernd Gehrmann <bernd@tdevelop.org>
    Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
    Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h
index f097ad16..7859f472 100644
--- a/buildtools/autotools/autoprojectwidget.h
+++ b/buildtools/autotools/autoprojectwidget.h
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2001-2002 by Bernd Gehrmann <bernd@tdevelop.org>
   Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 69408d00..71005417 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -1,5 +1,5 @@
 /*
-   KDevelop Autotools Support
+   TDevelop Autotools Support
    Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
    Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h
index 40d8e730..cfeeb11c 100644
--- a/buildtools/autotools/autosubprojectview.h
+++ b/buildtools/autotools/autosubprojectview.h
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2002 by Victor Roeder <victor_roeder@gmx.de>
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp
index a1deae2c..a9404e69 100644
--- a/buildtools/autotools/autotoolsaction.cpp
+++ b/buildtools/autotools/autotoolsaction.cpp
@@ -1,5 +1,5 @@
 /*
-   KDevelop Autotools Support
+   TDevelop Autotools Support
    Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
  ***************************************************************************
diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h
index 9315e53c..013bf006 100644
--- a/buildtools/autotools/autotoolsaction.h
+++ b/buildtools/autotools/autotoolsaction.h
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
 ***************************************************************************
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 8ff8d36c..5ff3e67e 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -79,9 +79,9 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget *
     TQDomDocument &dom = *part->projectDom();
     m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox);
 
-    coffers   = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'C'");
-    cxxoffers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'C++'");
-    f77offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Fortran'");
+    coffers   = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C'");
+    cxxoffers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'C++'");
+    f77offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Fortran'");
 
     ServiceComboBox::insertStringList(cservice_combo, coffers, &cservice_names, &cservice_execs);
     ServiceComboBox::insertStringList(cxxservice_combo, cxxoffers, &cxxservice_names, &cxxservice_execs);
@@ -157,7 +157,7 @@ void ConfigureOptionsWidget::readSettings(const TQString &config)
         kdDebug(9020) << "No c compiler set" << endl;
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = coffers.begin(); it != coffers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 kdDebug(9020) << "Found default " << (*it)->name() << endl;
                 ccompiler = (*it)->name();
                 break;
@@ -168,7 +168,7 @@ void ConfigureOptionsWidget::readSettings(const TQString &config)
         kdDebug(9020) << "No cxx compiler set" << endl;
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = cxxoffers.begin(); it != cxxoffers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 kdDebug(9020) << "Found default " << (*it)->name() << endl;
                 cxxcompiler = (*it)->name();
                 break;
@@ -179,7 +179,7 @@ void ConfigureOptionsWidget::readSettings(const TQString &config)
         kdDebug(9020) << "No c compiler set" << endl;
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = f77offers.begin(); it != f77offers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 kdDebug(9020) << "Found default " << (*it)->name() << endl;
                 f77compiler = (*it)->name();
                 break;
@@ -401,7 +401,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
     }
 
     TQStringList args;
-    TQVariant prop = service->property("X-KDevelop-Args");
+    TQVariant prop = service->property("X-TDevelop-Args");
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index db30508d..27f4512e 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
 ***************************************************************************
diff --git a/buildtools/autotools/makefilehandler.h b/buildtools/autotools/makefilehandler.h
index a104774c..0311500b 100644
--- a/buildtools/autotools/makefilehandler.h
+++ b/buildtools/autotools/makefilehandler.h
@@ -1,5 +1,5 @@
 /*
-  KDevelop Autotools Support
+  TDevelop Autotools Support
   Copyright (c) 2005 by Matt Rogers <mattr@kde.org>
 
 ***************************************************************************
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index cbe4d24c..9f6e1cb5 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -43,7 +43,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
     }
 
     TQStringList args;
-    TQVariant prop = service->property("X-KDevelop-Args");
+    TQVariant prop = service->property("X-TDevelop-Args");
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
@@ -60,7 +60,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 
 /*
 	TQStringList args;
-	TQVariant prop = service->property( "X-KDevelop-Args" );
+	TQVariant prop = service->property( "X-TDevelop-Args" );
 	if ( prop.isValid() )
 		args = TQStringList::split( " ", prop.toString() );
 
diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp
index 29e2c96a..ccf43460 100644
--- a/buildtools/lib/base/kdevbuildtool.cpp
+++ b/buildtools/lib/base/kdevbuildtool.cpp
@@ -28,11 +28,11 @@ KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const
 
 KDevMakeFrontend * KDevBuildTool::makeFrontend()
 {
-    return extension<KDevMakeFrontend>("KDevelop/MakeFrontend");
+    return extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
 }
 
 KDevAppFrontend * KDevBuildTool::appFrontend()
 {
-    return extension<KDevAppFrontend>("KDevelop/AppFrontend");
+    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
 }
 
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index a88e901c..79fe9167 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -40,7 +40,7 @@ PascalGlobalOptionsDlg::PascalGlobalOptionsDlg(PascalProjectPart *part, TQWidget
     delete defaultopts_button;
 
 
-    offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
+    offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'");
 
     ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs);
 
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 6ab3bd27..c0d53c89 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -417,10 +417,10 @@ void PascalProjectPart::loadProjectConfig( )
 
     if (m_compilerExec.isEmpty())
     {
-        KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
+        KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'");
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = offers.begin(); it != offers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 m_compilerExec = (*it)->exec();
                 break;
             }
@@ -453,7 +453,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
     }
 
     TQStringList args;
-    TQVariant prop = service->property("X-KDevelop-Args");
+    TQVariant prop = service->property("X-TDevelop-Args");
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 2b882466..33e3f88c 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -31,7 +31,7 @@ PascalProjectOptionsDlg::PascalProjectOptionsDlg(PascalProjectPart *part, TQWidg
 {
     config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this)));
 
-    offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
+    offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'");
 
     ServiceComboBox::insertStringList(compiler_box, offers, &service_names, &service_execs);
 
@@ -108,10 +108,10 @@ void PascalProjectOptionsDlg::readConfig( TQString config )
 
     if (compiler.isEmpty())
     {
-        offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
+        offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'");
         TQValueList<KService::Ptr>::ConstIterator it;
         for (it = offers.begin(); it != offers.end(); ++it) {
-            if ((*it)->property("X-KDevelop-Default").toBool()) {
+            if ((*it)->property("X-TDevelop-Default").toBool()) {
                 compiler = (*it)->name();
                 kdDebug() << "compiler is " << compiler << endl;
                 break;
diff --git a/buildtools/pascal/service.cpp b/buildtools/pascal/service.cpp
index 0179fac8..15b607ff 100644
--- a/buildtools/pascal/service.cpp
+++ b/buildtools/pascal/service.cpp
@@ -66,10 +66,10 @@ int ServiceComboBox::itemForText(const TQString &str, const TQStringList &names)
 
 TQString ServiceComboBox::defaultCompiler()
 {
-    KTrader::OfferList offers = KTrader::self()->query("KDevelop/CompilerOptions", "[X-KDevelop-Language] == 'Pascal'");
+    KTrader::OfferList offers = KTrader::self()->query("TDevelop/CompilerOptions", "[X-TDevelop-Language] == 'Pascal'");
     TQValueList<KService::Ptr>::ConstIterator it;
     for (it = offers.begin(); it != offers.end(); ++it) {
-        if ((*it)->property("X-KDevelop-Default").toBool()) {
+        if ((*it)->property("X-TDevelop-Default").toBool()) {
             return (*it)->name();;
         }
     }
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 7ae76d17..9d9745e3 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile()
             return ;
         }
     }
-    KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" );
+    KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
     TQString fcext;
     if( gitem )
     {
@@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         }
         else if ( r == idInsNewFile )
         {
-            KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" );
+            KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" );
             TQString fcext;
             switch ( titem->groupType )
             {
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index fb457112..293a11c9 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -48,7 +48,7 @@ ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const T
     setXMLFile("kdevscriptproject.rc");
 
     // only create new file action if file creation part not available
-    if (!extension<KDevCreateFile>("KDevelop/CreateFile")) {
+    if (!extension<KDevCreateFile>("TDevelop/CreateFile")) {
       KAction *action;
       action = new KAction( i18n("New File..."), 0,
                             this, TQT_SLOT(slotNewFile()),
diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox
index 3ab31af9..70176630 100644
--- a/doc/api/HowToAddPlugins.dox
+++ b/doc/api/HowToAddPlugins.dox
@@ -17,14 +17,14 @@ If you install this file into <code>\$(kde_servicesdir)</code>, your plugin will
 
 You can change the default loading by changing some settings in your <code>foo.desktop</code> file:
 
-  - Set <code>X-KDevelop-Scope=</code> to <code>Global</code> or
+  - Set <code>X-TDevelop-Scope=</code> to <code>Global</code> or
     <code>Project</code>
     - <b>Note:</b> This property is <i>not</i> optional
 	.
   - You can add a list of programming languages which are supported by your
     plugin
 	- If your plugin works with all languages leave the
-	  <code>X-KDevelop-ProgrammingLanguages=</code> field empty
+	  <code>X-TDevelop-ProgrammingLanguages=</code> field empty
 	  <i>(optional)</i>
 	.
   - You can add a list of keywords.
@@ -37,8 +37,8 @@ An example from the Java Debugger Plugin:
 
 <code><pre>
     #######################
-    X-KDevelop-Scope=Project
-    X-KDevelop-ProgrammingLanguages=Java
+    X-TDevelop-Scope=Project
+    X-TDevelop-ProgrammingLanguages=Java
     Keywords=
     ##########################
 </pre></code>
@@ -155,7 +155,7 @@ to write it back.
 
 \subsection sessionAccess Project session file (*.kdevses)
 
-The base class of all KDevelop plugins is KDevPlugin. It provides two virtual methods 
+The base class of all TDevelop plugins is KDevPlugin. It provides two virtual methods 
 restorePartialProjectSession(..) and savePartialProjectSession(..)
 that you should reimplement in your special plugin to attach to session loading and saving.
 
diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox
index 504a397e..a5840885 100644
--- a/doc/api/HowToAddProgrammingLanguages.dox
+++ b/doc/api/HowToAddProgrammingLanguages.dox
@@ -184,7 +184,7 @@ Compiler plugins must implement KDevCompilerOptions interface.
 
 In the end you should add the language you implemented to the doc/api/LangSupportStatus.dox file and
 document your language support part in the way described at \ref howToDocument (doc/api/HowToDocument.dox file).
-See also \ref howToAddPlugins (doc/api/HowToAddPlugins.dox file) for an information on how to create a generic KDevelop plugin and how to manage project and global configuration information.
+See also \ref howToAddPlugins (doc/api/HowToAddPlugins.dox file) for an information on how to create a generic TDevelop plugin and how to manage project and global configuration information.
 
 
 
diff --git a/doc/api/HowToDocument.dox b/doc/api/HowToDocument.dox
index f767fc5b..d606a8bf 100644
--- a/doc/api/HowToDocument.dox
+++ b/doc/api/HowToDocument.dox
@@ -8,7 +8,7 @@ You should add a README and a README.dox file to your part (KDevPlugin).
 On the README file put this text:
 \verbatim
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
 \endverbatim
 
diff --git a/doc/api/Mainpage.dox b/doc/api/Mainpage.dox
index 44fa64db..262cd2ed 100644
--- a/doc/api/Mainpage.dox
+++ b/doc/api/Mainpage.dox
@@ -13,14 +13,14 @@ This document is targeted at all those that want to add or improve KDevelop's so
 If you are instead looking for a user manual, just go to the help menu of your KDevelop and select KDevelop handbook.
 This documentation contains the KDevelop online class reference for the current
 development version of KDevelop.  Additionally, you
-can subscribe or read the <a href="http://www.tdevelop.org/index.html?filename=mailinglist.html">mailing list</a> for any additions and/or
+can subscribe or read the <a href="http://www.kdevelop.org/index.html?filename=mailinglist.html">mailing list</a> for any additions and/or
 modifications to the %API.
 
-An on-line, updated every 24H, html version of this documentation can be found at: http://www.tdevelop.org/HEAD/doc/api/html/index.html
+An on-line, updated every 24H, html version of this documentation can be found at: http://www.kdevelop.org/HEAD/doc/api/html/index.html
 
 More information about the KDevelop architecture in form of tutorials, HOWTOs,
 and FAQs can be found at
-the <a href="http://www.tdevelop.org">KDevelop website</a>.
+the <a href="http://www.kdevelop.org">KDevelop website</a>.
 
 
 \section status Current Status
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index ac8e05b6..188297f9 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -135,7 +135,7 @@ You will learn how to:
 Additional information about Qt/KDE programming is available by various sources:
 <itemizedlist>
 <listitem><para>Programming with Qt by Matthias Kalle Dalheimer</para></listitem>
-<listitem><para><ulink url="www.tdevelop.org">The User Manual to KDevelop, provided with the KDevelop IDE</ulink></para></listitem>
+<listitem><para><ulink url="www.kdevelop.org">The User Manual to KDevelop, provided with the TDevelop IDE</ulink></para></listitem>
 <listitem><para><ulink url="doc.trolltech.com">The Online Reference to the Qt library</ulink></para></listitem>
 <listitem><para><ulink url="developer.kde.org">The KDE Developer web site</ulink></para></listitem>
 </itemizedlist>
@@ -146,7 +146,7 @@ are available on the mentioned web sites, and on the Usenet newsgroups dedicated
 Unix Systems as well as about the C and C++ programming language. 
 </para>
 <para>
-For obtaining help about the KDevelop IDE, you should send requests to our mailinglist at 
+For obtaining help about the TDevelop IDE, you should send requests to our mailinglist at 
 <email>tdevelop@tdevelop.org</email>. Mind that the KDevelop team is dedicated to provide the means to enable you to 
 program applications and therefore is not intended as a technical support team in cases where the 
 applications you're developing don't work due to implementation errors or misconfigurations of your 
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index c016affd..000cf9c3 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -2920,7 +2920,7 @@ cache, you can use:
 <programlisting>
 void FooClass::reloadPage()
 {
-    KURL url("http://www.tdevelop.org/index.html");
+    KURL url("http://www.kdevelop.org/index.html");
     KIO::TransferJob *job = KIO::get(url, true, false);
     job->addMetaData("cache", "reload");
     ...
diff --git a/doc/platform/Mainpage.dox b/doc/platform/Mainpage.dox
index b5d008c6..29f6deb0 100644
--- a/doc/platform/Mainpage.dox
+++ b/doc/platform/Mainpage.dox
@@ -22,34 +22,34 @@ This document is targeted at all those that want to build their own IDE or impro
 If you are instead looking for a user manual, just go to the help menu of your KDevelop and select KDevelop handbook.
 This documentation contains the KDevelop Platform online class reference for the current
 development version of KDevelop.  Additionally, you
-can subscribe or read the <a href="http://www.tdevelop.org/index.html?filename=mailinglist.html">mailing list</a> for any additions and/or
+can subscribe or read the <a href="http://www.kdevelop.org/index.html?filename=mailinglist.html">mailing list</a> for any additions and/or
 modifications to the Platform %API.
 
-An on-line, updated every 24H, html version of this documentation can be found at: http://www.tdevelop.org/HEAD/doc/platform/html/index.html
+An on-line, updated every 24H, html version of this documentation can be found at: http://www.kdevelop.org/HEAD/doc/platform/html/index.html
 
-You can also download a local browseable copy form http://www.tdevelop.org/HEAD/doc/platform/kdevplatformdoc.tar.bz2 . It gets updated every single day too.
+You can also download a local browseable copy form http://www.kdevelop.org/HEAD/doc/platform/kdevplatformdoc.tar.bz2 . It gets updated every single day too.
 
 More information about the KDevelop Platform architecture in form of tutorials, Wikis, HOWTOs,
 and FAQs can be found at
-the <a href="http://www.tdevelop.org">KDevelop website</a>.
+the <a href="http://www.kdevelop.org">KDevelop website</a>.
 
-Quick overviews of the architecture can also be found in the issues of <a href="http://www.tdevelop.org/doc/tehcnotes">
+Quick overviews of the architecture can also be found in the issues of <a href="http://www.kdevelop.org/doc/tehcnotes">
 KDevelop Technotes</a>.
 
 \section platformapi Platform Libraries API
 
 - <a href="kdevinterfaces/html/index.html"><b>Interfaces Library</b></a>
    (<a href="kdevinterfaces/html/classes.html">classes</a>)\n
-   <i>Interfaces and classes that form KDevelop plugin architecture.</i>
+   <i>Interfaces and classes that form TDevelop plugin architecture.</i>
 - <a href="kdevextensions/html/index.html"><b>Extension Interfaces Library</b></a>
    (<a href="kdevextensions/html/classes.html">classes</a>)\n
-   <i>Extension interfaces used by KDevelop plugin architecture.</i>
+   <i>Extension interfaces used by TDevelop plugin architecture.</i>
 - <a href="kdevutil/html/index.html"><b>Utility Library</b></a>
    (<a href="kdevutil/html/classes.html">classes</a>)\n
    <i>Utility classes for the KDevelop architecture.</i>
 - <a href="kdevextras/html/index.html"><b>Extra Interfaces Library</b></a>
    (<a href="kdevextras/html/classes.html">classes</a>)\n
-   <i>Extra interfaces that are not the part of KDevelop plugin architecture
+   <i>Extra interfaces that are not the part of TDevelop plugin architecture
    but that can be implemented by extra plugins or "plugins for plugins".</i>
 - <a href="kdevwidgets/html/index.html"><b>Widgets Library</b></a>
    (<a href="kdevwidgets/html/classes.html">classes</a>)\n
@@ -112,10 +112,10 @@ KDevelop Technotes</a>.
 
 - <a href="kdevshellsrc/html/index.html"><b>Generic Shell</b></a>
    (<a href="kdevshellsrc/html/classes.html">classes</a>)\n
-   <i>The Shell - a profile-based implementation of KDevelop plugin architecture.</i>
+   <i>The Shell - a profile-based implementation of TDevelop plugin architecture.</i>
 - <a href="kdevprofileslib/html/index.html"><b>Shell Profiles Library</b></a>
    (<a href="kdevprofileslib/html/classes.html">classes</a>)\n
-   <i>Plugin profiles implementation for KDevelop shell.</i>
+   <i>Plugin profiles implementation for TDevelop shell.</i>
 .
 
 \section PlannedTasks Planned tasks
diff --git a/doc/std/kdev3api.toc b/doc/std/kdev3api.toc
index be3c7f0c..ef1c82dc 100644
--- a/doc/std/kdev3api.toc
+++ b/doc/std/kdev3api.toc
@@ -1,7 +1,7 @@
 <!DOCTYPE tdeveloptoc>
 <tdeveloptoc>
 <title>KDevelop API Documentation</title>
-<base href="http://www.tdevelop.org/HEAD/doc/api/html"/>
+<base href="http://www.kdevelop.org/HEAD/doc/api/html"/>
 <tocsect1 name="Overview" url="index.html">
 	<tocsect2 name="KDevelop 3 Architecture" url="KDev3Arch.html"/>
 	<tocsect2 name="Programming Languages Status" url="LangSupportStatus.html"/>
diff --git a/doc/tdevelop/listplugins.sh b/doc/tdevelop/listplugins.sh
index f916b7fe..22251293 100755
--- a/doc/tdevelop/listplugins.sh
+++ b/doc/tdevelop/listplugins.sh
@@ -26,7 +26,7 @@ for defscope in Core Global Project; do
 	# echo $dfile | wc -w
 	if [ `echo $dfile | wc -w` -gt 1 ]; then continue; fi
 	if [ ! -f $dfile ]; then continue; fi
-	scope=`cat $dfile | grep "X-KDevelop-Scope=" | cut -d= -f2-`
+	scope=`cat $dfile | grep "X-TDevelop-Scope=" | cut -d= -f2-`
 	if [ $scope != $defscope ]; then continue; fi
 	comment=`cat $dfile | grep "Comment=" | cut -d= -f2-`
 	name=`cat $dfile | egrep "^Name=" | cut -d= -f2- | tr " " _`
diff --git a/doc/tdevelop/plugin-tools.docbook b/doc/tdevelop/plugin-tools.docbook
index 35e2c206..a05c1e7c 100644
--- a/doc/tdevelop/plugin-tools.docbook
+++ b/doc/tdevelop/plugin-tools.docbook
@@ -18,8 +18,8 @@ it's enabled in the Project - Project Options dialog.
 lib/interfaces/kdevplugin.h. The following is taken from a comment from there.</para>
 
 <para> 
-KDevPlugin is the base class for all KDevelop plugins.
-A plugin is a component which is loaded into KDevelop shell at startup or by request.
+KDevPlugin is the base class for all TDevelop plugins.
+A plugin is a component which is loaded into TDevelop shell at startup or by request.
 A plugin has a scope that can be either:
 <itemizedlist>
 <listitem><simpara>Core</simpara></listitem>
diff --git a/doc/tdevelop/project-management.docbook b/doc/tdevelop/project-management.docbook
index 69ca9474..e70d07dc 100644
--- a/doc/tdevelop/project-management.docbook
+++ b/doc/tdevelop/project-management.docbook
@@ -126,7 +126,7 @@ One of these four alternatives must be chosen when you create a project and <emp
 There are several tutorials available on the &GNU; Build System (<command>Autoconf</command>, <command>Automake</command> and <command>Libtool</command>) of which the &automanag; makes use.
 </para>
 <itemizedlist>
-  <listitem><para>A short <ulink url="http://www.tdevelop.org/index.html?filename=tutorial_autoconf.html">autoconf tutorial</ulink> written by Christopher W. Curtis available on the &tdevelop; home page. It concentrates on some basic steps to modify a <filename>Makefile</filename>.
+  <listitem><para>A short <ulink url="http://www.kdevelop.org/index.html?filename=tutorial_autoconf.html">autoconf tutorial</ulink> written by Christopher W. Curtis available on the &tdevelop; home page. It concentrates on some basic steps to modify a <filename>Makefile</filename>.
   </para></listitem>
   <listitem><para>
   A more detailed tutorial can be found in a greater set of tutorials on  <ulink url="http://www.amath.washington.edu/~lf/tutorials/autoconf/toolsmanual_toc.html"><quote>Developing software with GNU</quote></ulink>.
diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook
index 05f6ef5a..5e07b0b6 100644
--- a/doc/tdevelop/tdevelop-install.docbook
+++ b/doc/tdevelop/tdevelop-install.docbook
@@ -45,7 +45,7 @@ In this chapter we will discuss the steps necessary to compile and install the &
 &tdevelop; is available in binary form from many different &Linux; distributions such as <!--&SuSE;, &RedHat;//--> SuSE, RedHat and others. These binaries are packed in some convenient format, mostly RPM, for easy installation. To install, follow the standard instructions given in your distribution.
 </para>
 <para>
-You may as well obtain the &tdevelop; sources, compile and install them by yourself. These sources can be found via the project home page at <ulink url="http://www.tdevelop.org"> http://www.tdevelop.org</ulink> or via the <ulink url="http://download.kde.org">&kde; ftp site</ulink>.
+You may as well obtain the &tdevelop; sources, compile and install them by yourself. These sources can be found via the project home page at <ulink url="http://www.kdevelop.org"> http://www.kdevelop.org</ulink> or via the <ulink url="http://download.kde.org">&kde; ftp site</ulink>.
 </para>
 
 <sect2 id="howto-svn">
@@ -699,7 +699,7 @@ The <command>kbuildsycoca</command> command does not run from within the root. Y
 API is the short form of <quote>Application Program Interface</quote>. Actually such an API cotains a series of descriptions (&ie; calling conventions) by which an application program can access the operating system and other services. In our context, however, a broader definition was adopted. The API of a &kde; or &Qt; application is an abstract of the classes and methods interfaces, a synopsis to be used like a dictionary to navigate the sources.
 </para>
 <para>
-There is a version of the most current API available at the <ulink url="http://www.tdevelop.org/HEAD/doc/api/html/index.html">KDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
+There is a version of the most current API available at the <ulink url="http://www.kdevelop.org/HEAD/doc/api/html/index.html">KDevelop-Home website</ulink>. It will be automatically updated every 24 hours so you can keep up.
 </para>
 <para>
 Alas, this version is best used read-only over the internet. If you do not always have internet access you may as well build your own API documentation from the &tdevelop; sources. To do so, you must tell the automake system where to find the KDELIBS API in your system. This is accomplished by the special option <option>--with-tdelibsdoxy-dir</option> in the <command>configure</command> command when you prepare to compile the &tdevelop; sources:
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index 12091768..0416bcc1 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -62,7 +62,7 @@ void VisualBoyAdvancePart::slotExecute(){
 
   program += prj->projectDirectory() + "/" + binary;
 
-  if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+  if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
       appFrontend->startAppCommand(TQString(), program, terminal);
 }
 
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index a36761a8..ebd483a4 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -182,7 +182,7 @@ void BashSupportPart::savedFile(const KURL &fileName)
 void BashSupportPart::startApplication(const TQString &program)
 {
 	kdDebug() << "starting application" << program << endl;
-	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(TQString(), program, TRUE);
 }
 
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index e687c949..07ecde2b 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -236,7 +236,7 @@ void AddMethodDialog::accept()
 		TQFileInfo fileInfo( implementationFile );
 		if ( !TQFile::exists( fileInfo.absFilePath() ) )
 		{
-			if ( KDevCreateFile * createFileSupp = m_cppSupport->extension<KDevCreateFile>( "KDevelop/CreateFile" ) )
+			if ( KDevCreateFile * createFileSupp = m_cppSupport->extension<KDevCreateFile>( "TDevelop/CreateFile" ) )
 				createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() );
 		}
 
diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
index 5240b2ee..a69024da 100644
--- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
@@ -102,7 +102,7 @@ Dest=%{dest}/src/%{APPNAMELC}.c
 
 [CMAKE]
 Type=finishcmd
-Command=cmake ./ -GKDevelop3
+Command=cmake ./ -GTDevelop3
 Directory=%{dest}
 
 [MSG]
diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
index 8f3d0cf9..b9158789 100644
--- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
@@ -102,7 +102,7 @@ Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [CMAKE]
 Type=finishcmd
-Command=cmake ./ -GKDevelop3
+Command=cmake ./ -GTDevelop3
 Directory=%{dest}
 
 [MSG]
diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate
index ff69203c..4bda3062 100644
--- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate
+++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate
@@ -97,7 +97,7 @@ Dest=%{dest}/src/fileprint.xpm
 
 [CMAKE]
 Type=finishcmd
-Command=cmake ./ -GKDevelop3
+Command=cmake ./ -GTDevelop3
 Directory=%{dest}
 
 [MSG]
diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
index a80c8079..a7ad0e8b 100644
--- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
@@ -75,7 +75,7 @@ Dest=%{dest}/README
 
 [CMAKE]
 Type=finishcmd
-Command=cmake ./ -GKDevelop3
+Command=cmake ./ -GTDevelop3
 Directory=%{dest}
 
 [MSG]
diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
index 3068fdd3..f1abb9d2 100644
--- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
@@ -78,7 +78,7 @@ Dest=%{dest}/main.c
 
 [CMAKE]
 Type=finishcmd
-Command=cmake ./ -GKDevelop3
+Command=cmake ./ -GTDevelop3
 Directory=%{dest}
 
 [MSG]
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
index a8fc65c4..c81bbc97 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
+++ b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate
@@ -1,63 +1,63 @@
 # KDE Config File
 [General]
-Name=KDevelop Language Support Plugin (Standalone build)
-Name[ca]=Connector per al suport de llenguatge a KDevelop (de construcció aïllada)
-Name[da]=KDevelop plugin for sprogstøttet (alenestående bygning)
-Name[de]=KDevelop-Modul für Sprachunterstützung (Unabhängige Erstellung)
-Name[el]=Πρόσθετο υποστήριξης γλώσσας του KDevelop (αυτόνομη κατασκευή)
-Name[es]=Complemento de implementación de lenguaje para KDevelop (construcción independiente)
-Name[et]=KDevelopi keeletoetuse plugin (autonoomne)
-Name[eu]=KDevelop-en lengoaien euskarrien interfazea (eraikuntza autonomoak)
-Name[fa]=وصلۀ پشتیبانی زبان KDevelop )ساخت خوداتکا(
-Name[fr]=Module externe de prise en charge de langage de KDevelop (construction autonome)
-Name[ga]=Breiseán Tacaíochta Teanga le haghaidh KDevelop (Tógáil Shaorsheasaimh)
-Name[gl]=Extensión de soporte de linguaxes para KDevelop (compilación independente)
-Name[hu]=KDevelop nyelvtámogató modul (önálló)
-Name[it]=Plugin di supporto per linguaggio di KDevelop (compilazione indipendente)
-Name[ja]=KDevelop 言語サポートプラグイン (スタンダローンビルド)
-Name[nds]=KDevelop-Moduul för Spraakünnerstütten (Enkelprogramm)
+Name=TDevelop Language Support Plugin (Standalone build)
+Name[ca]=Connector per al suport de llenguatge a TDevelop (de construcció aïllada)
+Name[da]=TDevelop plugin for sprogstøttet (alenestående bygning)
+Name[de]=TDevelop-Modul für Sprachunterstützung (Unabhängige Erstellung)
+Name[el]=Πρόσθετο υποστήριξης γλώσσας του TDevelop (αυτόνομη κατασκευή)
+Name[es]=Complemento de implementación de lenguaje para TDevelop (construcción independiente)
+Name[et]=TDevelopi keeletoetuse plugin (autonoomne)
+Name[eu]=TDevelop-en lengoaien euskarrien interfazea (eraikuntza autonomoak)
+Name[fa]=وصلۀ پشتیبانی زبان TDevelop )ساخت خوداتکا(
+Name[fr]=Module externe de prise en charge de langage de TDevelop (construction autonome)
+Name[ga]=Breiseán Tacaíochta Teanga le haghaidh TDevelop (Tógáil Shaorsheasaimh)
+Name[gl]=Extensión de soporte de linguaxes para TDevelop (compilación independente)
+Name[hu]=TDevelop nyelvtámogató modul (önálló)
+Name[it]=Plugin di supporto per linguaggio di TDevelop (compilazione indipendente)
+Name[ja]=TDevelop 言語サポートプラグイン (スタンダローンビルド)
+Name[nds]=TDevelop-Moduul för Spraakünnerstütten (Enkelprogramm)
 Name[ne]=केडीई विकास भाषा समर्थन प्लगइन (स्ट्यान्डअलोन निर्माण)
 Name[nl]=KDEvelop Taalondersteuning Plugin (Standalone build)
-Name[pl]=Wtyczka KDevelopa do obsługi języka (budowana oddzielnie)
-Name[pt]='Plugin' de Suporte a Linguagens do KDevelop (compilação autónoma)
-Name[pt_BR]='Plugin' de Suporte a Linguagens do KDevelop (compilação autónoma)
-Name[ru]=Интерфейс языковой поддержки для KDevelop (внешний)
-Name[sk]=KDevelop modul pre jazykovú podporu (samostatný build)
-Name[sl]=Vstavek jezikovne podpore za KDevelop (samostojna izgradnja)
-Name[sr]=KDevelop-ов интерфејс за језичку подршку (самостална градња)
-Name[sr@Latn]=KDevelop-ov interfejs za jezičku podršku (samostalna gradnja)
-Name[sv]=KDevelop-insticksprogram för språkstöd (att bygga fristående)
-Name[tr]=KDevelop Dil Desteği Eklentisi (Kendi başına çalışabilen kurulum)
-Name[zh_CN]=KDevelop 语言支持插件(独立编译)
-Name[zh_TW]=KDevelop 語言支援外掛程式（單獨建立）
-Category=C++/KDevelop/
-Comment=This generates a language support plugin for KDevelop, to be built outside of the KDevelop source tree.
-Comment[ca]=Genera un connector per al suport de llenguatge a KDevelop, per a que es construeixi fora de l'arbre de fonts de KDevelop.
-Comment[da]=Dette genererer en sprogstøtte-plugin for KDevelop, der skal bygges  udenfor KDevelop's kildetræ.
-Comment[de]=Hiermit wird ein Sprachunterstützungsmodul für KDevelop generiert, das außerhalb des Quelltextbaumes von KDevelop erstellt wird.
-Comment[el]=Αυτό δημιουργεί ένα πρόσθετο υποστήριξης γλώσσας για το KDevelop, για την κατασκευή του έξω από το δέντρο πηγαίου κώδικα του KDevelop.
-Comment[es]=Genera un complemento de implementación de lenguaje para KDevelop, para ser construido fuera del árbol de código fuente de KDevelop.
-Comment[et]=KDevelopi keeletoetuse plugina loomine, mida saab ehitada väljaspool KDevelopi lähtekoodipuud.
-Comment[eu]=Honek KDevelop-en lengoai-euskarrirako plugin bat sortzen du, KDevelop-en iturburu zuhaitzetik at eraikitzeko.
-Comment[fa]=یک وصلۀ پشتیبان برای KDevelop تولید می‌کند، تا در بیرون درخت منبع KDevelop ساخته شود.
-Comment[fr]=Génère un module externe de prise en charge de langage pour KDevelop, à construire en dehors de l'arborescence des sources de KDevelop.
-Comment[gl]=Isto xera unha extensión de soporte de linguaxes para KDevelop que se compilará fóra da árbore de código de KDevelop.
-Comment[hu]=Létrehoz egy nyelvtámogató modult a KDevelophoz, mely a KDevelopos forráskönyvtáron kívül fordítható le.
-Comment[it]=Genera un plugin di supporto per linguaggio per KDevelop, deve essere compilato fuori dell'albero sorgente di KDevelop.
-Comment[nds]=Dit stellt en Spraakünnerstütten-Moduul för KDevelop op, dat buten den KDevelop-Bornboom kompileert warrt.
+Name[pl]=Wtyczka TDevelopa do obsługi języka (budowana oddzielnie)
+Name[pt]='Plugin' de Suporte a Linguagens do TDevelop (compilação autónoma)
+Name[pt_BR]='Plugin' de Suporte a Linguagens do TDevelop (compilação autónoma)
+Name[ru]=Интерфейс языковой поддержки для TDevelop (внешний)
+Name[sk]=TDevelop modul pre jazykovú podporu (samostatný build)
+Name[sl]=Vstavek jezikovne podpore za TDevelop (samostojna izgradnja)
+Name[sr]=TDevelop-ов интерфејс за језичку подршку (самостална градња)
+Name[sr@Latn]=TDevelop-ov interfejs za jezičku podršku (samostalna gradnja)
+Name[sv]=TDevelop-insticksprogram för språkstöd (att bygga fristående)
+Name[tr]=TDevelop Dil Desteği Eklentisi (Kendi başına çalışabilen kurulum)
+Name[zh_CN]=TDevelop 语言支持插件(独立编译)
+Name[zh_TW]=TDevelop 語言支援外掛程式（單獨建立）
+Category=C++/TDevelop/
+Comment=This generates a language support plugin for TDevelop, to be built outside of the TDevelop source tree.
+Comment[ca]=Genera un connector per al suport de llenguatge a TDevelop, per a que es construeixi fora de l'arbre de fonts de TDevelop.
+Comment[da]=Dette genererer en sprogstøtte-plugin for TDevelop, der skal bygges  udenfor TDevelop's kildetræ.
+Comment[de]=Hiermit wird ein Sprachunterstützungsmodul für TDevelop generiert, das außerhalb des Quelltextbaumes von TDevelop erstellt wird.
+Comment[el]=Αυτό δημιουργεί ένα πρόσθετο υποστήριξης γλώσσας για το TDevelop, για την κατασκευή του έξω από το δέντρο πηγαίου κώδικα του TDevelop.
+Comment[es]=Genera un complemento de implementación de lenguaje para TDevelop, para ser construido fuera del árbol de código fuente de TDevelop.
+Comment[et]=TDevelopi keeletoetuse plugina loomine, mida saab ehitada väljaspool TDevelopi lähtekoodipuud.
+Comment[eu]=Honek TDevelop-en lengoai-euskarrirako plugin bat sortzen du, TDevelop-en iturburu zuhaitzetik at eraikitzeko.
+Comment[fa]=یک وصلۀ پشتیبان برای TDevelop تولید می‌کند، تا در بیرون درخت منبع TDevelop ساخته شود.
+Comment[fr]=Génère un module externe de prise en charge de langage pour TDevelop, à construire en dehors de l'arborescence des sources de TDevelop.
+Comment[gl]=Isto xera unha extensión de soporte de linguaxes para TDevelop que se compilará fóra da árbore de código de TDevelop.
+Comment[hu]=Létrehoz egy nyelvtámogató modult a TDevelophoz, mely a TDevelopos forráskönyvtáron kívül fordítható le.
+Comment[it]=Genera un plugin di supporto per linguaggio per TDevelop, deve essere compilato fuori dell'albero sorgente di TDevelop.
+Comment[nds]=Dit stellt en Spraakünnerstütten-Moduul för TDevelop op, dat buten den TDevelop-Bornboom kompileert warrt.
 Comment[ne]=यसले केडीई विकासका लागि केडीई विकास स्रोत ट्रीको बाहिर निर्माण गर्न, भाषा समर्थन प्लगइन उत्पन्न गर्दछ ।
-Comment[nl]=Dit genereert een taalondersteuningsplugin voor KDEvelop, welke buiten de KDevelop sourcetree wordt gebouwd.
-Comment[pl]=Generuje wtyczkę do obsługi języka w KDevelopie. Wtyczka jest budowana poza drzewem źródłowym KDevelopa.
-Comment[pt]=Isto gera um 'plugin' de suporte de linguagens para o KDevelop, que possa ser compilado fora da árvore de código do KDevelop.
-Comment[pt_BR]=Isto gera um 'plugin' de suporte de linguagens para o KDevelop, que possa ser compilado fora da árvore de código do KDevelop.
-Comment[ru]=Создание интерфейса языковой поддержки для KDevelop со сборкой вне исходного кода KDevelop.
-Comment[sk]=Vygeneruje modul pre jazykovú podporu pre KDevelop, tak aby ho bolo možné kompilovať mimo zdrojového stromu KDevelop.
-Comment[sr]=Ово прави прикључак за језичку подршку за KDevelop, који се гради ван KDevelop-овог изворног стабла.
-Comment[sr@Latn]=Ovo pravi priključak za jezičku podršku za KDevelop, koji se gradi van KDevelop-ovog izvornog stabla.
-Comment[sv]=Detta skapar ett KDevelop-insticksprogram för språkstöd, att bygga utanför KDevelops källkodsträd.
-Comment[tr]=Bu KDevelop için, KDevelop kaynak ağacının dışında olacak, bir dil desteği eklentisi yaratır.
-Comment[zh_CN]=这将生成 KDevelop 的语言支持插件，可以在 KDevelop 源代码树之外编译。
-Comment[zh_TW]=產生一個 KDevelop 語言支援外掛程式，建立在 KDevelop 程式源碼樹之外。
+Comment[nl]=Dit genereert een taalondersteuningsplugin voor KDEvelop, welke buiten de TDevelop sourcetree wordt gebouwd.
+Comment[pl]=Generuje wtyczkę do obsługi języka w TDevelopie. Wtyczka jest budowana poza drzewem źródłowym TDevelopa.
+Comment[pt]=Isto gera um 'plugin' de suporte de linguagens para o TDevelop, que possa ser compilado fora da árvore de código do TDevelop.
+Comment[pt_BR]=Isto gera um 'plugin' de suporte de linguagens para o TDevelop, que possa ser compilado fora da árvore de código do TDevelop.
+Comment[ru]=Создание интерфейса языковой поддержки для TDevelop со сборкой вне исходного кода TDevelop.
+Comment[sk]=Vygeneruje modul pre jazykovú podporu pre TDevelop, tak aby ho bolo možné kompilovať mimo zdrojového stromu TDevelop.
+Comment[sr]=Ово прави прикључак за језичку подршку за TDevelop, који се гради ван TDevelop-овог изворног стабла.
+Comment[sr@Latn]=Ovo pravi priključak za jezičku podršku za TDevelop, koji se gradi van TDevelop-ovog izvornog stabla.
+Comment[sv]=Detta skapar ett TDevelop-insticksprogram för språkstöd, att bygga utanför TDevelops källkodsträd.
+Comment[tr]=Bu TDevelop için, TDevelop kaynak ağacının dışında olacak, bir dil desteği eklentisi yaratır.
+Comment[zh_CN]=这将生成 TDevelop 的语言支持插件，可以在 TDevelop 源代码树之外编译。
+Comment[zh_TW]=產生一個 TDevelop 語言支援外掛程式，建立在 TDevelop 程式源碼樹之外。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}_part.cpp
 Archive=kdevlang.tar.gz
@@ -128,30 +128,30 @@ Dest=%{dest}/src/README.dox
 
 [MSG]
 Type=message
-Comment=A language plugin for KDevelop for standalone build was created in %{dest}
-Comment[ca]=Un connector per a llenguatge a KDevelop i de construcció aïllada ha estat creat en %{dest}
-Comment[da]=Et sprog-plugin for KDevelop for alenestående bygning blev oprettet i %{dest}
-Comment[de]=Ein Sprachunterstützungsmodul für KDevelop (unabhängige Erstellung) wurde in %{dest} erstellt.
-Comment[el]=Ένα πρόσθετο γλώσσας για το KDevelop για αυτόνομη κατασκευή δημιουργήθηκε στο %{dest}
-Comment[es]=Un complemento de lenguaje para KDevelop de construcción independiente ha sido creado en %{dest}
-Comment[et]=KDevelopi autonoomne keeleplugin loodi asukohta %{dest}
-Comment[eu]=KDevelop-en hizkuntza plugin autonomo bat sortu da hemen: %{dest}
-Comment[fa]=یک وصلۀ زبان برای KDevelop جهت ساخت خوداتکا در %{dest} ایجاد شد
-Comment[fr]=Un module externe de langage pour KDevelop à construire de façon autonome a été créé dans %{dest}
-Comment[gl]=Creouse unha extensión de linguaxe para KDevelop a compilar de forma independente en %{dest}
-Comment[hu]=Létrejött egy KDevelopos nyelvtámogató modul (önálló lefordításra) itt: %{dest}
-Comment[it]=È stato creato un plugin di linguaggio per KDevelop per compilazione indipendente %{dest}
-Comment[nds]=In %{dest} wöör en Spraakünnerstütten-Moduul för KDevelop (Enkelprogramm) opstellt
+Comment=A language plugin for TDevelop for standalone build was created in %{dest}
+Comment[ca]=Un connector per a llenguatge a TDevelop i de construcció aïllada ha estat creat en %{dest}
+Comment[da]=Et sprog-plugin for TDevelop for alenestående bygning blev oprettet i %{dest}
+Comment[de]=Ein Sprachunterstützungsmodul für TDevelop (unabhängige Erstellung) wurde in %{dest} erstellt.
+Comment[el]=Ένα πρόσθετο γλώσσας για το TDevelop για αυτόνομη κατασκευή δημιουργήθηκε στο %{dest}
+Comment[es]=Un complemento de lenguaje para TDevelop de construcción independiente ha sido creado en %{dest}
+Comment[et]=TDevelopi autonoomne keeleplugin loodi asukohta %{dest}
+Comment[eu]=TDevelop-en hizkuntza plugin autonomo bat sortu da hemen: %{dest}
+Comment[fa]=یک وصلۀ زبان برای TDevelop جهت ساخت خوداتکا در %{dest} ایجاد شد
+Comment[fr]=Un module externe de langage pour TDevelop à construire de façon autonome a été créé dans %{dest}
+Comment[gl]=Creouse unha extensión de linguaxe para TDevelop a compilar de forma independente en %{dest}
+Comment[hu]=Létrejött egy TDevelopos nyelvtámogató modul (önálló lefordításra) itt: %{dest}
+Comment[it]=È stato creato un plugin di linguaggio per TDevelop per compilazione indipendente %{dest}
+Comment[nds]=In %{dest} wöör en Spraakünnerstütten-Moduul för TDevelop (Enkelprogramm) opstellt
 Comment[ne]=स्ट्यान्डअलोन निर्माण गर्न केडीई विकासका लागि भाषा प्लगइन %{dest} मा सिर्जना गरियो
-Comment[nl]=Een taalplugin voor KDevelop voor standalone build is aangemaakt in %{dest}
-Comment[pl]=Wtyczka języka dla KDevelopa do budowy oddzielnie została utworzona w %{dest}
-Comment[pt]=Foi criado um 'plugin' de linguagens de compilação autónoma para o KDevelop em %{dest}
-Comment[pt_BR]=Foi criado um 'plugin' de linguagens de compilação autónoma para o KDevelop em %{dest}
-Comment[ru]=Внешний интерфейс языковой поддержки для KDevelop создан в %{dest}
-Comment[sk]=Modul pre jazykovú podporu pre KDevelop bol vutvorený v %{dest}
-Comment[sr]=Језички прикључак за KDevelop за самосталну градњу направљен је у %{dest}
-Comment[sr@Latn]=Jezički priključak za KDevelop za samostalnu gradnju napravljen je u %{dest}
-Comment[sv]=Ett KDevelop-insticksprogram för språkstöd att bygga fristående skapades i %{dest}
-Comment[tr]=Kendi başına çalışabilen bir KDevelop dil eklentisi %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了一个独立编译的 KDevelop 语言插件
-Comment[zh_TW]=一個單獨建立的 KDevelop 語言外掛程式已建立於 %{dest}
+Comment[nl]=Een taalplugin voor TDevelop voor standalone build is aangemaakt in %{dest}
+Comment[pl]=Wtyczka języka dla TDevelopa do budowy oddzielnie została utworzona w %{dest}
+Comment[pt]=Foi criado um 'plugin' de linguagens de compilação autónoma para o TDevelop em %{dest}
+Comment[pt_BR]=Foi criado um 'plugin' de linguagens de compilação autónoma para o TDevelop em %{dest}
+Comment[ru]=Внешний интерфейс языковой поддержки для TDevelop создан в %{dest}
+Comment[sk]=Modul pre jazykovú podporu pre TDevelop bol vutvorený v %{dest}
+Comment[sr]=Језички прикључак за TDevelop за самосталну градњу направљен је у %{dest}
+Comment[sr@Latn]=Jezički priključak za TDevelop za samostalnu gradnju napravljen je u %{dest}
+Comment[sv]=Ett TDevelop-insticksprogram för språkstöd att bygga fristående skapades i %{dest}
+Comment[tr]=Kendi başına çalışabilen bir TDevelop dil eklentisi %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了一个独立编译的 TDevelop 语言插件
+Comment[zh_TW]=一個單獨建立的 TDevelop 語言外掛程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
index 4be91e8a..9bdb0789 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
+++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate
@@ -1,61 +1,61 @@
 # KDE Config File
 [General]
-Name=KDevelop Plugin (KDevelop source tree build)
-Name[ca]=Connector per a KDevelop (de construcció a l'arbre de fonts de KDevelop)
-Name[da]=KDevelop Plugin (KDevelop kildetræ bygning)
-Name[de]=KDevelop-Modul (Erstellung im KDevelop-Quelltextbaum)
-Name[el]=Πρόσθετο KDevelop (κατασκευή με το δέντρο πηγαίου κώδικα του KDevelop)
-Name[es]=Complemento para KDevelop (construcción en árbol de código fuente de KDevelop)
-Name[et]=KDevelopi plugin (Kdevelopi lähtekoodipuus)
-Name[eu]=KDevelop plugina (KDevelop-en iturburu zuhaitzean erakitzeko)
-Name[fa]=وصلۀ KDevelop )ساخت درخت منبع KDevelop(
-Name[fr]=Module externe de KDevelop (construction dans l'arborescence des sources de KDevelop)
-Name[gl]=Extensión para KDevelop (compilación na árbore de código de KDevelop)
-Name[hu]=KDevelop-bővítőmodul (KDevelopos forráskönyvtáron belül)
-Name[it]=Plugin di KDevelop (compila l'albero sorgente di KDevelop)
-Name[ja]=KDevelop プラグイン (KDevelop ソースツリービルド)
-Name[nds]=KDevelop-Moduul (KDevelop-Bornboomprogramm)
+Name=TDevelop Plugin (TDevelop source tree build)
+Name[ca]=Connector per a TDevelop (de construcció a l'arbre de fonts de TDevelop)
+Name[da]=TDevelop Plugin (TDevelop kildetræ bygning)
+Name[de]=TDevelop-Modul (Erstellung im TDevelop-Quelltextbaum)
+Name[el]=Πρόσθετο TDevelop (κατασκευή με το δέντρο πηγαίου κώδικα του TDevelop)
+Name[es]=Complemento para TDevelop (construcción en árbol de código fuente de TDevelop)
+Name[et]=TDevelopi plugin (Kdevelopi lähtekoodipuus)
+Name[eu]=TDevelop plugina (TDevelop-en iturburu zuhaitzean erakitzeko)
+Name[fa]=وصلۀ TDevelop )ساخت درخت منبع TDevelop(
+Name[fr]=Module externe de TDevelop (construction dans l'arborescence des sources de TDevelop)
+Name[gl]=Extensión para TDevelop (compilación na árbore de código de TDevelop)
+Name[hu]=TDevelop-bővítőmodul (TDevelopos forráskönyvtáron belül)
+Name[it]=Plugin di TDevelop (compila l'albero sorgente di TDevelop)
+Name[ja]=TDevelop プラグイン (TDevelop ソースツリービルド)
+Name[nds]=TDevelop-Moduul (TDevelop-Bornboomprogramm)
 Name[ne]=केडीई विकास प्लगइन (केडीई विकास स्रोत ट्री निर्माण)
-Name[nl]=KDevelop-plugin (KDevelop source tree build)
-Name[pl]=Wtyczka KDevelopa (budowa w drzewie źródłowym KDevelopa)
-Name[pt]='Plugin' do KDevelop (compilação na árvore de código do KDevelop)
-Name[pt_BR]='Plugin' do KDevelop (compilação na árvore de código do KDevelop)
-Name[ru]=Модуль KDevelop (в исходном коде KDevelop)
-Name[sk]=KDevelop modul (KDevelop zdrojový strom build)
-Name[sr]=Прикључак за KDevelop (градња у изворном стаблу KDevelop-а)
-Name[sr@Latn]=Priključak za KDevelop (gradnja u izvornom stablu KDevelop-a)
-Name[sv]=KDevelop-insticksprogram (att bygga i KDevelops källkodsträd)
-Name[tr]=KDevelop Eklentisi (KDevelop kaynak ağacı kurulumu)
-Name[zh_CN]=KDevelop 插件(KDevelop 源代码树编译)
-Name[zh_TW]=KDevelop 外掛程式（KDevelop 程式源碼樹內建立）
-Category=C++/KDevelop/
-Comment=This generates a plugin for KDevelop, for building within the KDevelop source tree
-Comment[ca]=Genera un connector per a KDevelop, per a que es construeixi en l'arbre de fonts de KDevelop
-Comment[da]=Dette genererer et plugin for KDevelop, til at bygges indenfor  KDevelop's kildetræ
-Comment[de]=Hiermit wird ein Modul für KDevelop erstellt, dessen Erstellung innerhalb des Quelltextbaumes von KDevelop erfolgt.
-Comment[el]=Αυτό δημιουργεί ένα πρόσθετο για το KDevelop, για κατασκευή του μέσα στο δέντρο πηγαίου κώδικα του KDevelop
-Comment[es]=Genera un complemento para KDevelop, para ser construido en el árbol de código fuente de KDevelop
-Comment[et]=KDevelopi plugina loomine, mis ehitatakse KDevelopi lähtekoodipuus.
-Comment[eu]=Honek KDevelop-erako plugin bat sortzen du, KDevelop-en iturburu-zuhaitzean eraikitzeko
-Comment[fa]=وصله‌ای برای  KDevelop، برای ساختن در درخت منبع KDevelop تولید می‌کند
-Comment[fr]=Génère un module externe pour KDevelop, à construire dans l'arborescence des sources de KDevelop
-Comment[gl]=Isto xera unha extensión para KDevelop que se compilará dentro da árbore de código de KDevelop
-Comment[hu]=Létrehoz egy KDevelop-bővítőmodult, mely a KDevelopos forráskönyvtáron belül fordítható le
-Comment[it]=Genera un plugin per KDevelop, per compilarlo assieme all'albero sorgente di KDevelop
-Comment[nds]=Dit stellt en KDevelop-Moduul för't Kompileren binnen den KDevelop-Bornboom op
+Name[nl]=TDevelop-plugin (TDevelop source tree build)
+Name[pl]=Wtyczka TDevelopa (budowa w drzewie źródłowym TDevelopa)
+Name[pt]='Plugin' do TDevelop (compilação na árvore de código do TDevelop)
+Name[pt_BR]='Plugin' do TDevelop (compilação na árvore de código do TDevelop)
+Name[ru]=Модуль TDevelop (в исходном коде TDevelop)
+Name[sk]=TDevelop modul (TDevelop zdrojový strom build)
+Name[sr]=Прикључак за TDevelop (градња у изворном стаблу TDevelop-а)
+Name[sr@Latn]=Priključak za TDevelop (gradnja u izvornom stablu TDevelop-a)
+Name[sv]=TDevelop-insticksprogram (att bygga i TDevelops källkodsträd)
+Name[tr]=TDevelop Eklentisi (TDevelop kaynak ağacı kurulumu)
+Name[zh_CN]=TDevelop 插件(TDevelop 源代码树编译)
+Name[zh_TW]=TDevelop 外掛程式（TDevelop 程式源碼樹內建立）
+Category=C++/TDevelop/
+Comment=This generates a plugin for TDevelop, for building within the TDevelop source tree
+Comment[ca]=Genera un connector per a TDevelop, per a que es construeixi en l'arbre de fonts de TDevelop
+Comment[da]=Dette genererer et plugin for TDevelop, til at bygges indenfor  TDevelop's kildetræ
+Comment[de]=Hiermit wird ein Modul für TDevelop erstellt, dessen Erstellung innerhalb des Quelltextbaumes von TDevelop erfolgt.
+Comment[el]=Αυτό δημιουργεί ένα πρόσθετο για το TDevelop, για κατασκευή του μέσα στο δέντρο πηγαίου κώδικα του TDevelop
+Comment[es]=Genera un complemento para TDevelop, para ser construido en el árbol de código fuente de TDevelop
+Comment[et]=TDevelopi plugina loomine, mis ehitatakse TDevelopi lähtekoodipuus.
+Comment[eu]=Honek TDevelop-erako plugin bat sortzen du, TDevelop-en iturburu-zuhaitzean eraikitzeko
+Comment[fa]=وصله‌ای برای  TDevelop، برای ساختن در درخت منبع TDevelop تولید می‌کند
+Comment[fr]=Génère un module externe pour TDevelop, à construire dans l'arborescence des sources de TDevelop
+Comment[gl]=Isto xera unha extensión para TDevelop que se compilará dentro da árbore de código de TDevelop
+Comment[hu]=Létrehoz egy TDevelop-bővítőmodult, mely a TDevelopos forráskönyvtáron belül fordítható le
+Comment[it]=Genera un plugin per TDevelop, per compilarlo assieme all'albero sorgente di TDevelop
+Comment[nds]=Dit stellt en TDevelop-Moduul för't Kompileren binnen den TDevelop-Bornboom op
 Comment[ne]=यसले केडीई विकास स्रोत ट्री भित्र निर्माण गर्न, केडीई विकासका लागि प्लगइन उत्पन्न गर्दछ
-Comment[nl]=Dit genereert een plugin voor KDevelop, om te bouwen binnen de KDevelop sourcetree
-Comment[pl]=Generuje wtyczkę do KDevelopa, która jest budowana w jego drzewie źródłowym
-Comment[pt]=Isto gera um 'plugin' para o KDevelop, para uma compilação dentro da árvore de código do KDevelop
-Comment[pt_BR]=Isto gera um 'plugin' para o KDevelop, para uma compilação dentro da árvore de código do KDevelop
-Comment[ru]=Создание модуля KDevelop в исходном коде KDevelop
-Comment[sk]=Vygeneruje modul pre KDevelop, ktorý sa bude kompilovať v rámci KDevelop zdrojového stromu
-Comment[sr]=Ово прави прикључак за KDevelop, за градњу у оквиру KDevelop-овог изворног стабла
-Comment[sr@Latn]=Ovo pravi priključak za KDevelop, za gradnju u okviru KDevelop-ovog izvornog stabla
-Comment[sv]=Det här skapar ett insticksprogram för KDevelop, att byggas inne i KDevelops källkodsträd.
-Comment[tr]=Bu KDevelop için, KDevelop kaynak ağacınında olacak, bir eklenti yaratır.
-Comment[zh_CN]=这将生成 KDevelop 的插件，该插件需要与 KDevelop 源代码树一起编译
-Comment[zh_TW]=產生一個 KDevelop 外掛程式，建立於 KDevelop 程式源碼樹內。
+Comment[nl]=Dit genereert een plugin voor TDevelop, om te bouwen binnen de TDevelop sourcetree
+Comment[pl]=Generuje wtyczkę do TDevelopa, która jest budowana w jego drzewie źródłowym
+Comment[pt]=Isto gera um 'plugin' para o TDevelop, para uma compilação dentro da árvore de código do TDevelop
+Comment[pt_BR]=Isto gera um 'plugin' para o TDevelop, para uma compilação dentro da árvore de código do TDevelop
+Comment[ru]=Создание модуля TDevelop в исходном коде TDevelop
+Comment[sk]=Vygeneruje modul pre TDevelop, ktorý sa bude kompilovať v rámci TDevelop zdrojového stromu
+Comment[sr]=Ово прави прикључак за TDevelop, за градњу у оквиру TDevelop-овог изворног стабла
+Comment[sr@Latn]=Ovo pravi priključak za TDevelop, za gradnju u okviru TDevelop-ovog izvornog stabla
+Comment[sv]=Det här skapar ett insticksprogram för TDevelop, att byggas inne i TDevelops källkodsträd.
+Comment[tr]=Bu TDevelop için, TDevelop kaynak ağacınında olacak, bir eklenti yaratır.
+Comment[zh_CN]=这将生成 TDevelop 的插件，该插件需要与 TDevelop 源代码树一起编译
+Comment[zh_TW]=產生一個 TDevelop 外掛程式，建立於 TDevelop 程式源碼樹內。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}part.cpp
 Archive=kdevpart.tar.gz
@@ -98,35 +98,35 @@ Default= Global
 Type = value
 ValueType=QString
 Value= PROPS
-Comment= The list of supported KDevelop properties
-Comment[ca]= La llista de propietats suportades del KDevelop
-Comment[da]= Listen af understøttede KDevelop-egenskaber
-Comment[de]= Die Liste der unterstützten KDevelop-Eigenschaften
-Comment[el]= Η λίστα των υποστηριζόμενων ιδιοτήτων του KDevelop
-Comment[es]=La lista de propiedades de KDevelop soportadas
-Comment[et]= KDevelopi toetatud omaduste nimekiri
-Comment[eu]= Onartzen diren KDevelop-en propietateen zerrenda
-Comment[fa]=فهرست ویژگیهای پشتیبانی‌شدۀ KDevelop
-Comment[fr]= La liste des propriétés de KDevelop prises en charge
-Comment[ga]= Liosta d'airíonna KDevelop a dtacaítear leo
-Comment[gl]=Lista das propiedades de KDevelop soportadas
-Comment[hu]=A támogatott KDevelop-tulajdonságok
-Comment[it]=Lista delle proprietà supportate da KDevelop
-Comment[nds]= De List mit ünnerstütt KDevelop-Egenschappen
+Comment= The list of supported TDevelop properties
+Comment[ca]= La llista de propietats suportades del TDevelop
+Comment[da]= Listen af understøttede TDevelop-egenskaber
+Comment[de]= Die Liste der unterstützten TDevelop-Eigenschaften
+Comment[el]= Η λίστα των υποστηριζόμενων ιδιοτήτων του TDevelop
+Comment[es]=La lista de propiedades de TDevelop soportadas
+Comment[et]= TDevelopi toetatud omaduste nimekiri
+Comment[eu]= Onartzen diren TDevelop-en propietateen zerrenda
+Comment[fa]=فهرست ویژگیهای پشتیبانی‌شدۀ TDevelop
+Comment[fr]= La liste des propriétés de TDevelop prises en charge
+Comment[ga]= Liosta d'airíonna TDevelop a dtacaítear leo
+Comment[gl]=Lista das propiedades de TDevelop soportadas
+Comment[hu]=A támogatott TDevelop-tulajdonságok
+Comment[it]=Lista delle proprietà supportate da TDevelop
+Comment[nds]= De List mit ünnerstütt TDevelop-Egenschappen
 Comment[ne]= केडीई विकास समर्थन गर्ने गुणको सूची
-Comment[nl]=De lijst met ondersteunde KDevelop-properties
-Comment[pl]= Lista obsługiwanych właściwości KDevelopa
-Comment[pt]= A lista de propriedades do KDevelop suportadas
-Comment[pt_BR]= A lista de propriedades do KDevelop suportadas
-Comment[ru]=Список поддерживаемых типов модулей для KDevelop
-Comment[sk]=Zoznam podporovaných vlastností KDevelop
-Comment[sl]=Seznam podprtih lastnosti KDevelop
-Comment[sr]=Листа подржаних KDevelop-ових својстава
-Comment[sr@Latn]=Lista podržanih KDevelop-ovih svojstava
-Comment[sv]=Listan med egenskaper i KDevelop som stöds
-Comment[tr]=Desteklenen KDevelop özellikleri
-Comment[zh_CN]=列出支持的 KDevelop 属性
-Comment[zh_TW]=支援的 KDevelop 屬性列表
+Comment[nl]=De lijst met ondersteunde TDevelop-properties
+Comment[pl]= Lista obsługiwanych właściwości TDevelopa
+Comment[pt]= A lista de propriedades do TDevelop suportadas
+Comment[pt_BR]= A lista de propriedades do TDevelop suportadas
+Comment[ru]=Список поддерживаемых типов модулей для TDevelop
+Comment[sk]=Zoznam podporovaných vlastností TDevelop
+Comment[sl]=Seznam podprtih lastnosti TDevelop
+Comment[sr]=Листа подржаних TDevelop-ових својстава
+Comment[sr@Latn]=Lista podržanih TDevelop-ovih svojstava
+Comment[sv]=Listan med egenskaper i TDevelop som stöds
+Comment[tr]=Desteklenen TDevelop özellikleri
+Comment[zh_CN]=列出支持的 TDevelop 属性
+Comment[zh_TW]=支援的 TDevelop 屬性列表
 Default=
 
 [FILE1]
@@ -210,33 +210,33 @@ Dest=%{dest}/README.dox
 
 [MSG]
 Type=message
-Comment=A KDevelop plugin was created in %{dest}
-Comment[ca]=Un connector per a KDevelop ha estat creat en %{dest}
-Comment[da]=Et KDevelop plugin blev oprettet i %{dest}
-Comment[de]=Ein KDevelop-Modul wurde in %{dest} erstellt.
-Comment[el]=Ένα πρόσθετο του KDevelop δημιουργήθηκε στο %{dest}
-Comment[es]=Un complemento para KDevelop ha sido creado en %{dest}
-Comment[et]=KDevelopi plugin loodi asukohta %{dest}
-Comment[eu]=KDevelop plugin bat sortu da hemen: %{dest}
-Comment[fa]=یک وصلۀ KDevelop در %{dest} ایجاد شد
-Comment[fr]=Un module externe pour KDevelop a été créé dans %{dest}
-Comment[ga]=Cruthaíodh breiseán KDevelop i %{dest}
-Comment[gl]=Creouse unha extensión para KDevelop en %{dest}
-Comment[hu]=Létrejött egy KDevelop-bővítőmodul itt: %{dest}
-Comment[it]=È stato creato un plugin per KDevelop in %{dest}
-Comment[ja]=KDevelop プラグインを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KDevelop-Moduul opstellt
+Comment=A TDevelop plugin was created in %{dest}
+Comment[ca]=Un connector per a TDevelop ha estat creat en %{dest}
+Comment[da]=Et TDevelop plugin blev oprettet i %{dest}
+Comment[de]=Ein TDevelop-Modul wurde in %{dest} erstellt.
+Comment[el]=Ένα πρόσθετο του TDevelop δημιουργήθηκε στο %{dest}
+Comment[es]=Un complemento para TDevelop ha sido creado en %{dest}
+Comment[et]=TDevelopi plugin loodi asukohta %{dest}
+Comment[eu]=TDevelop plugin bat sortu da hemen: %{dest}
+Comment[fa]=یک وصلۀ TDevelop در %{dest} ایجاد شد
+Comment[fr]=Un module externe pour TDevelop a été créé dans %{dest}
+Comment[ga]=Cruthaíodh breiseán TDevelop i %{dest}
+Comment[gl]=Creouse unha extensión para TDevelop en %{dest}
+Comment[hu]=Létrejött egy TDevelop-bővítőmodul itt: %{dest}
+Comment[it]=È stato creato un plugin per TDevelop in %{dest}
+Comment[ja]=TDevelop プラグインを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDevelop-Moduul opstellt
 Comment[ne]=केडीई विकास प्लगइन %{dest} मा सिर्जना गरियो
-Comment[nl]=Er is een KDevelop-plugin aangemaakt in %{dest}
-Comment[pl]=Wtyczka do KDevelopa została utworzona w %{dest}
-Comment[pt]=Foi criado um 'plugin' do KDevelop em %{dest}
-Comment[pt_BR]=Foi criado um 'plugin' do KDevelop em %{dest}
-Comment[ru]=Модуль KDevelop создан в %{dest}
-Comment[sk]=KDevelop modul bol vytvorený v %{dest}
-Comment[sl]=Vstavek za KDevelop je bil ustvarjen v %{dest}
-Comment[sr]=Прикључак за KDevelop направљен је у %{dest}
-Comment[sr@Latn]=Priključak za KDevelop napravljen je u %{dest}
-Comment[sv]=Ett insticksprogram för KDevelop skapades i %{dest}
-Comment[tr]=Bir KDevelop eklentisi %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了 KDevelop 插件
-Comment[zh_TW]=一個 KDevelop 外掛程式已建立於 %{dest}
+Comment[nl]=Er is een TDevelop-plugin aangemaakt in %{dest}
+Comment[pl]=Wtyczka do TDevelopa została utworzona w %{dest}
+Comment[pt]=Foi criado um 'plugin' do TDevelop em %{dest}
+Comment[pt_BR]=Foi criado um 'plugin' do TDevelop em %{dest}
+Comment[ru]=Модуль TDevelop создан в %{dest}
+Comment[sk]=TDevelop modul bol vytvorený v %{dest}
+Comment[sl]=Vstavek za TDevelop je bil ustvarjen v %{dest}
+Comment[sr]=Прикључак за TDevelop направљен је у %{dest}
+Comment[sr@Latn]=Priključak za TDevelop napravljen je u %{dest}
+Comment[sv]=Ett insticksprogram för TDevelop skapades i %{dest}
+Comment[tr]=Bir TDevelop eklentisi %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了 TDevelop 插件
+Comment[zh_TW]=一個 TDevelop 外掛程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
index 0ee981a3..0d613787 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate
@@ -1,63 +1,63 @@
 # KDE Config File
 [General]
-Name=KDevelop Plugin (Standalone build)
-Name[ca]=Connector per a KDevelop (de construcció aïllada)
-Name[da]=KDevelop plugin (Alenestående)
-Name[de]=KDevelop-Modul (Unabhängige Erstellung)
-Name[el]=Πρόσθετο KDevelop (Αυτόνομη κατασκευή)
-Name[es]=Complemento para KDevelop (construcción independiente)
-Name[et]=KDevelopi plugin (autonoomne)
-Name[eu]=KDevelop plugin-a (eraikuntza autonomoak)
-Name[fa]=وصلۀ KDevelop )ساخت خوداتکا(
-Name[fr]=Module externe pour KDevelop (construction autonome)
-Name[ga]=Breiseán KDevelop (Tógáil Shaorsheasaimh)
-Name[gl]=Extensión para KDevelop (compilación independente)
-Name[hu]=KDevelop-bővítőmodul (önálló)
-Name[it]=Plugin di KDevelop (compilazione indipendente)
-Name[ja]=KDevelop プラグイン (スタンダローンビルド)
-Name[nds]=KDevelop-Moduul (Enkelprogramm)
+Name=TDevelop Plugin (Standalone build)
+Name[ca]=Connector per a TDevelop (de construcció aïllada)
+Name[da]=TDevelop plugin (Alenestående)
+Name[de]=TDevelop-Modul (Unabhängige Erstellung)
+Name[el]=Πρόσθετο TDevelop (Αυτόνομη κατασκευή)
+Name[es]=Complemento para TDevelop (construcción independiente)
+Name[et]=TDevelopi plugin (autonoomne)
+Name[eu]=TDevelop plugin-a (eraikuntza autonomoak)
+Name[fa]=وصلۀ TDevelop )ساخت خوداتکا(
+Name[fr]=Module externe pour TDevelop (construction autonome)
+Name[ga]=Breiseán TDevelop (Tógáil Shaorsheasaimh)
+Name[gl]=Extensión para TDevelop (compilación independente)
+Name[hu]=TDevelop-bővítőmodul (önálló)
+Name[it]=Plugin di TDevelop (compilazione indipendente)
+Name[ja]=TDevelop プラグイン (スタンダローンビルド)
+Name[nds]=TDevelop-Moduul (Enkelprogramm)
 Name[ne]=केडीई विकास प्लगइन (स्ट्यान्डअलोन निर्माण)
-Name[nl]=KDevelop-plugin (standalone build)
-Name[pl]=Wtyczka do KDevelopa (budowana oddzielnie)
-Name[pt]='Plugin' do KDevelop (compilação autónoma)
-Name[pt_BR]='Plugin' do KDevelop (compilação autónoma)
-Name[ru]=Модуль KDevelop (внешний)
-Name[sk]=KDevelop modul (samostatný build)
-Name[sl]=Vstavek za KDevelop (samostojna izgradnja)
-Name[sr]=Прикључак за KDevelop
-Name[sr@Latn]=Priključak za KDevelop
-Name[sv]=KDevelop-insticksprogram (att bygga fristående)
-Name[tr]=KDevelop Eklentisi (Kendi başına çalışabilen)
-Name[zh_CN]=KDevelop 插件(独立编译)
-Name[zh_TW]=KDevelop 外掛程式（單獨建立）
-Category=C++/KDevelop/
-Comment=This generates a KPart for KDevelop, to be built outside of the KDevelop source tree.
-Comment[ca]=Genera una KPart per a KDevelop, per a que es construeixi fora de l'arbre de fonts de KDevelop.
-Comment[da]=Dette genererer en KPart for KDevelop, til at bygges udenfor  KDevelop's kildetræ.
-Comment[de]=Hiermit wird eine Komponente (KPart) für KDevelop generiert, die außerhalb des Quelltextbaumes von KDevelop erstellt wird.
-Comment[el]=Αυτό δημιουργεί ένα KPart για το KDevelop, για κατασκευή του έξω από το δέντρο πηγαίου κώδικα του KDevelop.
-Comment[es]=Genera un KPart para KDevelop, para ser construido fuera del árbol de código fuente de KDevelop.
-Comment[et]=KDevelopi KPart'i loomine, mida saab ehitada väljaspool KDevelopi lähtekoodipuud.
-Comment[eu]=Honek KDevelop-en KPart bat sortzen du, KDevelop-en iturburu-zuhaitzetik at eraikitzeko.
-Comment[fa]=یک KPart برای KDevelop، برای ساخته شدن در بیرون درخت منبع پروژه تولید می‌کند.
-Comment[fr]=Génère un KPart pour KDevelop, à construire en dehors de l'arborescence des sources de KDevelop.
-Comment[gl]=Isto xera un KPart para KDevelop que se compilará fóra da árbore de código de KDevelop.
-Comment[hu]=Létrehoz egy KDevelop-bővítőmodult, mely a KDevelopos forráskönyvtáron kívül fordítható le.
-Comment[it]=Genera un KPart per KDevelop, da compilare al di fuori dell'albero sorgente di KDevelop.
-Comment[nds]=Dit stellt en KPart-Komponent för KDevelop op, dat buten den KDevelop-Bornboom kompileert warrt.
+Name[nl]=TDevelop-plugin (standalone build)
+Name[pl]=Wtyczka do TDevelopa (budowana oddzielnie)
+Name[pt]='Plugin' do TDevelop (compilação autónoma)
+Name[pt_BR]='Plugin' do TDevelop (compilação autónoma)
+Name[ru]=Модуль TDevelop (внешний)
+Name[sk]=TDevelop modul (samostatný build)
+Name[sl]=Vstavek za TDevelop (samostojna izgradnja)
+Name[sr]=Прикључак за TDevelop
+Name[sr@Latn]=Priključak za TDevelop
+Name[sv]=TDevelop-insticksprogram (att bygga fristående)
+Name[tr]=TDevelop Eklentisi (Kendi başına çalışabilen)
+Name[zh_CN]=TDevelop 插件(独立编译)
+Name[zh_TW]=TDevelop 外掛程式（單獨建立）
+Category=C++/TDevelop/
+Comment=This generates a KPart for TDevelop, to be built outside of the TDevelop source tree.
+Comment[ca]=Genera una KPart per a TDevelop, per a que es construeixi fora de l'arbre de fonts de TDevelop.
+Comment[da]=Dette genererer en KPart for TDevelop, til at bygges udenfor  TDevelop's kildetræ.
+Comment[de]=Hiermit wird eine Komponente (KPart) für TDevelop generiert, die außerhalb des Quelltextbaumes von TDevelop erstellt wird.
+Comment[el]=Αυτό δημιουργεί ένα KPart για το TDevelop, για κατασκευή του έξω από το δέντρο πηγαίου κώδικα του TDevelop.
+Comment[es]=Genera un KPart para TDevelop, para ser construido fuera del árbol de código fuente de TDevelop.
+Comment[et]=TDevelopi KPart'i loomine, mida saab ehitada väljaspool TDevelopi lähtekoodipuud.
+Comment[eu]=Honek TDevelop-en KPart bat sortzen du, TDevelop-en iturburu-zuhaitzetik at eraikitzeko.
+Comment[fa]=یک KPart برای TDevelop، برای ساخته شدن در بیرون درخت منبع پروژه تولید می‌کند.
+Comment[fr]=Génère un KPart pour TDevelop, à construire en dehors de l'arborescence des sources de TDevelop.
+Comment[gl]=Isto xera un KPart para TDevelop que se compilará fóra da árbore de código de TDevelop.
+Comment[hu]=Létrehoz egy TDevelop-bővítőmodult, mely a TDevelopos forráskönyvtáron kívül fordítható le.
+Comment[it]=Genera un KPart per TDevelop, da compilare al di fuori dell'albero sorgente di TDevelop.
+Comment[nds]=Dit stellt en KPart-Komponent för TDevelop op, dat buten den TDevelop-Bornboom kompileert warrt.
 Comment[ne]=यसले केडीई विकास स्रोत ट्री बाहिर निर्माण हुने, केडीई विकासका लागि केडीई भाग उत्पन्न गर्दछ ।
-Comment[nl]=Dit genereert een KPart voor KDevelop, welke buiten de KDevelop sourcetree wordt gebouwd.
-Comment[pl]=Generuje KPart dla KDevelopa budowane poza jego drzewem źródłowym.
-Comment[pt]=Isto gera uma KPart para o KDevelop, de modo a ser compilada fora da árvore de código do KDevelop.
-Comment[pt_BR]=Isto gera uma KPart para o KDevelop, de modo a ser compilada fora da árvore de código do KDevelop.
-Comment[ru]=Создание компонента KPart для KDevelop со сборкой вне исходного кода KDevelop.
-Comment[sk]=Vygenruje KPart pre KDevelop, tak aby ho bolo možné kompilovať mimo zdrojový strom KDevelop.
-Comment[sr]=Ово прави KPart за KDevelop, за градњу изван KDevelop-овог изворног стабла.
-Comment[sr@Latn]=Ovo pravi KPart za KDevelop, za gradnju izvan KDevelop-ovog izvornog stabla.
-Comment[sv]=Detta skapar ett KDevelop-delprogram, att bygga utanför KDevelops källkodsträd.
-Comment[tr]=Bu, KDevelop için, KDevelop kaynak ağacının dışında yapılacak, bir KPart yaratır.
-Comment[zh_CN]=这将生成一个 KDevelop 的 KPart，可以在 KDevelop 源代码树之外编译。
-Comment[zh_TW]=產生一個 KDevelop 的 KPart 元件，建立在 KDevelop 程式源碼樹之外。
+Comment[nl]=Dit genereert een KPart voor TDevelop, welke buiten de TDevelop sourcetree wordt gebouwd.
+Comment[pl]=Generuje KPart dla TDevelopa budowane poza jego drzewem źródłowym.
+Comment[pt]=Isto gera uma KPart para o TDevelop, de modo a ser compilada fora da árvore de código do TDevelop.
+Comment[pt_BR]=Isto gera uma KPart para o TDevelop, de modo a ser compilada fora da árvore de código do TDevelop.
+Comment[ru]=Создание компонента KPart для TDevelop со сборкой вне исходного кода TDevelop.
+Comment[sk]=Vygenruje KPart pre TDevelop, tak aby ho bolo možné kompilovať mimo zdrojový strom TDevelop.
+Comment[sr]=Ово прави KPart за TDevelop, за градњу изван TDevelop-овог изворног стабла.
+Comment[sr@Latn]=Ovo pravi KPart za TDevelop, za gradnju izvan TDevelop-ovog izvornog stabla.
+Comment[sv]=Detta skapar ett TDevelop-delprogram, att bygga utanför TDevelops källkodsträd.
+Comment[tr]=Bu, TDevelop için, TDevelop kaynak ağacının dışında yapılacak, bir KPart yaratır.
+Comment[zh_CN]=这将生成一个 TDevelop 的 KPart，可以在 TDevelop 源代码树之外编译。
+Comment[zh_TW]=產生一個 TDevelop 的 KPart 元件，建立在 TDevelop 程式源碼樹之外。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}_part.cpp
 Archive=kdevpart2.tar.gz
@@ -100,35 +100,35 @@ Default= Global
 Type = value
 ValueType=QString
 Value= PROPS
-Comment= The list of supported KDevelop properties
-Comment[ca]= La llista de propietats suportades del KDevelop
-Comment[da]= Listen af understøttede KDevelop-egenskaber
-Comment[de]= Die Liste der unterstützten KDevelop-Eigenschaften
-Comment[el]= Η λίστα των υποστηριζόμενων ιδιοτήτων του KDevelop
-Comment[es]=La lista de propiedades de KDevelop soportadas
-Comment[et]= KDevelopi toetatud omaduste nimekiri
-Comment[eu]= Onartzen diren KDevelop-en propietateen zerrenda
-Comment[fa]=فهرست ویژگیهای پشتیبانی‌شدۀ KDevelop
-Comment[fr]= La liste des propriétés de KDevelop prises en charge
-Comment[ga]= Liosta d'airíonna KDevelop a dtacaítear leo
-Comment[gl]=Lista das propiedades de KDevelop soportadas
-Comment[hu]=A támogatott KDevelop-tulajdonságok
-Comment[it]=Lista delle proprietà supportate da KDevelop
-Comment[nds]= De List mit ünnerstütt KDevelop-Egenschappen
+Comment= The list of supported TDevelop properties
+Comment[ca]= La llista de propietats suportades del TDevelop
+Comment[da]= Listen af understøttede TDevelop-egenskaber
+Comment[de]= Die Liste der unterstützten TDevelop-Eigenschaften
+Comment[el]= Η λίστα των υποστηριζόμενων ιδιοτήτων του TDevelop
+Comment[es]=La lista de propiedades de TDevelop soportadas
+Comment[et]= TDevelopi toetatud omaduste nimekiri
+Comment[eu]= Onartzen diren TDevelop-en propietateen zerrenda
+Comment[fa]=فهرست ویژگیهای پشتیبانی‌شدۀ TDevelop
+Comment[fr]= La liste des propriétés de TDevelop prises en charge
+Comment[ga]= Liosta d'airíonna TDevelop a dtacaítear leo
+Comment[gl]=Lista das propiedades de TDevelop soportadas
+Comment[hu]=A támogatott TDevelop-tulajdonságok
+Comment[it]=Lista delle proprietà supportate da TDevelop
+Comment[nds]= De List mit ünnerstütt TDevelop-Egenschappen
 Comment[ne]= केडीई विकास समर्थन गर्ने गुणको सूची
-Comment[nl]=De lijst met ondersteunde KDevelop-properties
-Comment[pl]= Lista obsługiwanych właściwości KDevelopa
-Comment[pt]= A lista de propriedades do KDevelop suportadas
-Comment[pt_BR]= A lista de propriedades do KDevelop suportadas
-Comment[ru]=Список поддерживаемых типов модулей для KDevelop
-Comment[sk]=Zoznam podporovaných vlastností KDevelop
-Comment[sl]=Seznam podprtih lastnosti KDevelop
-Comment[sr]=Листа подржаних KDevelop-ових својстава
-Comment[sr@Latn]=Lista podržanih KDevelop-ovih svojstava
-Comment[sv]=Listan med egenskaper i KDevelop som stöds
-Comment[tr]=Desteklenen KDevelop özellikleri
-Comment[zh_CN]=列出支持的 KDevelop 属性
-Comment[zh_TW]=支援的 KDevelop 屬性列表
+Comment[nl]=De lijst met ondersteunde TDevelop-properties
+Comment[pl]= Lista obsługiwanych właściwości TDevelopa
+Comment[pt]= A lista de propriedades do TDevelop suportadas
+Comment[pt_BR]= A lista de propriedades do TDevelop suportadas
+Comment[ru]=Список поддерживаемых типов модулей для TDevelop
+Comment[sk]=Zoznam podporovaných vlastností TDevelop
+Comment[sl]=Seznam podprtih lastnosti TDevelop
+Comment[sr]=Листа подржаних TDevelop-ових својстава
+Comment[sr@Latn]=Lista podržanih TDevelop-ovih svojstava
+Comment[sv]=Listan med egenskaper i TDevelop som stöds
+Comment[tr]=Desteklenen TDevelop özellikleri
+Comment[zh_CN]=列出支持的 TDevelop 属性
+Comment[zh_TW]=支援的 TDevelop 屬性列表
 Default=
 
 [ADMIN]
@@ -244,33 +244,33 @@ Dest=%{dest}/src/README.dox
 
 [MSG]
 Type=message
-Comment=A KDevelop plugin was created in %{dest}
-Comment[ca]=Un connector per a KDevelop ha estat creat en %{dest}
-Comment[da]=Et KDevelop plugin blev oprettet i %{dest}
-Comment[de]=Ein KDevelop-Modul wurde in %{dest} erstellt.
-Comment[el]=Ένα πρόσθετο του KDevelop δημιουργήθηκε στο %{dest}
-Comment[es]=Un complemento para KDevelop ha sido creado en %{dest}
-Comment[et]=KDevelopi plugin loodi asukohta %{dest}
-Comment[eu]=KDevelop plugin bat sortu da hemen: %{dest}
-Comment[fa]=یک وصلۀ KDevelop در %{dest} ایجاد شد
-Comment[fr]=Un module externe pour KDevelop a été créé dans %{dest}
-Comment[ga]=Cruthaíodh breiseán KDevelop i %{dest}
-Comment[gl]=Creouse unha extensión para KDevelop en %{dest}
-Comment[hu]=Létrejött egy KDevelop-bővítőmodul itt: %{dest}
-Comment[it]=È stato creato un plugin per KDevelop in %{dest}
-Comment[ja]=KDevelop プラグインを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KDevelop-Moduul opstellt
+Comment=A TDevelop plugin was created in %{dest}
+Comment[ca]=Un connector per a TDevelop ha estat creat en %{dest}
+Comment[da]=Et TDevelop plugin blev oprettet i %{dest}
+Comment[de]=Ein TDevelop-Modul wurde in %{dest} erstellt.
+Comment[el]=Ένα πρόσθετο του TDevelop δημιουργήθηκε στο %{dest}
+Comment[es]=Un complemento para TDevelop ha sido creado en %{dest}
+Comment[et]=TDevelopi plugin loodi asukohta %{dest}
+Comment[eu]=TDevelop plugin bat sortu da hemen: %{dest}
+Comment[fa]=یک وصلۀ TDevelop در %{dest} ایجاد شد
+Comment[fr]=Un module externe pour TDevelop a été créé dans %{dest}
+Comment[ga]=Cruthaíodh breiseán TDevelop i %{dest}
+Comment[gl]=Creouse unha extensión para TDevelop en %{dest}
+Comment[hu]=Létrejött egy TDevelop-bővítőmodul itt: %{dest}
+Comment[it]=È stato creato un plugin per TDevelop in %{dest}
+Comment[ja]=TDevelop プラグインを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDevelop-Moduul opstellt
 Comment[ne]=केडीई विकास प्लगइन %{dest} मा सिर्जना गरियो
-Comment[nl]=Er is een KDevelop-plugin aangemaakt in %{dest}
-Comment[pl]=Wtyczka do KDevelopa została utworzona w %{dest}
-Comment[pt]=Foi criado um 'plugin' do KDevelop em %{dest}
-Comment[pt_BR]=Foi criado um 'plugin' do KDevelop em %{dest}
-Comment[ru]=Модуль KDevelop создан в %{dest}
-Comment[sk]=KDevelop modul bol vytvorený v %{dest}
-Comment[sl]=Vstavek za KDevelop je bil ustvarjen v %{dest}
-Comment[sr]=Прикључак за KDevelop направљен је у %{dest}
-Comment[sr@Latn]=Priključak za KDevelop napravljen je u %{dest}
-Comment[sv]=Ett insticksprogram för KDevelop skapades i %{dest}
-Comment[tr]=Bir KDevelop eklentisi %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了 KDevelop 插件
-Comment[zh_TW]=一個 KDevelop 外掛程式已建立於 %{dest}
+Comment[nl]=Er is een TDevelop-plugin aangemaakt in %{dest}
+Comment[pl]=Wtyczka do TDevelopa została utworzona w %{dest}
+Comment[pt]=Foi criado um 'plugin' do TDevelop em %{dest}
+Comment[pt_BR]=Foi criado um 'plugin' do TDevelop em %{dest}
+Comment[ru]=Модуль TDevelop создан в %{dest}
+Comment[sk]=TDevelop modul bol vytvorený v %{dest}
+Comment[sl]=Vstavek za TDevelop je bil ustvarjen v %{dest}
+Comment[sr]=Прикључак за TDevelop направљен је у %{dest}
+Comment[sr@Latn]=Priključak za TDevelop napravljen je u %{dest}
+Comment[sv]=Ett insticksprogram för TDevelop skapades i %{dest}
+Comment[tr]=Bir TDevelop eklentisi %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了 TDevelop 插件
+Comment[zh_TW]=一個 TDevelop 外掛程式已建立於 %{dest}
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index aa931991..e08188b2 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -1371,7 +1371,7 @@ bool CppNewClassDialog::ClassGenerator::generate()
 
 	if ( TQFileInfo( headerPath ).exists() || TQFileInfo( implementationPath ).exists() )
 	{
-		KMessageBox::error( &dlg, i18n( "KDevelop is not able to add classes "
+		KMessageBox::error( &dlg, i18n( "TDevelop is not able to add classes "
 		                                "to existing header or implementation files." ) );
 		return false;
 	}
@@ -1827,7 +1827,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
 
 	if ( dlg.gen_config->reformat_box->isChecked() )
 	{
-		KDevSourceFormatter * fmt = dlg.m_part->extension<KDevSourceFormatter>( "KDevelop/SourceFormatter" );
+		KDevSourceFormatter * fmt = dlg.m_part->extension<KDevSourceFormatter>( "TDevelop/SourceFormatter" );
 		if ( fmt )
 			classImpl = fmt->formatSource( classImpl );
 	}
@@ -2053,7 +2053,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface()
 
 	if ( dlg.gen_config->reformat_box->isChecked() )
 	{
-		KDevSourceFormatter * fmt = dlg.m_part->extension<KDevSourceFormatter>( "KDevelop/SourceFormatter" );
+		KDevSourceFormatter * fmt = dlg.m_part->extension<KDevSourceFormatter>( "TDevelop/SourceFormatter" );
 		if ( fmt )
 			classIntf = fmt->formatSource( classIntf );
 	}
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 747a7e0a..204b5a69 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -2810,7 +2810,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	}
 	TQString declarationString = type + " " + name + "(" + parameters + ")" + ( isConst ? " const" : "" );
 
-	KDevSourceFormatter* sourceFormatter = extension<KDevSourceFormatter>( "KDevelop/SourceFormatter" );
+	KDevSourceFormatter* sourceFormatter = extension<KDevSourceFormatter>( "TDevelop/SourceFormatter" );
 
 	TQString finalDeclaration = ( ( isVirtual || isPureVirtual ) ? "\nvirtual " : "\n" + declarationString +
 	                             ( isPureVirtual ? " = 0 " : "" ) +
@@ -2847,7 +2847,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	TQFileInfo info( aClass->fileName() );
 	TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ;
 	TQFileInfo fileInfo( implementationFile );
-	KDevCreateFile* createFileSupport = extension<KDevCreateFile>( "KDevelop/CreateFile" );
+	KDevCreateFile* createFileSupport = extension<KDevCreateFile>( "TDevelop/CreateFile" );
 	if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 )
 		createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() );
 
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index e237d683..35331654 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -204,7 +204,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const
 	m_settings = 0;
 	importerListView->header() ->hide();
 
-	KTrader::OfferList lst = KTrader::self() ->query( "KDevelop/PCSImporter" );
+	KTrader::OfferList lst = KTrader::self() ->query( "TDevelop/PCSImporter" );
 	kdDebug( 9007 ) << "====================> found " << lst.size() << " importers" << endl;
 
 	for ( KTrader::OfferList::Iterator it = lst.begin(); it != lst.end(); ++it )
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 0ee45b63..8933ea12 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -112,7 +112,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
                          parent(), TQT_SLOT(slotDock()));
-        menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"),
+        menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"),
                          parent(), TQT_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
@@ -222,7 +222,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
     toolBar_(toolBar)
 {
     setPixmap(pixmap);
-    TQToolTip::add( this, i18n("KDevelop debugger: Click to execute one line of code (\"step\")") );
+    TQToolTip::add( this, i18n("TDevelop debugger: Click to execute one line of code (\"step\")") );
 }
 
 // **************************************************************************
@@ -244,7 +244,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
             KPopupMenu* menu = new KPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
             menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
-            menu->insertItem(i18n("Activate (KDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
+            menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
             menu->popup(e->globalPos());
             break;
         }
@@ -331,8 +331,8 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     TQToolTip::add( bFinish,     i18n("Execute to end of current stack frame") );
     TQToolTip::add( bRunTo,      i18n("Continues execution until the cursor position is reached.") );
     TQToolTip::add( bView,       i18n("Memory, dissemble, registers, library viewers") );
-    TQToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") );
-    TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") );
+    TQToolTip::add( bKDevFocus_, i18n("Set focus on TDevelop") );
+    TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when TDevelop got focus") );
 
     TQWhatsThis::add( bRun,        i18n("Continue with application execution. May start the application.") );
     TQWhatsThis::add( bInterrupt,  i18n("Interrupt the application execution.") );
@@ -343,8 +343,8 @@ DbgToolBar::DbgToolBar(DebuggerPart* part,
     TQWhatsThis::add( bFinish,     i18n("Execute to end of current stack frame.") );
     TQWhatsThis::add( bRunTo,      i18n("Continues execution until the cursor position is reached.") );
     TQWhatsThis::add( bView,       i18n("Memory, dissemble, registers, library viewers.") );
-    TQWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") );
-    TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") );
+    TQWhatsThis::add( bKDevFocus_, i18n("Set focus on TDevelop.") );
+    TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when TDevelop got focus.") );
 
     topLayout->addWidget(moveHandle);
     topLayout->addWidget(bRun);
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index fb1577d4..699b28dd 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -396,7 +396,7 @@ void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId)
         d >> appName;
 
         if (appName.length() && project() && project()->mainProgram().endsWith(appName)) {
-            kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &KDevelop"));
+            kapp->dcopClient()->send(appId, "krashinfo", "registerDebuggingApplication(TQString)", i18n("Debug in &TDevelop"));
             connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", "slotDebugExternalProcess()", true);
         }
     }
@@ -1261,7 +1261,7 @@ bool DebuggerPart::haveModifiedFiles()
 
 KDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( )
 {
-    return extension<KDevAppFrontend>("KDevelop/AppFrontend");
+    return extension<KDevAppFrontend>("TDevelop/AppFrontend");
 }
 
 KDevDebugger * GDBDebugger::DebuggerPart::debugger()
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 0705f03c..f61b64e2 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -126,7 +126,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
 	TQFileInfo fileInfo( implementationFile );
 	if ( !TQFile::exists( fileInfo.absFilePath() ) )
 	{
-		if ( KDevCreateFile * createFileSupp = m_part->extension<KDevCreateFile>( "KDevelop/CreateFile" ) )
+		if ( KDevCreateFile * createFileSupp = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" ) )
 			createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() );
 	}
 	
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index d4edb897..6037f010 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -436,7 +436,7 @@ void SubclassingDlg::accept()
 
 	if (reformat_box->isChecked())
 	{
-		KDevSourceFormatter *fmt = m_cppSupport->extension<KDevSourceFormatter>("KDevelop/SourceFormatter");
+		KDevSourceFormatter *fmt = m_cppSupport->extension<KDevSourceFormatter>("TDevelop/SourceFormatter");
 		if (fmt)
 			buffer = fmt->formatSource(buffer);
 	}
@@ -498,7 +498,7 @@ void SubclassingDlg::accept()
 
 	if (reformat_box->isChecked())
 	{
-		KDevSourceFormatter *fmt = m_cppSupport->extension<KDevSourceFormatter>("KDevelop/SourceFormatter");
+		KDevSourceFormatter *fmt = m_cppSupport->extension<KDevSourceFormatter>("TDevelop/SourceFormatter");
 		if (fmt)
 			buffer = fmt->formatSource(buffer);
 	}
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 9746a190..a852d419 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -193,7 +193,7 @@ TQString CSharpSupportPart::interpreter()
 void CSharpSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 180a3965..51634f6b 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -281,7 +281,7 @@ KDevLanguageSupport::Features FortranSupportPart::features()
 
 KDevMakeFrontend * FortranSupportPart::makeFrontend( )
 {
-    return extension<KDevMakeFrontend>("KDevelop/MakeFrontend");
+    return extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
 }
 
 #include "fortransupportpart.moc"
diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp
index 61f633b4..b3f877c6 100644
--- a/languages/java/driver.cpp
+++ b/languages/java/driver.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/languages/java/driver.h b/languages/java/driver.h
index f3e2868e..95b4957f 100644
--- a/languages/java/driver.h
+++ b/languages/java/driver.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/languages/lib/interfaces/kdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp
index b6779322..ac84d7e8 100644
--- a/languages/lib/interfaces/kdevpcsimporter.cpp
+++ b/languages/lib/interfaces/kdevpcsimporter.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/languages/lib/interfaces/kdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h
index 84e41f2b..556e9db2 100644
--- a/languages/lib/interfaces/kdevpcsimporter.h
+++ b/languages/lib/interfaces/kdevpcsimporter.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index 8cf62ca9..e634b52c 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -193,7 +193,7 @@ TQString PerlSupportPart::interpreter()
 void PerlSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 867fc7ff..e82cfefc 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -327,7 +327,7 @@ TQString PythonSupportPart::interpreter()
 void PythonSupportPart::startApplication(const TQString &program)
 {
     bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
diff --git a/languages/ruby/README b/languages/ruby/README
index 7df3c4b5..731741e1 100644
--- a/languages/ruby/README
+++ b/languages/ruby/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 5561098b..c985fabb 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -118,7 +118,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
 	menu->insertTitle(i18n("Debug Toolbar"));
         menu->insertItem(i18n("Dock to Panel"),
                          parent(), TQT_SLOT(slotDock()));
-        menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"),
+        menu->insertItem(i18n("Dock to Panel && Iconify TDevelop"),
                          parent(), TQT_SLOT(slotIconifyAndDock()));
         menu->popup(e->globalPos());
     } else {
@@ -221,7 +221,7 @@ DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixm
     toolBar_(toolBar)
 {
     setPixmap(pixmap);
-    TQToolTip::add( this, i18n("KDevelop ruby debugger: Click to execute one line of code (\"step\")") );
+    TQToolTip::add( this, i18n("TDevelop ruby debugger: Click to execute one line of code (\"step\")") );
 }
 
 // **************************************************************************
@@ -243,7 +243,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e)
             KPopupMenu* menu = new KPopupMenu(this);
 	    menu->insertTitle(i18n("Debug Toolbar"));
             menu->insertItem(i18n("Activate"),                        toolBar_, TQT_SLOT(slotUndock()));
-            menu->insertItem(i18n("Activate (KDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
+            menu->insertItem(i18n("Activate (TDevelop gets focus)"),  toolBar_, TQT_SLOT(slotActivateAndUndock()));
             menu->popup(e->globalPos());
             break;
         }
@@ -321,8 +321,8 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
     TQToolTip::add( bStep,       i18n("Execute one line of code, stepping into methods if appropriate") );
     TQToolTip::add( bFinish,     i18n("Execute to end of current stack frame") );
     TQToolTip::add( bRunTo,      i18n("Continues execution until the cursor position is reached.") );
-    TQToolTip::add( bKDevFocus_, i18n("Set focus on KDevelop") );
-    TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus") );
+    TQToolTip::add( bKDevFocus_, i18n("Set focus on TDevelop") );
+    TQToolTip::add( bPrevFocus_, i18n("Set focus on window that had focus when TDevelop got focus") );
 
     TQWhatsThis::add( bRun,        i18n("Continue with application execution. May start the application.") );
     TQWhatsThis::add( bInterrupt,  i18n("Interrupt the application execution.") );
@@ -332,8 +332,8 @@ DbgToolBar::DbgToolBar(RubyDebuggerPart* part,
     
     TQWhatsThis::add( bFinish,     i18n("Execute to end of current stack frame.") );
     TQWhatsThis::add( bRunTo,      i18n("Continues execution until the cursor position is reached.") );
-    TQWhatsThis::add( bKDevFocus_, i18n("Set focus on KDevelop.") );
-    TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when KDevelop got focus.") );
+    TQWhatsThis::add( bKDevFocus_, i18n("Set focus on TDevelop.") );
+    TQWhatsThis::add( bPrevFocus_, i18n("Set focus on window that had focus when TDevelop got focus.") );
 
     topLayout->addWidget(moveHandle);
     topLayout->addWidget(bRun);
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 5d468de7..4da31204 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -774,7 +774,7 @@ void RubyDebuggerPart::savePartialProjectSession(TQDomElement* el)
 
 KDevAppFrontend * RDBDebugger::RubyDebuggerPart::appFrontend( )
 {
-   return extension<KDevAppFrontend>("KDevelop/AppFrontend");
+   return extension<KDevAppFrontend>("TDevelop/AppFrontend");
 }
 
 KDevDebugger * RDBDebugger::RubyDebuggerPart::debugger()
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 664dabd4..9de81db4 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -127,7 +127,7 @@ void RubySupportPart::projectOpened()
     TQFileInfo server(project()->projectDirectory() + "/script/server");
     if (! server.exists()) {
       cmd += "rails " + project()->projectDirectory();
-      if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+      if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
     }
   }
@@ -528,7 +528,7 @@ void RubySupportPart::slotRun ()
         // Starting WEBrick for a Rails app. Translate a SIGTERM signal sent by KDevelop
         // to a SIGINT expected by WEBrick (ie control&c) to terminate it.
         cmd += "script/server& \n trap \"kill -s SIGINT $!\" TERM \n wait \n exit 0";
-        if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+        if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
             appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
     } else {
         TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
@@ -613,7 +613,7 @@ TQString RubySupportPart::characterCoding() {
 
 void RubySupportPart::startApplication(const TQString &program) {
 	bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevrubysupport/run/terminal");
-    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+    if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
         appFrontend->startAppCommand(TQString(), program, inTerminal);
 }
 
@@ -775,7 +775,7 @@ void RubySupportPart::slotSwitchToTest()
     if (TQFile::exists(integrationTestS)) urls << KURL::fromPathOrURL(integrationTestS);
     if (TQFile::exists(unitTestS)) urls << KURL::fromPathOrURL(unitTestS);
 
-    KDevQuickOpen *qo = extension<KDevQuickOpen>("KDevelop/QuickOpen");
+    KDevQuickOpen *qo = extension<KDevQuickOpen>("TDevelop/QuickOpen");
     if (qo && !urls.isEmpty())
         qo->quickOpenFile(urls);
 }
@@ -867,7 +867,7 @@ void RubySupportPart::slotSwitchToView()
         if ( !(viewName.endsWith("~") || viewName == "." || viewName == "..") )
             urls << KURL::fromPathOrURL(viewsDir.absPath() + "/" + viewName);
     }
-    KDevQuickOpen *qo = extension<KDevQuickOpen>("KDevelop/QuickOpen");
+    KDevQuickOpen *qo = extension<KDevQuickOpen>("TDevelop/QuickOpen");
     if (qo)
         qo->quickOpenFile(urls);
 }
diff --git a/lib/catalog/Mainpage.dox b/lib/catalog/Mainpage.dox
index 128d7351..0d716246 100644
--- a/lib/catalog/Mainpage.dox
+++ b/lib/catalog/Mainpage.dox
@@ -1,5 +1,5 @@
 /**
-@mainpage The KDevelop Catalog Library
+@mainpage The TDevelop Catalog Library
 
 This is the persistant symbol store library working with BerkeleyDb backend.
 
diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am
index e88e6d19..f9c81448 100644
--- a/lib/catalog/Makefile.am
+++ b/lib/catalog/Makefile.am
@@ -8,6 +8,6 @@ kdevcatalogincludedir = $(includedir)/tdevelop/catalog
 kdevcataloginclude_HEADERS = catalog.h tag.h
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
-DOXYGEN_PROJECTNAME = KDevelop Catalog Library
+DOXYGEN_PROJECTNAME = TDevelop Catalog Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/catalog/catalog.cpp b/lib/catalog/catalog.cpp
index 7b7f63ec..17963ddf 100644
--- a/lib/catalog/catalog.cpp
+++ b/lib/catalog/catalog.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/catalog/catalog.h b/lib/catalog/catalog.h
index 3f5080d2..f5e3e2fb 100644
--- a/lib/catalog/catalog.h
+++ b/lib/catalog/catalog.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/catalog/tag.cpp b/lib/catalog/tag.cpp
index 5543b8c3..dfd5a23b 100644
--- a/lib/catalog/tag.cpp
+++ b/lib/catalog/tag.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/catalog/tag.h b/lib/catalog/tag.h
index a3f7711b..245032ee 100644
--- a/lib/catalog/tag.h
+++ b/lib/catalog/tag.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index 8f2f2ad7..260dd87b 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h
index becf2e77..e062d077 100644
--- a/lib/cppparser/ast.h
+++ b/lib/cppparser/ast.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index 01d7c5cd..4c7fe6dc 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
    Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2006 David Nolden <david.nolden.tdevelop@art-master.de>
 
diff --git a/lib/cppparser/driver.h b/lib/cppparser/driver.h
index e30f7031..71e0f2d7 100644
--- a/lib/cppparser/driver.h
+++ b/lib/cppparser/driver.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
   Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
   This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp
index e3cb19e5..3fc2e697 100644
--- a/lib/cppparser/errors.cpp
+++ b/lib/cppparser/errors.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/errors.h b/lib/cppparser/errors.h
index e0959250..4898e312 100644
--- a/lib/cppparser/errors.h
+++ b/lib/cppparser/errors.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 167c88c4..687cce08 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h
index 047fc864..adc664e5 100644
--- a/lib/cppparser/lexer.h
+++ b/lib/cppparser/lexer.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/lookup.cpp b/lib/cppparser/lookup.cpp
index 9d52acbb..98a607e0 100644
--- a/lib/cppparser/lookup.cpp
+++ b/lib/cppparser/lookup.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop    
+/* This file is part of TDevelop    
     Copyright (C) 2005 Tobias Erbsland <te@profzone.ch>
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
diff --git a/lib/cppparser/lookup.h b/lib/cppparser/lookup.h
index 2a89e0d6..811798a3 100644
--- a/lib/cppparser/lookup.h
+++ b/lib/cppparser/lookup.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop    
+/* This file is part of TDevelop    
     Copyright (C) 2005 Tobias Erbsland <te@profzone.ch>
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index a9b77ed2..6934675e 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/parser.h b/lib/cppparser/parser.h
index 027360ec..c5527516 100644
--- a/lib/cppparser/parser.h
+++ b/lib/cppparser/parser.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/tree_parser.cpp b/lib/cppparser/tree_parser.cpp
index bcb63a33..c6025d73 100644
--- a/lib/cppparser/tree_parser.cpp
+++ b/lib/cppparser/tree_parser.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/cppparser/tree_parser.h b/lib/cppparser/tree_parser.h
index 06c9f987..e7ab70bd 100644
--- a/lib/cppparser/tree_parser.h
+++ b/lib/cppparser/tree_parser.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2002,2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/interfaces/Mainpage.dox b/lib/interfaces/Mainpage.dox
index 85440858..cf797655 100644
--- a/lib/interfaces/Mainpage.dox
+++ b/lib/interfaces/Mainpage.dox
@@ -1,7 +1,7 @@
 /**
-@mainpage The KDevelop Interfaces Library
+@mainpage The TDevelop Interfaces Library
 
-This library contains all interfaces and classes that form KDevelop plugin architecture.
+This library contains all interfaces and classes that form TDevelop plugin architecture.
 
 <b>Link with</b>: -ltdevelop
 
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 44a9ff53..3e8cbc7c 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -34,7 +34,7 @@ METASOURCES = AUTO
 SUBDIRS = extensions external extras
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
-DOXYGEN_PROJECTNAME = KDevelop Interfaces Library
+DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
 noinst_HEADERS = kdevprojectiface.h kdevdesignerintegrationiface.h 
diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp
index 6cdbfc7e..a0ebd157 100644
--- a/lib/interfaces/codemodel.cpp
+++ b/lib/interfaces/codemodel.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h
index 871de327..86faa4f9 100644
--- a/lib/interfaces/codemodel.h
+++ b/lib/interfaces/codemodel.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
    Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
    Copyright (C) 2004 Matt Rogers <mattr@kde.org> 
    Copyright (C) 2004 Alexander Dymo <adymo@tdevelop.org>
diff --git a/lib/interfaces/codemodel_treeparser.cpp b/lib/interfaces/codemodel_treeparser.cpp
index d3037b8d..deba30d0 100644
--- a/lib/interfaces/codemodel_treeparser.cpp
+++ b/lib/interfaces/codemodel_treeparser.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
 
     This library is free software; you can redistribute it and/or
diff --git a/lib/interfaces/codemodel_treeparser.h b/lib/interfaces/codemodel_treeparser.h
index ac40f684..7d31b163 100644
--- a/lib/interfaces/codemodel_treeparser.h
+++ b/lib/interfaces/codemodel_treeparser.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
     Copyright (C) 2004 Alexander Dymo <adymo@tdevelop.org>
 
diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp
index c70e6f47..2c20bd29 100644
--- a/lib/interfaces/codemodel_utils.cpp
+++ b/lib/interfaces/codemodel_utils.cpp
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
     Copyright (C) 2003 Alexander Dymo <adymo@tdevelop.org>
     Copyright (C) 2004 Jonas Jacobi <j.jacobi@gmx.de>
diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h
index 1fd1ce76..967c06e4 100644
--- a/lib/interfaces/codemodel_utils.h
+++ b/lib/interfaces/codemodel_utils.h
@@ -1,4 +1,4 @@
-/* This file is part of KDevelop
+/* This file is part of TDevelop
     Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
     Copyright (C) 2003-2004 Alexander Dymo <adymo@tdevelop.org>
     Copyright (C) 2004 Jonas Jacobi<j.jacobi@gmx.de>
diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h
index 0e065055..7dfb472c 100644
--- a/lib/interfaces/extensions/kdevappfrontend.h
+++ b/lib/interfaces/extensions/kdevappfrontend.h
@@ -45,7 +45,7 @@ Currently, this interface defines ways to do the following:
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevAppFrontend *apf = extension<KDevAppFrontend>("KDevelop/AppFrontend");
+KDevAppFrontend *apf = extension<KDevAppFrontend>("TDevelop/AppFrontend");
 if (apf) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h
index 76dff18b..181b6695 100644
--- a/lib/interfaces/extensions/kdevcreatefile.h
+++ b/lib/interfaces/extensions/kdevcreatefile.h
@@ -36,7 +36,7 @@ An abstract class for all extensions that are responsible for file creation.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevCreateFile *cf = extension<KDevCreateFile>("KDevelop/CreateFile");
+KDevCreateFile *cf = extension<KDevCreateFile>("TDevelop/CreateFile");
 if (cf) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h
index 75cd59f3..e2a24559 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.h
+++ b/lib/interfaces/extensions/kdevdifffrontend.h
@@ -36,7 +36,7 @@ files.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevDiffFrontend *df = extension<KDevDiffFrontend>("KDevelop/DiffFrontend");
+KDevDiffFrontend *df = extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
 if (df) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 978f118f..702312c8 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -41,7 +41,7 @@ or similar commands to build a project, api documentation, etc.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevMakeFrontend *mf = extension<KDevMakeFrontend>("KDevelop/MakeFrontend");
+KDevMakeFrontend *mf = extension<KDevMakeFrontend>("TDevelop/MakeFrontend");
 if (mf) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h
index 4b8807a4..77d6a692 100644
--- a/lib/interfaces/extensions/kdevquickopen.h
+++ b/lib/interfaces/extensions/kdevquickopen.h
@@ -32,7 +32,7 @@ Quick open plugin interface.
 
 Use it when you need to present a dialog to choose between files to open.
 @code
-KDevQuickOpen *qo = extension<KDevQuickOpen>("KDevelop/QuickOpen");
+KDevQuickOpen *qo = extension<KDevQuickOpen>("TDevelop/QuickOpen");
 if (qo) {
     // do something
 } else {
@@ -97,7 +97,7 @@ Quick open plugin interface.
 
 Use it when you need to present a dialog to choose between files to open.
 @code
-KDevQuickOpen *qo = extension<KDevQuickOpen>("KDevelop/QuickOpen");
+KDevQuickOpen *qo = extension<KDevQuickOpen>("TDevelop/QuickOpen");
 if (qo) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h
index 8eea950c..461b11d7 100644
--- a/lib/interfaces/extensions/kdevsourceformatter.h
+++ b/lib/interfaces/extensions/kdevsourceformatter.h
@@ -32,7 +32,7 @@ This interface is responsible for formatting source files and strings of code.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevSourceFormatter *sf = extension<KDevSourceFormatter>("KDevelop/SourceFormatter");
+KDevSourceFormatter *sf = extension<KDevSourceFormatter>("TDevelop/SourceFormatter");
 if (sf) {
     // do something
 } else {
diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h
index 4a0b4095..1cfa45a3 100644
--- a/lib/interfaces/extensions/kdevversioncontrol.h
+++ b/lib/interfaces/extensions/kdevversioncontrol.h
@@ -123,7 +123,7 @@ VCS support plugins should implement this interface.
 
 Instances that implement this interface are available through extension architecture:
 @code
-KDevVersionControl *vcs = extension<KDevVersionControl>("KDevelop/VersionControl");
+KDevVersionControl *vcs = extension<KDevVersionControl>("TDevelop/VersionControl");
 if (vcs) {
     // do something
 } else {
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 89d89b66..b66b8795 100644
--- a/lib/interfaces/external/Mainpage.dox
+++ b/lib/interfaces/external/Mainpage.dox
@@ -15,9 +15,9 @@ functions to determine designer type.
 
 If a part which can "design" user interface files of a certain mimetype
 implements this interface and sets itself as a default handler for that 
-mimetype then it becomes automatically integrated into KDevelop IDE.
+mimetype then it becomes automatically integrated into TDevelop IDE.
 
-When a part is embedded into KDevelop shell, its Q_SIGNALS (defined in @ref
+When a part is embedded into TDevelop shell, its Q_SIGNALS (defined in @ref
 KInterfaceDesigner::Designer interface):
 @code
     void addedFunction(DesignerType type, const QString &formName, Function function)
@@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface):
     void editFunction(DesignerType type, const QString &formName, const QString &functionName)
     void editSource(DesignerType type, const QString &formName);
 @endcode
-are connected to corresponding Q_SLOTS of KDevelop designer integration engine which can be implemented in KDevelop language support plugin.
+are connected to corresponding Q_SLOTS of TDevelop designer integration engine which can be implemented in KDevelop language support plugin.
  
 Each language support which wants to use integrated designer, must reimplement 
 @code
@@ -41,7 +41,7 @@ trivial task.
 
 \section kdevdesigner KDevelop Designer technical overview
 KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designer. It is called KDevelop Designer (KDevDesigner, kdevdesigner from the command line). KDevDesigner has some important differences:
-- KDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. KDevelop IDE embeds KDevDesigner this way.
+- KDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. TDevelop IDE embeds KDevDesigner this way.
 - KDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system.
 .
 
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index 936ae810..4396c1ab 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -61,7 +61,7 @@ See signals documentation for an explanation on when to emit those.
 
 If a part which can "design" user interface files of a certain mimetype
 implements this interface and sets itself as a default handler for that 
-mimetype then it becomes automatically integrated into KDevelop IDE.
+mimetype then it becomes automatically integrated into TDevelop IDE.
 */
 class Designer: public KParts::ReadWritePart{
     Q_OBJECT
diff --git a/lib/interfaces/extras/Mainpage.dox b/lib/interfaces/extras/Mainpage.dox
index 454e292e..0fd589bd 100644
--- a/lib/interfaces/extras/Mainpage.dox
+++ b/lib/interfaces/extras/Mainpage.dox
@@ -1,7 +1,7 @@
 /**
-@mainpage The KDevelop Extra Interfaces Library
+@mainpage The TDevelop Extra Interfaces Library
 
-This library contains extra interfaces that are not the part of KDevelop plugin architecture
+This library contains extra interfaces that are not the part of TDevelop plugin architecture
 but that can be implemented by extra plugins or "plugins for plugins".
 
 <b>Link with</b>: -lkdevextras
diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am
index d97c6d77..49107f8f 100644
--- a/lib/interfaces/extras/Makefile.am
+++ b/lib/interfaces/extras/Makefile.am
@@ -13,6 +13,6 @@ servicetype_DATA = tdevelopcompileroptions.desktop \
 	tdevelopvcsintegrator.desktop
 
 DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
-DOXYGEN_PROJECTNAME = KDevelop Extra Interfaces Library
+DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h
index f7ed383d..a052877f 100644
--- a/lib/interfaces/extras/kdevcompileroptions.h
+++ b/lib/interfaces/extras/kdevcompileroptions.h
@@ -45,7 +45,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         return 0;
 
     TQStringList args;
-    TQVariant prop = service->property("X-KDevelop-Args");
+    TQVariant prop = service->property("X-TDevelop-Args");
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h
index 78501616..69bb23ab 100644
--- a/lib/interfaces/kdevdesignerintegration.h
+++ b/lib/interfaces/kdevdesignerintegration.h
@@ -25,11 +25,11 @@
 
 /**
 @file kdevdesignerintegration.h
-KDevelop designer integration interface.
+TDevelop designer integration interface.
 */
 
 /**
-KDevelop designer integration interface.
+TDevelop designer integration interface.
 Designer integration object provides functionality which is used by integrated
 into KDevelop GUI designers:
 - adding/removing/editing functions (class methods);
diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
index 839a2267..c705e9cd 100644
--- a/lib/interfaces/kdevgenericfactory.h
+++ b/lib/interfaces/kdevgenericfactory.h
@@ -27,9 +27,9 @@ KDevelop generic plugin factory.
 
 /**
 This class provides a generic implementation of a KLibFactory for
-use with KDevelop plugins.
+use with TDevelop plugins.
 Usually it is convenient to use K_EXPORT_COMPONENT_FACTORY macro
-to create factories for KDevelop plugins. For example, for DummyPlugin
+to create factories for TDevelop plugins. For example, for DummyPlugin
 the factory can be created (in dummyplugin.cpp file) as:
 @code
 typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h
index fa31d239..fed92e69 100644
--- a/lib/interfaces/kdevplugin.h
+++ b/lib/interfaces/kdevplugin.h
@@ -37,17 +37,17 @@ class TQDomElement;
 
 /**
 @file kdevplugin.h
-KDevelop plugin interface.
+TDevelop plugin interface.
 */
 
-/**Current KDevelop plugin interface version. Interfaces declare plugin version to make sure
+/**Current TDevelop plugin interface version. Interfaces declare plugin version to make sure
 old source (or binary) incompatible plugins are not loaded. Increase this if
 it is necessary that old plugins stop working.*/
-#define KDEVELOP_PLUGIN_VERSION 5
+#define TDEVELOP_PLUGIN_VERSION 5
 
 /**
-The base class for all KDevelop plugins.
-Plugin is a component which is loaded into KDevelop shell at startup or by request.
+The base class for all TDevelop plugins.
+Plugin is a component which is loaded into TDevelop shell at startup or by request.
 Each plugin should have corresponding .desktop file with a description.
 .desktop file template looks like:
 @code
@@ -58,15 +58,15 @@ Name=
 GenericName=
 Comment=
 Icon=
-X-KDevelop-Plugin-Version=
-X-KDevelop-Plugin-Homepage=
-X-KDevelop-Plugin-BugsEmailAddress=
-X-KDevelop-Plugin-Copyright=
+X-TDevelop-Plugin-Version=
+X-TDevelop-Plugin-Homepage=
+X-TDevelop-Plugin-BugsEmailAddress=
+X-TDevelop-Plugin-Copyright=
 X-TDE-Library=
-X-KDevelop-Version=
-X-KDevelop-Scope=
-X-KDevelop-Properties=
-X-KDevelop-Args=
+X-TDevelop-Version=
+X-TDevelop-Scope=
+X-TDevelop-Properties=
+X-TDevelop-Args=
 @endcode
 <b>Description of parameters in .desktop file:</b>
 - <i>Name</i> is a non-translatable name of a plugin, it is used in KTrader queries
@@ -75,17 +75,17 @@ to search for a plugin (required);
 plugin names in GUI (required);
 - <i>Comment</i> is a short description about the plugin (optional);
 - <i>Icon</i> is a plugin icon (preferred);
-- <i>X-KDevelop-Plugin-Version</i> is a version of a plugin (optional);
-- <i>X-KDevelop-Plugin-Homepage</i> is a home page of a plugin (optional);
-- <i>X-KDevelop-Plugin-License</i> is a license (optional). can be: GPL, LGPL, BSD, Artistic,
+- <i>X-TDevelop-Plugin-Version</i> is a version of a plugin (optional);
+- <i>X-TDevelop-Plugin-Homepage</i> is a home page of a plugin (optional);
+- <i>X-TDevelop-Plugin-License</i> is a license (optional). can be: GPL, LGPL, BSD, Artistic,
 TQPL or Custom. If this property is not set, license is considered as unknown;
-- <i>X-KDevelop-Plugin-BugsEmailAddress</i> is an email address for bug reports (optional);
-- <i>X-KDevelop-Plugin-Copyright</i> is a copyright statement (optional);
+- <i>X-TDevelop-Plugin-BugsEmailAddress</i> is an email address for bug reports (optional);
+- <i>X-TDevelop-Plugin-Copyright</i> is a copyright statement (optional);
 - <i>X-TDE-Library</i> is a name of library which contains the plugin (required);
-- <i>X-KDevelop-Version</i> is a version of KDevelop interfaces which is supported by the plugin (required);
-- <i>X-KDevelop-Scope</i> is a scope of a plugin (see below for explanation) (required);
-- <i>X-KDevelop-Args</i> is a list of additional arguments passed to plugins constructor (optional);
-- <i>X-KDevelop-Properties</i> is a list of properties which this plugin supports, see @ref Profile class documentation for explanation (required to work with shells that support profiles).
+- <i>X-TDevelop-Version</i> is a version of TDevelop interfaces which is supported by the plugin (required);
+- <i>X-TDevelop-Scope</i> is a scope of a plugin (see below for explanation) (required);
+- <i>X-TDevelop-Args</i> is a list of additional arguments passed to plugins constructor (optional);
+- <i>X-TDevelop-Properties</i> is a list of properties which this plugin supports, see @ref Profile class documentation for explanation (required to work with shells that support profiles).
 .
 Plugin scope can be either:
 - Core
@@ -163,9 +163,9 @@ public:
 
     Template argument is used as a type to cast the result to. This is done because extension
     is usually derived from a certain base class and not directly from KDevPlugin.
-    @param serviceType The service type of an extension (like "KDevelop/SourceFormatter").
+    @param serviceType The service type of an extension (like "TDevelop/SourceFormatter").
     @param constraint The constraint which is applied when quering for the service. This
-    constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'").
+    constraint is a usual KTrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'").
     @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/
     template <class Extension>
     Extension *extension(const TQString &serviceType, const TQString &constraint = "")
diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp
index c9746047..dfc326a1 100644
--- a/lib/interfaces/kdevplugincontroller.cpp
+++ b/lib/interfaces/kdevplugincontroller.cpp
@@ -28,12 +28,12 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType,
     const TQString &constraint)
 {
     return KTrader::self()->query(serviceType,
-        TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION));
+        TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION));
 }
 
 KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
 {
-    return query("KDevelop/Plugin", constraint);
+    return query("TDevelop/Plugin", constraint);
 }
 
 KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/)
diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h
index 8458e8ef..6097e2c1 100644
--- a/lib/interfaces/kdevplugincontroller.h
+++ b/lib/interfaces/kdevplugincontroller.h
@@ -26,14 +26,14 @@
 
 /**
 @file kdevplugincontroller.h
-KDevelop plugin controller interface.
+TDevelop plugin controller interface.
 */
 
 class KDevPlugin;
 class ProfileEngine;
 
 /**
-The base class for KDevelop plugin controller.
+The base class for TDevelop plugin controller.
 Plugin controller is responsible for quering, loading and unloading available plugins.
 */
 class KDevPluginController: public TQObject
@@ -66,23 +66,23 @@ public:
     All already loaded plugins will be queried and the first one to support the service type
     will be returned. Any plugin can be an extension, only "ServiceTypes=..." entry is
     required in .desktop file for that plugin.
-    @param serviceType The service type of an extension (like "KDevelop/SourceFormatter")
+    @param serviceType The service type of an extension (like "TDevelop/SourceFormatter")
     @param constraint The constraint which is applied when quering for the service. This
-    constraint is a usual KTrader constraint statement (like "[X-KDevelop-Foo]=='MyFoo'").
+    constraint is a usual KTrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'").
     @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/
     virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0;
 
     /**Queries KDevelop services. Version is checked automatically
-    by adding proper X-KDevelop-Version=N statement into the query.
-    @param serviceType The service type to query, for example "KDevelop/Plugin" or
-    "KDevelop/SourceFormatter."
+    by adding proper X-TDevelop-Version=N statement into the query.
+    @param serviceType The service type to query, for example "TDevelop/Plugin" or
+    "TDevelop/SourceFormatter."
     @param constraint A constraint for the service. Do not include plugin version number - it
     is done automatically.
     @return The list of plugin offers.*/
     static KTrader::OfferList query(const TQString &serviceType, const TQString &constraint);
 
-    /**Queries KDevelop plugins. Works like
-    KDevPluginController::query with serviceType set to "KDevelop/Plugin".
+    /**Queries TDevelop plugins. Works like
+    KDevPluginController::query with serviceType set to "TDevelop/Plugin".
     @param constraint A constraint for the service. Do not include plugin version number - it
     is done automatically.
     @return The list of plugin offers.*/
diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp
index 6c869d23..81d58902 100644
--- a/lib/interfaces/kdevplugininfo.cpp
+++ b/lib/interfaces/kdevplugininfo.cpp
@@ -60,12 +60,12 @@ KDevPluginInfo::KDevPluginInfo(const TQString &pluginName)
         
         d->m_rawGenericName = offer->untranslatedGenericName();
         
-        d->m_version = offer->property("X-KDevelop-Plugin-Version").toString();
-        d->m_homePageAddress = offer->property("X-KDevelop-Plugin-Homepage").toString();
-        d->m_bugsEmailAddress = offer->property("X-KDevelop-Plugin-BugsEmailAddress").toString();
-        d->m_copyrightStatement = offer->property("X-KDevelop-Plugin-Copyright").toString();
+        d->m_version = offer->property("X-TDevelop-Plugin-Version").toString();
+        d->m_homePageAddress = offer->property("X-TDevelop-Plugin-Homepage").toString();
+        d->m_bugsEmailAddress = offer->property("X-TDevelop-Plugin-BugsEmailAddress").toString();
+        d->m_copyrightStatement = offer->property("X-TDevelop-Plugin-Copyright").toString();
         
-        TQString lic = offer->property("X-KDevelop-Plugin-License").toString();
+        TQString lic = offer->property("X-TDevelop-Plugin-License").toString();
         if (lic == "GPL")
             d->m_licenseType = KAboutData::License_GPL;
         else if (lic == "LGPL")
diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h
index 2aa5f32c..3ade0e46 100644
--- a/lib/interfaces/kdevplugininfo.h
+++ b/lib/interfaces/kdevplugininfo.h
@@ -25,11 +25,11 @@
 
 /**
 @file kdevplugininfo.h
-KDevelop plugin information container class.
+TDevelop plugin information container class.
 */
 
 /**
-Information about KDevelop plugin.
+Information about TDevelop plugin.
 It uses plugin name to query plugin .desktop files and
 retrieve most information. Names of authors and credits to other people
 must be added manually using KDevPluginInfo::addAuthor and KDevPluginInfo::addCredit
diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h
index d567906b..fbe42ea7 100644
--- a/lib/interfaces/kdevproject.h
+++ b/lib/interfaces/kdevproject.h
@@ -43,7 +43,7 @@ KDevelop project interface.
 Plugins implementing the KDevProject interfaces are used to manage projects.
 
 Project can be considered as a way of grouping files (in text editors) or
-as a way of providing support for a build system (like it is done in KDevelop IDE buildtools).
+as a way of providing support for a build system (like it is done in TDevelop IDE buildtools).
 */
 class KDevProject: public KDevPlugin
 {
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 09fb97bf..b1717f1e 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -87,7 +87,7 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
                           this, TQT_SLOT(slotExpandAbbrev()),
                           actionCollection(), "edit_expandabbrev" );
     action->setToolTip( i18n("Expand abbreviation") );
-    action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>KDevelop Settings</b>, <b>Abbreviations</b> tab.") );
+    action->setWhatsThis( i18n("<b>Expand abbreviation</b><p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>Abbreviations</b> tab.") );
 
     load();
 
diff --git a/parts/appwizard/README.dox b/parts/appwizard/README.dox
index ab051e05..5baf78d0 100644
--- a/parts/appwizard/README.dox
+++ b/parts/appwizard/README.dox
@@ -61,7 +61,7 @@ Qt        Qt based
 Kicker    Kicker applet
 kioslave  KDE ioslave
 KOffice   KOffice application
-KDevelop  KDevelop plugin
+KDevelop  TDevelop plugin
 GNOME     GNOME application
 \endverbatim
 
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 4ab19b48..38dba43f 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -339,7 +339,7 @@ void AppWizardDialog::loadVcs()
 	m_vcsForm->stack->addWidget( 0, i++ );
 
 	// We query for all vcs integrators for KDevelop
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", "");
+	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VCSIntegrator", "");
 	KTrader::OfferList::const_iterator serviceIt = offers.begin();
 	for (; serviceIt != offers.end(); ++serviceIt)
 	{
@@ -365,7 +365,7 @@ void AppWizardDialog::loadVcs()
 		{
 			kdDebug(9010) << "    success" << endl;
 
-			TQString vcsName = service->property("X-KDevelop-VCS").toString();
+			TQString vcsName = service->property("X-TDevelop-VCS").toString();
 			m_vcsForm->combo->insertItem(vcsName, i);
 			m_integrators.insert(vcsName, integrator);
 
@@ -1023,11 +1023,11 @@ void AppWizardDialog::openAfterGeneration()
 	DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
 
 	//save the selected vcs
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
+	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VCSIntegrator", TQString("[X-TDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
 	if (offers.count() == 1)
 	{
 		KService::Ptr service = offers.first();
-		DomUtil::writeEntry(projectDOM, "/general/versioncontrol", service->property("X-KDevelop-VCSPlugin").toString());
+		DomUtil::writeEntry(projectDOM, "/general/versioncontrol", service->property("X-TDevelop-VCSPlugin").toString());
 	}
 
 	// figure out what plugins we should disable by default
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 1f426a86..9a10f6d3 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -502,7 +502,7 @@ void ImportDialog::scanAvailableVCS()
 {
 //    vcsCombo->insertStringList( m_part->registeredVersionControls() );
     int i = 0;
-    KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl");
+    KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl");
     KTrader::OfferList::const_iterator it = offers.begin();
     while( it != offers.end() )
     {
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index b05a12a4..4f50aafe 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -164,7 +164,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
 	commandline += " ";
 	commandline += dir;
 
-	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+	if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
 		appFrontend->startAppCommand(dir, commandline, false);
 
 	return true;
diff --git a/parts/diff/README b/parts/diff/README
index 7df3c4b5..731741e1 100644
--- a/parts/diff/README
+++ b/parts/diff/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/distpart/README b/parts/distpart/README
index 7df3c4b5..731741e1 100644
--- a/parts/distpart/README
+++ b/parts/distpart/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 259ac301..8a45910b 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -79,11 +79,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
 	    return;
 	}
 	else
-            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
                 makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
 		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
 }
@@ -178,11 +178,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
 	    return;
 	}
 	else
-            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+            if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
 	        makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
 		" && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
     }
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
 		 " && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
 }
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 08db3617..82df1ad4 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart()
 void DocumentationPart::loadDocumentationPlugins()
 {
     KTrader::OfferList docPluginOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
-            TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+        KTrader::self()->query(TQString::fromLatin1("TDevelop/DocumentationPlugins"),
+            TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION));
 
     KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
     for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 6abf51fa..50a5fd35 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -77,7 +77,7 @@ DocKDevTOCPlugin::~DocKDevTOCPlugin()
 
 TQString DocKDevTOCPlugin::pluginName() const
 {
-    return i18n("KDevelopTOC Documentation Collection");
+    return i18n("TDevelopTOC Documentation Collection");
 }
 
 DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url)
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index c4c5d87e..908ac4e0 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
         KCmdLineLastOption
     };
 
-    KAboutData aboutData("tdevelop-htdig", I18N_NOOP("KDevelop ht://Dig Indexer"),
+    KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),
                          "0.2", I18N_NOOP("TDE Index generator for documentation files."));
 
     KCmdLineArgs::init(argc, argv, &aboutData);
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index cd73e4b1..e04e79da 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -272,7 +272,7 @@ void DoxygenPart::slotDoxygen()
 
     kdDebug(9026) << "Doxygen command line: " << cmdline << endl;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, cmdline);
 }
 
@@ -340,7 +340,7 @@ void DoxygenPart::slotDoxClean()
 
     if (could_be_dirty) {
         kdDebug(9026) << "Cleaning Doxygen generated API documentation using: " << cmdline << endl;
-        if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+        if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
             makeFrontend->queueCommand(KShellProcess::quote(project()->projectDirectory()), cmdline);
     }
     else
@@ -350,7 +350,7 @@ void DoxygenPart::slotDoxClean()
 
 void DoxygenPart::slotPreviewProcessExited( )
 {
-    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend");
+    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend != 0 )
         disconnect(appFrontend, 0, this, 0);
     partController()->showDocument(KURL(m_tmpDir.name()+"html/index.html"));
@@ -361,7 +361,7 @@ void DoxygenPart::slotRunPreview( )
     if (m_file.isNull())
         return;
 
-    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend");
+    KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend");
     if ( appFrontend == 0 )
         return;
 
diff --git a/parts/filecreate/README b/parts/filecreate/README
index 7df3c4b5..731741e1 100644
--- a/parts/filecreate/README
+++ b/parts/filecreate/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 4e30fe50..cbe1cd06 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -90,7 +90,7 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 
 void FileSelectorPart::newFile()
 {
-    KDevCreateFile *creator = extension<KDevCreateFile>("KDevelop/CreateFile");
+    KDevCreateFile *creator = extension<KDevCreateFile>("TDevelop/CreateFile");
     if (creator)
     {
         KDevCreateFile::CreatedFile file = creator->createNewFile("",
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index 0c7ab17d..3873c112 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -155,7 +155,7 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page,
 
 KDevVersionControl *FileViewPart::versionControl()
 {
-   return extension<KDevVersionControl>("KDevelop/VersionControl");
+   return extension<KDevVersionControl>("TDevelop/VersionControl");
 }
 
 #include "fileviewpart.moc"
diff --git a/parts/partexplorer/README b/parts/partexplorer/README
index 7df3c4b5..731741e1 100644
--- a/parts/partexplorer/README
+++ b/parts/partexplorer/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/partexplorer/partexplorerformbase.ui b/parts/partexplorer/partexplorerformbase.ui
index e5f4ef6e..3e5e04a2 100644
--- a/parts/partexplorer/partexplorerformbase.ui
+++ b/parts/partexplorer/partexplorerformbase.ui
@@ -101,7 +101,7 @@
                 <string></string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>&lt;b&gt;Constraints&lt;/b&gt;Refine your query by writing additional constraints such as &lt;i&gt;([X-KDevelop-Scope]='Global')&lt;/i&gt;).</string>
+                <string>&lt;b&gt;Constraints&lt;/b&gt;Refine your query by writing additional constraints such as &lt;i&gt;([X-TDevelop-Scope]='Global')&lt;/i&gt;).</string>
             </property>
         </widget>
         <widget class="TQLabel">
diff --git a/parts/replace/README b/parts/replace/README
index 7df3c4b5..731741e1 100644
--- a/parts/replace/README
+++ b/parts/replace/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/snippet/README b/parts/snippet/README
index 7df3c4b5..731741e1 100644
--- a/parts/snippet/README
+++ b/parts/snippet/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index 7501f77d..04993028 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -82,9 +82,9 @@ void SnippetPart::setupActions()
 KAboutData* SnippetPart::aboutData()
 {
   KAboutData *data = new KAboutData  ("snippetpart", I18N_NOOP("SnippetPart"), "1.1",
-                                                           I18N_NOOP( "SnippetPart for KDevelop" ),
+                                                           I18N_NOOP( "SnippetPart for TDevelop" ),
                                                            KAboutData::License_LGPL_V2,
-                                                           I18N_NOOP( "(c) 2003" ), 0, "http://www.tdevelop.org");
+                                                           I18N_NOOP( "(c) 2003" ), 0, "http://www.kdevelop.org");
   data->addAuthor ("Robert Gruber", I18N_NOOP("Author"), "rgruber@users.sourceforge.net", "http://kmp3indexer.sf.net");
 
 
@@ -112,18 +112,18 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
 TQStringList SnippetPart::getAllLanguages()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
-                               ).arg( KDEVELOP_PLUGIN_VERSION ));
+        KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"),
+                               TQString::fromLatin1("[X-TDevelop-Version] == %1"
+                               ).arg( TDEVELOP_PLUGIN_VERSION ));
     
     TQStringList languages;
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
-        TQString language = (*it)->property("X-KDevelop-Language").toString();
+        TQString language = (*it)->property("X-TDevelop-Language").toString();
         languages.append(language);
         
-        kdDebug(9035) << "Found language: " << (*it)->property("X-KDevelop-Language").toString() << endl <<
+        kdDebug(9035) << "Found language: " << (*it)->property("X-TDevelop-Language").toString() << endl <<
         "genericName(): " <<(*it)->genericName() << endl << 
         "comment(): " <<(*it)->comment() << endl << endl;
     }
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index e1de784a..534eefe8 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -35,7 +35,7 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis
 
   action = new KAction(i18n("&Tip of the Day"), "idea", 0,
                        this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday");
-  action->setToolTip(i18n("A tip how to use KDevelop"));
+  action->setToolTip(i18n("A tip how to use TDevelop"));
   action->setWhatsThis(i18n("<b>Tip of the day</b><p>"
                             "Will display another good tip \n"
                             "contributed by KDevelop users."));
diff --git a/parts/tipofday/tips b/parts/tipofday/tips
index ae79ae33..ad4261b6 100644
--- a/parts/tipofday/tips
+++ b/parts/tipofday/tips
@@ -1,200 +1,200 @@
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you want to specify additional command-line options to your make program, you can set them in the <b>Project Options</b> dialog, <b>Make Options</b> tab.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you use functions of other libraries than the target is currently linked with, you can specify them in the <b>Target Options</b> dialog.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you want to change your application's version number, you can change it in the <b>Project Options</b> dialog, <b>General</b> tab, automatically updating your project.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you want to create a new project, choose "Project"->"New Project" from the menu.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you changed your applications' classes, you should update your API documentation by selecting "Build API Documentation" from the Build menu.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>You can save time if you select "Compile File" from the Build menu or the toolbar, to only compile your current implementation file.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you're searching for information on classes or classmembers, select "Search for Help on..." from the Help menu or use "Index" tab of the documentation tree.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>If you want to have info about something in the KDevelop window, select the "What's this?" button in the toolbar and click on the item you don't know about.
+<p>If you want to have info about something in the TDevelop window, select the "What's this?" button in the toolbar and click on the item you don't know about.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>Hint: You can search the documentation for a keyword by marking the word and select "Search in Documentation" in the right button popup menu.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>The KDevelop Team wishes you a nice day !
+<p>The TDevelop Team wishes you a nice day !
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>If you have found a bug in KDevelop, please let us know. Use KDE Bugzilla at http://bugs.kde.org/ or select "Help"->"Report Bug" from the menu.
+<p>If you have found a bug in TDevelop, please let us know. Use KDE Bugzilla at http://bugs.kde.org/ or select "Help"->"Report Bug" from the menu.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>If you want to add your own documentation to the documentation tree use <b>Documentation Tree</b> tab in the <b>Configure KDevelop</b> dialog.
+<p>If you want to add your own documentation to the documentation tree use <b>Documentation Tree</b> tab in the <b>Configure TDevelop</b> dialog.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can create a new class with "New Class" from the "Project" menu?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>To open a project, select "Open Project" from the "Project" menu.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>If you compile your project and get an error, you can click on the error message to switch to the file and line where the error occurred.
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>...that you can debug your programs within KDevelop by selecting "Debug"->"Start" in the menu?
+<p>...that you can debug your programs within TDevelop by selecting "Debug"->"Start" in the menu?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can switch between classes or namespaces by selecting the class or namespace combo in the toolbar?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can preview images and icons by selecting them in the file viewer's trees?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can set the compiler options in the <b>Project Options</b> dialog, <b>Configure Options</b> tab?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can copy text from the documentation browser to the clipboard and insert it into your sources?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you should keep your library documentation up to date after installing new libraries?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can configure the syntax-highlighting of the editor?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can access more internal debug functions selecting "Debug"->"Viewers"?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can move the cursor by words with Ctrl and left or right arrow?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that your source bookmarks are stored in the project?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
-<p>...that your documentation bookmarks are stored globally in KDevelop configuration?
+<p>...that your documentation bookmarks are stored globally in TDevelop configuration?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can start grep search from inside editor with context menu?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can set the installation path in "Project"->"Project Options" "Configure Options" with just adding "--prefix=/install/path/" to the "Configure arguments"-list?
 </html>
 </tip>
 
 
-<tip category="KDevelop|General">
+<tip category="TDevelop|General">
 <html>
 <p>...that you can compilie your project in "debug-mode" and "optimized-mode"?
 </html>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index ef30ffa8..9acb8dd8 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -153,7 +153,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
 
     if (captured)
     {
-       if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
+       if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend"))
             appFrontend->startAppCommand(TQString(), cmdline, false);
     }
     else 
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 58ef9444..0906bb73 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -96,7 +96,7 @@ void VCSManagerPart::loadVCSPlugin()
 	if ( m_vcsPluginName.isEmpty() ) return;
 	
 	TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
-	pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
+	pluginController()->loadPlugin( "TDevelop/VersionControl", constraint );
 }
 
 void VCSManagerPart::unloadVCSPlugin()
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index 9a081f3a..c087d415 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -51,8 +51,8 @@ void VCSManagerProjectConfig::setup( )
 	
 	int current = 0;
 
-	TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
+	TQString constraint = TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
+	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", constraint );
 	KTrader::OfferList::const_iterator it = offers.begin();
 	for ( int i = 1; it != offers.end(); ++it, ++i )
 	{
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 9eddd809..135e65e4 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -1,7 +1,7 @@
 /**
 @mainpage The KDevelop Generic Shell
 
-This library contains the Shell - a profile-based implementation of KDevelop plugin architecture.
+This library contains the Shell - a profile-based implementation of TDevelop plugin architecture.
 
 <b>Link with</b>: -lkdevshell
 
@@ -9,7 +9,7 @@ This library contains the Shell - a profile-based implementation of KDevelop plu
 
 \section creatingapp Creating an application using generic shell
 KDevelop platform applications can use generic shell as a ready to use implementation
-of KDevelop plugin architecture.
+of TDevelop plugin architecture.
 
 This is done by creating application %main.cpp file and @ref ShellExtension subclass.
 Example:
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 0f31d40e..3a6cdf2c 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -108,7 +108,7 @@ void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
     //current item id must be in sync with the enum!
     config->writeEntry("CompilerOutputLevel",gsw->compileOutputCombo->currentItem());
     config->sync();
-    if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("KDevelop/MakeFrontend"))
+    if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend"))
     {
         static_cast<KDevMakeFrontend*>(makeExt)->updateSettingsFromConfig();
     }
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index b3950615..51cb3901 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -106,9 +106,9 @@ LanguageSelectWidget::~LanguageSelectWidget()
 void LanguageSelectWidget::readProjectConfig()
 {
     KTrader::OfferList languageSupportOffers =
-        KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                               TQString::fromLatin1("[X-KDevelop-Version] == %1"
-                               ).arg( KDEVELOP_PLUGIN_VERSION ));
+        KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"),
+                               TQString::fromLatin1("[X-TDevelop-Version] == %1"
+                               ).arg( TDEVELOP_PLUGIN_VERSION ));
 
     TQStringList languages = DomUtil::readListEntry(m_projectDom, "/general/secondaryLanguages", "language");
     TQString language = DomUtil::readEntry(m_projectDom, "/general/primarylanguage");
@@ -116,10 +116,10 @@ void LanguageSelectWidget::readProjectConfig()
 
     for (KTrader::OfferList::ConstIterator it = languageSupportOffers.begin(); it != languageSupportOffers.end(); ++it)
     {
-        TQString la = (*it)->property("X-KDevelop-Language").toString();
+        TQString la = (*it)->property("X-TDevelop-Language").toString();
         if (la == language)
             continue;
-        LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-KDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() );
+        LangPluginItem *item = new LangPluginItem( _pluginList, (*it)->property("X-TDevelop-Language").toString(), (*it)->genericName(), (*it)->comment() );
         item->setOn(languages.contains(la));
     }
 
diff --git a/src/main.cpp b/src/main.cpp
index 44ea0a0e..a0711997 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,10 +29,10 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  static const char description[] = I18N_NOOP("The KDevelop Integrated Development Environment");
-  KAboutData aboutData("tdevelop", I18N_NOOP("KDevelop"),
+  static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment");
+  KAboutData aboutData("tdevelop", I18N_NOOP("TDevelop"),
                        VERSION, description, KAboutData::License_GPL,
-                       I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.tdevelop.org");
+                       I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org");
   aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org");
   aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de");
   aboutData.addAuthor("David Nolden", I18N_NOOP("Advanced C++ code completion, C++ support, overall improvements"), "david.nolden.tdevelop@art-master.de");
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 6c0fbd9b..b4b22221 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -29,10 +29,10 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  static const char description[] = I18N_NOOP("The KDevelop Integrated Development Environment:\nassistant and documentation viewer");
-  KAboutData aboutData("kdevassistant", I18N_NOOP("KDevelop Assistant"),
+  static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer");
+  KAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"),
                        VERSION, description, KAboutData::License_GPL,
-                       I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.tdevelop.org");
+                       I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org");
   aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@tdevelop.org");
   aboutData.addAuthor("Amilcar do Carmo Lucas", I18N_NOOP("Release coordinator, API documentation, Doxygen and autoproject patches"), "amilcar@ida.ing.tu-bs.de");
   aboutData.addAuthor("Bernd Gehrmann", I18N_NOOP("Initial idea, basic architecture, much initial source code"), "bernd@tdevelop.org");
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 922ccd26..6386f211 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -149,8 +149,8 @@ void MainWindowShare::createActions()
 
   action = KStdAction::preferences(this, TQT_SLOT(slotSettings()),
                 m_pMainWnd->actionCollection(), "settings_configure" );
-  action->setToolTip( i18n( "Configure KDevelop" ) );
-  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure KDevelop" )).arg(i18n("Lets you customize KDevelop.")));
+  action->setToolTip( i18n( "Configure TDevelop" ) );
+  action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop.")));
 
   m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar");
   m_toggleStatusbar->setText(i18n("Show &Statusbar"));
@@ -295,7 +295,7 @@ void MainWindowShare::slotConfigureNotifications()
 
 void MainWindowShare::slotSettings()
 {
-    KDialogBase dlg(KDialogBase::IconList, i18n("Configure KDevelop"),
+    KDialogBase dlg(KDialogBase::IconList, i18n("Configure TDevelop"),
                     KDialogBase::Help|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, m_pMainWnd,
                     "customization dialog");
     dlg.setHelp("setup");
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 6639375b..6d579346 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -49,7 +49,7 @@ namespace
   template <class ComponentType>
   ComponentType *loadDefaultPart( const TQString &serviceType )
   {
-    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::OfferList offers = KTrader::self()->query(serviceType, TQString("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION));
     KTrader::OfferList::ConstIterator serviceIt = offers.begin();
     for ( ; serviceIt != offers.end(); ++serviceIt ) {
       KService::Ptr service = *serviceIt;
@@ -173,7 +173,7 @@ void PluginController::unloadProjectPlugins( )
 {
 	// this is nasty, but we need to unload the version control plugin too, and the 
 	// right moment to do this is here
-	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", "");	
+	KTrader::OfferList offers = KTrader::self()->query("TDevelop/VersionControl", "");	
 
  	offers += m_engine.offers(m_profile, ProfileEngine::Project);
 	for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
@@ -232,7 +232,7 @@ TQStringList PluginController::argumentsFromService( const KService::Ptr &servic
 	if ( !service )
 		// service is a reference to a pointer, so a check whether it is 0 is still required
 		return args;
-	TQVariant prop = service->property( "X-KDevelop-Args" );
+	TQVariant prop = service->property( "X-TDevelop-Args" );
 	if ( prop.isValid() )
 		args = TQStringList::split( " ", prop.toString() );
 	return args;
diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp
index baac2e80..eeff6afc 100644
--- a/src/profileengine/editor/main.cpp
+++ b/src/profileengine/editor/main.cpp
@@ -30,7 +30,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kdevprofileeditor", I18N_NOOP("KDevelop Profile Editor"), "1", "",
+    KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
                      KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, "");
     about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org");
     KCmdLineArgs::init(argc, argv, &about);
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index 0383f332..435e9986 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -115,11 +115,11 @@ void ProfileEditor::refresh()
 
 void ProfileEditor::refreshPropertyCombo()
 {
-    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"));
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"));
     TQStringList props;
     for (KTrader::OfferList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it)
     {
-        TQStringList currProps = (*it)->property("X-KDevelop-Properties").toStringList();
+        TQStringList currProps = (*it)->property("X-TDevelop-Properties").toStringList();
         for (TQStringList::const_iterator p = currProps.constBegin(); 
                 p != currProps.constEnd(); ++p)
             if (!props.contains(*p))
@@ -209,19 +209,19 @@ void ProfileEditor::fillPluginsList(Profile *profile)
     for (KTrader::OfferList::const_iterator it = coreOffers.constBegin();
             it != coreOffers.constEnd(); ++it)
         new KListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(),
-            (*it)->property("X-KDevelop-Properties").toStringList().join(", "));
+            (*it)->property("X-TDevelop-Properties").toStringList().join(", "));
         
     KTrader::OfferList globalOffers = engine.offers(profile->name(), ProfileEngine::Global);
     for (KTrader::OfferList::const_iterator it = globalOffers.constBegin();
             it != globalOffers.constEnd(); ++it)
         new KListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(),
-            (*it)->property("X-KDevelop-Properties").toStringList().join(", "));
+            (*it)->property("X-TDevelop-Properties").toStringList().join(", "));
     
     KTrader::OfferList projectOffers = engine.offers(profile->name(), ProfileEngine::Project);
     for (KTrader::OfferList::const_iterator it = projectOffers.constBegin();
             it != projectOffers.constEnd(); ++it)
         new KListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(),
-            (*it)->property("X-KDevelop-Properties").toStringList().join(", "));
+            (*it)->property("X-TDevelop-Properties").toStringList().join(", "));
 }
 
 void ProfileEditor::propertyExecuted(TQListBoxItem *item)
diff --git a/src/profileengine/lib/Mainpage.dox b/src/profileengine/lib/Mainpage.dox
index 88a443dc..eb242dd9 100644
--- a/src/profileengine/lib/Mainpage.dox
+++ b/src/profileengine/lib/Mainpage.dox
@@ -1,7 +1,7 @@
 /**
 @mainpage The KDevelop Shell Profiles Library
 
-This library contains plugin profiles engine for KDevelop shell.
+This library contains plugin profiles engine for TDevelop shell.
 
 <b>Link with</b>: -lprofileengine
 
diff --git a/src/profileengine/lib/profile.h b/src/profileengine/lib/profile.h
index 857ddf39..dcdc369b 100644
--- a/src/profileengine/lib/profile.h
+++ b/src/profileengine/lib/profile.h
@@ -40,7 +40,7 @@ public:
 
     /**Lists which are held by a profile.*/
     enum List {
-        Properties        /**<X-KDevelop-Properties defined for this profile.*/,
+        Properties        /**<X-TDevelop-Properties defined for this profile.*/,
         ExplicitEnable    /**<A list of explicitly enabled plugins (names).*/,
         ExplicitDisable   /**<A list of explicitly disabled plugins (names).*/
     };
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index 48a4e4e2..6664aba9 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -78,23 +78,23 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     if (!profile)
         return KTrader::OfferList();
 
-    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Core'");
             break;
     }
     TQString constraint_add = "";
     Profile::EntryList properties = profile->list(Profile::Properties);
     int i = 0;
     for (Profile::EntryList::const_iterator it = properties.begin(); it != properties.end(); ++it)
-        constraint_add += TQString::fromLatin1(" %1 '%2' in [X-KDevelop-Properties]").
+        constraint_add += TQString::fromLatin1(" %1 '%2' in [X-TDevelop-Properties]").
             arg((i++)==0?"":"or").arg((*it).name);
     if (!constraint_add.isEmpty())
         constraint += " and ( " + constraint_add + " ) ";
@@ -106,7 +106,7 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
         << "        " << constraint << endl << endl << endl;*/
 //END debug
 
-    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+    KTrader::OfferList list = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
     TQStringList names;
 
 /* Wrong, this is not what we want to do.
@@ -129,9 +129,9 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
     {
         if (names.contains((*it).name))
             continue;
-        TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+        TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
         constraint += TQString::fromLatin1("and [Name] == '%1'").arg((*it).name);
-        KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+        KTrader::OfferList enable = KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
         list += enable;
     }
 
@@ -149,19 +149,19 @@ KTrader::OfferList ProfileEngine::offers(const TQString &profileName, OfferType
 
 KTrader::OfferList ProfileEngine::allOffers(OfferType offerType)
 {
-    TQString constraint = TQString::fromLatin1("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+    TQString constraint = TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
     switch (offerType) {
         case Global:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Global'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Global'");
             break;
         case Project:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Project'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Project'");
             break;
         case Core:
-            constraint += TQString::fromLatin1(" and [X-KDevelop-Scope] == 'Core'");
+            constraint += TQString::fromLatin1(" and [X-TDevelop-Scope] == 'Core'");
             break;
     }
-    return KTrader::self()->query(TQString::fromLatin1("KDevelop/Plugin"), constraint);
+    return KTrader::self()->query(TQString::fromLatin1("TDevelop/Plugin"), constraint);
 }
 
 void ProfileEngine::getProfileWithListing(ProfileListing &listing, Profile **profile,
diff --git a/src/profiles/IDE/profile.config b/src/profiles/IDE/profile.config
index 0bb6b317..b4423c8b 100644
--- a/src/profiles/IDE/profile.config
+++ b/src/profiles/IDE/profile.config
@@ -5,8 +5,8 @@ List=
 List=
 
 [Information]
-Description=Generic KDevelop IDE profile
-GenericName=KDevelop IDE
+Description=Generic TDevelop IDE profile
+GenericName=TDevelop IDE
 
 [Properties]
 List=AdditionalTools,CodeEditing,CodeNavigation,Console,Documentation,EditorChooser,FileCreation,FileReplace,FileSearch,GlobalFileManagement,OpenFileNavigation,OptionalCodeEditing,OutputTool,ProjectCreation,ProjectFileGroupsManagement,ProjectFileManagement,UISwitching,ViewManagement,CVSService,ClearcaseVCS,PerforceVCS,SubversionVCS,ProjectPackaging,VCS
diff --git a/src/profiles/KDevAssistant/profile.config b/src/profiles/KDevAssistant/profile.config
index dc1435a9..46edc970 100644
--- a/src/profiles/KDevAssistant/profile.config
+++ b/src/profiles/KDevAssistant/profile.config
@@ -5,8 +5,8 @@ List=
 List=
 
 [Information]
-Description=KDevelop Assistant profile
-GenericName=KDevelop Assistant
+Description=TDevelop Assistant profile
+GenericName=TDevelop Assistant
 
 [Properties]
 List=GlobalFileManagement,Documentation,UISwitching,ViewManagement
diff --git a/src/profiles/profile.config b/src/profiles/profile.config
index 9d884533..00654b45 100644
--- a/src/profiles/profile.config
+++ b/src/profiles/profile.config
@@ -1,3 +1,3 @@
 [Information]
-GenericName=KDevelop
-Description=Default KDevelop profile
+GenericName=TDevelop
+Description=Default TDevelop profile
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 8c05e84a..91d4d59a 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -536,8 +536,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang)
   }
 
   KTrader::OfferList languageSupportOffers =
-    KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
-                           TQString::fromLatin1("[X-KDevelop-Language] == '%1' and [X-KDevelop-Version] == %2").arg(lang).arg(KDEVELOP_PLUGIN_VERSION));
+    KTrader::self()->query(TQString::fromLatin1("TDevelop/LanguageSupport"),
+                           TQString::fromLatin1("[X-TDevelop-Language] == '%1' and [X-TDevelop-Version] == %2").arg(lang).arg(TDEVELOP_PLUGIN_VERSION));
 
   if (languageSupportOffers.isEmpty()) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
@@ -662,7 +662,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
 //         kdDebug() << "IDX: " << idx << "    PROFILE: " << profiles[idx] << endl;
 //         return profiles[idx];
 //     }
-//     return "KDevelop";
+//     return "TDevelop";
 // }
 
 #include "projectmanager.moc"
diff --git a/vcs/clearcase/README b/vcs/clearcase/README
index 7df3c4b5..731741e1 100644
--- a/vcs/clearcase/README
+++ b/vcs/clearcase/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index 198cc1db..d8bb26af 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -144,7 +144,7 @@ void ClearcasePart::slotCheckin()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -176,7 +176,7 @@ void ClearcasePart::slotCheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -199,7 +199,7 @@ void ClearcasePart::slotUncheckout()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -228,7 +228,7 @@ void ClearcasePart::slotCreate()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -255,7 +255,7 @@ void ClearcasePart::slotRemove()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
     emit finishedFetching(dir);
@@ -279,7 +279,7 @@ void ClearcasePart::slotListHistory()
     command += " ";
     command += KShellProcess::quote(name);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -333,7 +333,7 @@ void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err
         return;
     }
 
-    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
+    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( diff );
 }
 
@@ -354,7 +354,7 @@ void ClearcasePart::slotListCheckouts()
     command += " && cleartool lsco ";
     command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout);
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 
 }
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 04a37607..7777760a 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 200?-2003 by KDevelop Authors                           *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h
index 1c828d90..ec3e4f36 100644
--- a/vcs/cvsservice/cvsdiffpage.h
+++ b/vcs/cvsservice/cvsdiffpage.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by KDevelop Authors                           *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index 6d192f38..ff36c19d 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 200?-2003 by KDevelop Authors                           *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index fb2e19a7..c0ade68e 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 200?-2003 by KDevelop Authors                           *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h
index 81db2fe5..badfcfd6 100644
--- a/vcs/cvsservice/cvslogpage.h
+++ b/vcs/cvsservice/cvslogpage.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 200?-2003 by KDevelop Authors                           *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 7556f7bc..7bacf3e1 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -332,7 +332,7 @@ KDevCore *CvsServicePartImpl::core() const
 
 KDevDiffFrontend *CvsServicePartImpl::diffFrontend() const
 {
-    return m_part->extension<KDevDiffFrontend>("KDevelop/DiffFrontend");
+    return m_part->extension<KDevDiffFrontend>("TDevelop/DiffFrontend");
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -774,7 +774,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName,
     kdDebug( 9006 ) << "  ** Will run the following command: " << endl << cmdLine << endl;
     kdDebug( 9006 ) << "  ** on directory: " << dirName << endl;
 
-    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand( dirName, cmdLine );
 }
 
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index b1e888ff..d4de15c1 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by KDevelop Authors                                *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h
index 28f36a11..c8f9c8af 100644
--- a/vcs/cvsservice/cvsprocesswidget.h
+++ b/vcs/cvsservice/cvsprocesswidget.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by KDevelop Authors                                *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/cvsservice/cvsservicedcopIface.h b/vcs/cvsservice/cvsservicedcopIface.h
index 050ad6c4..2f62964b 100644
--- a/vcs/cvsservice/cvsservicedcopIface.h
+++ b/vcs/cvsservice/cvsservicedcopIface.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2003 by KDevelop Authors                                *
- *   www.tdevelop.org                                                      *
+ *   www.kdevelop.org                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
diff --git a/vcs/perforce/README b/vcs/perforce/README
index 7df3c4b5..731741e1 100644
--- a/vcs/perforce/README
+++ b/vcs/perforce/README
@@ -1,3 +1,3 @@
 Please read the on-line, automaticaly updated KDevelop API documentation at:
-http://www.tdevelop.org
+http://www.kdevelop.org
 or read the README.dox file.
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index dd501e37..3220d33e 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -140,7 +140,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
     command += " && p4 " + cmd + " ";
     command += name;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -183,7 +183,7 @@ void PerforcePart::commit( const TQString& filename )
     TQString command("echo " + message);
     command += " | p4 submit -i";
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand("", command);
 }
 
@@ -208,7 +208,7 @@ void PerforcePart::update( const TQString& filename )
     command += " && p4 sync ";
     command += name;
 
-    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend"))
+    if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
         makeFrontend->queueCommand(dir, command);
 }
 
@@ -277,7 +277,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
     TQString strippedDiff = diff;
     strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
 
-    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
+    if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend"))
         diffFrontend->showDiff( strippedDiff );
 }
 
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp
index 9f604bca..8b57f0e1 100644
--- a/vcs/subversion/commitdlg.cpp
+++ b/vcs/subversion/commitdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   This file is part of KDevelop                                         *
+ *   This file is part of TDevelop                                         *
  *   Copyright (C) 2007 The KDevelop Authors <tdevelop-devel@tdevelop.org>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h
index 08f5c8ec..47a25169 100644
--- a/vcs/subversion/commitdlg.h
+++ b/vcs/subversion/commitdlg.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   This file is part of KDevelop                                         *
+ *   This file is part of TDevelop                                         *
  *   Copyright (C) 2007 The KDevelop Authors <tdevelop-devel@tdevelop.org>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/vcs/subversion/kdevsvn+file.protocol b/vcs/subversion/kdevsvn+file.protocol
index decc1cc4..8ac6ec11 100644
--- a/vcs/subversion/kdevsvn+file.protocol
+++ b/vcs/subversion/kdevsvn+file.protocol
@@ -13,27 +13,27 @@ deleteRecursive=true
 listing=Name,Size,Date,Owner
 defaultMimetype=application/octet-stream
 Icon=remote
-Description=Subversion ioslave for KDevelop
-Description[ca]=L'esclau io (ioslave) Subversion per a KDevelop
-Description[de]=Ein-/Ausgabemodul für Subversion (KDevelop)
-Description[el]=Subversion ioslave για το KDevelop
-Description[es]=El ioslave de Subversion para KDevelop
-Description[et]=KDevelopi Subversioni IO-moodul
-Description[fr]=Esclave d'E/S (ioslave) Subversion pour KDevelop
-Description[hu]=Subversion KDE-protokoll a KDevelophoz
-Description[it]=ioslave di subversion per KDevelop
-Description[ja]=KDevelop のための Subversion ioslave
-Description[ms]=IOslave Subversion untuk KDevelop
-Description[nds]=KDevelop-In-/Utgaavmoduul för Subversion
-Description[nl]=Subversion-ioslave voor KDevelop
-Description[pl]=Wtyczka protokołu Subversion dla KDevelopa
-Description[pt]='Ioslave' do Subversion para o KDevelop
-Description[pt_BR]='Ioslave' do Subversion para o KDevelop
-Description[ru]=Поддержка протокола Subversion для KDevelop
-Description[sk]=Subversion ioslave pre KDevelop
-Description[sr]=KIOSlave Subversion-а за KDevelop
-Description[sr@Latn]=KIOSlave Subversion-a za KDevelop
-Description[sv]=Subversion I/O-slav för KDevelop
-Description[zh_TW]=KDevelop 的 Subversion ioslave
+Description=Subversion ioslave for TDevelop
+Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop
+Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop)
+Description[el]=Subversion ioslave για το TDevelop
+Description[es]=El ioslave de Subversion para TDevelop
+Description[et]=TDevelopi Subversioni IO-moodul
+Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop
+Description[hu]=Subversion KDE-protokoll a TDevelophoz
+Description[it]=ioslave di subversion per TDevelop
+Description[ja]=TDevelop のための Subversion ioslave
+Description[ms]=IOslave Subversion untuk TDevelop
+Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion
+Description[nl]=Subversion-ioslave voor TDevelop
+Description[pl]=Wtyczka protokołu Subversion dla TDevelopa
+Description[pt]='Ioslave' do Subversion para o TDevelop
+Description[pt_BR]='Ioslave' do Subversion para o TDevelop
+Description[ru]=Поддержка протокола Subversion для TDevelop
+Description[sk]=Subversion ioslave pre TDevelop
+Description[sr]=KIOSlave Subversion-а за TDevelop
+Description[sr@Latn]=KIOSlave Subversion-a za TDevelop
+Description[sv]=Subversion I/O-slav för TDevelop
+Description[zh_TW]=TDevelop 的 Subversion ioslave
 maxInstances=5
 class=:internet
diff --git a/vcs/subversion/kdevsvn+http.protocol b/vcs/subversion/kdevsvn+http.protocol
index 5e836c02..2c02d3d7 100644
--- a/vcs/subversion/kdevsvn+http.protocol
+++ b/vcs/subversion/kdevsvn+http.protocol
@@ -13,27 +13,27 @@ deleteRecursive=true
 listing=Name,Size,Date,Owner
 defaultMimetype=application/octet-stream
 Icon=remote
-Description=Subversion ioslave for KDevelop
-Description[ca]=L'esclau io (ioslave) Subversion per a KDevelop
-Description[de]=Ein-/Ausgabemodul für Subversion (KDevelop)
-Description[el]=Subversion ioslave για το KDevelop
-Description[es]=El ioslave de Subversion para KDevelop
-Description[et]=KDevelopi Subversioni IO-moodul
-Description[fr]=Esclave d'E/S (ioslave) Subversion pour KDevelop
-Description[hu]=Subversion KDE-protokoll a KDevelophoz
-Description[it]=ioslave di subversion per KDevelop
-Description[ja]=KDevelop のための Subversion ioslave
-Description[ms]=IOslave Subversion untuk KDevelop
-Description[nds]=KDevelop-In-/Utgaavmoduul för Subversion
-Description[nl]=Subversion-ioslave voor KDevelop
-Description[pl]=Wtyczka protokołu Subversion dla KDevelopa
-Description[pt]='Ioslave' do Subversion para o KDevelop
-Description[pt_BR]='Ioslave' do Subversion para o KDevelop
-Description[ru]=Поддержка протокола Subversion для KDevelop
-Description[sk]=Subversion ioslave pre KDevelop
-Description[sr]=KIOSlave Subversion-а за KDevelop
-Description[sr@Latn]=KIOSlave Subversion-a za KDevelop
-Description[sv]=Subversion I/O-slav för KDevelop
-Description[zh_TW]=KDevelop 的 Subversion ioslave
+Description=Subversion ioslave for TDevelop
+Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop
+Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop)
+Description[el]=Subversion ioslave για το TDevelop
+Description[es]=El ioslave de Subversion para TDevelop
+Description[et]=TDevelopi Subversioni IO-moodul
+Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop
+Description[hu]=Subversion KDE-protokoll a TDevelophoz
+Description[it]=ioslave di subversion per TDevelop
+Description[ja]=TDevelop のための Subversion ioslave
+Description[ms]=IOslave Subversion untuk TDevelop
+Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion
+Description[nl]=Subversion-ioslave voor TDevelop
+Description[pl]=Wtyczka protokołu Subversion dla TDevelopa
+Description[pt]='Ioslave' do Subversion para o TDevelop
+Description[pt_BR]='Ioslave' do Subversion para o TDevelop
+Description[ru]=Поддержка протокола Subversion для TDevelop
+Description[sk]=Subversion ioslave pre TDevelop
+Description[sr]=KIOSlave Subversion-а за TDevelop
+Description[sr@Latn]=KIOSlave Subversion-a za TDevelop
+Description[sv]=Subversion I/O-slav för TDevelop
+Description[zh_TW]=TDevelop 的 Subversion ioslave
 maxInstances=5
 class=:internet
diff --git a/vcs/subversion/kdevsvn+https.protocol b/vcs/subversion/kdevsvn+https.protocol
index af9301af..82f9f22f 100644
--- a/vcs/subversion/kdevsvn+https.protocol
+++ b/vcs/subversion/kdevsvn+https.protocol
@@ -13,27 +13,27 @@ deleteRecursive=true
 listing=Name,Size,Date,Owner
 defaultMimetype=application/octet-stream
 Icon=remote
-Description=Subversion ioslave for KDevelop
-Description[ca]=L'esclau io (ioslave) Subversion per a KDevelop
-Description[de]=Ein-/Ausgabemodul für Subversion (KDevelop)
-Description[el]=Subversion ioslave για το KDevelop
-Description[es]=El ioslave de Subversion para KDevelop
-Description[et]=KDevelopi Subversioni IO-moodul
-Description[fr]=Esclave d'E/S (ioslave) Subversion pour KDevelop
-Description[hu]=Subversion KDE-protokoll a KDevelophoz
-Description[it]=ioslave di subversion per KDevelop
-Description[ja]=KDevelop のための Subversion ioslave
-Description[ms]=IOslave Subversion untuk KDevelop
-Description[nds]=KDevelop-In-/Utgaavmoduul för Subversion
-Description[nl]=Subversion-ioslave voor KDevelop
-Description[pl]=Wtyczka protokołu Subversion dla KDevelopa
-Description[pt]='Ioslave' do Subversion para o KDevelop
-Description[pt_BR]='Ioslave' do Subversion para o KDevelop
-Description[ru]=Поддержка протокола Subversion для KDevelop
-Description[sk]=Subversion ioslave pre KDevelop
-Description[sr]=KIOSlave Subversion-а за KDevelop
-Description[sr@Latn]=KIOSlave Subversion-a za KDevelop
-Description[sv]=Subversion I/O-slav för KDevelop
-Description[zh_TW]=KDevelop 的 Subversion ioslave
+Description=Subversion ioslave for TDevelop
+Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop
+Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop)
+Description[el]=Subversion ioslave για το TDevelop
+Description[es]=El ioslave de Subversion para TDevelop
+Description[et]=TDevelopi Subversioni IO-moodul
+Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop
+Description[hu]=Subversion KDE-protokoll a TDevelophoz
+Description[it]=ioslave di subversion per TDevelop
+Description[ja]=TDevelop のための Subversion ioslave
+Description[ms]=IOslave Subversion untuk TDevelop
+Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion
+Description[nl]=Subversion-ioslave voor TDevelop
+Description[pl]=Wtyczka protokołu Subversion dla TDevelopa
+Description[pt]='Ioslave' do Subversion para o TDevelop
+Description[pt_BR]='Ioslave' do Subversion para o TDevelop
+Description[ru]=Поддержка протокола Subversion для TDevelop
+Description[sk]=Subversion ioslave pre TDevelop
+Description[sr]=KIOSlave Subversion-а за TDevelop
+Description[sr@Latn]=KIOSlave Subversion-a za TDevelop
+Description[sv]=Subversion I/O-slav för TDevelop
+Description[zh_TW]=TDevelop 的 Subversion ioslave
 maxInstances=5
 class=:internet
diff --git a/vcs/subversion/kdevsvn+ssh.protocol b/vcs/subversion/kdevsvn+ssh.protocol
index 33a644f0..efc67f6c 100644
--- a/vcs/subversion/kdevsvn+ssh.protocol
+++ b/vcs/subversion/kdevsvn+ssh.protocol
@@ -13,27 +13,27 @@ deleteRecursive=true
 listing=Name,Size,Date,Owner
 defaultMimetype=application/octet-stream
 Icon=remote
-Description=Subversion ioslave for KDevelop
-Description[ca]=L'esclau io (ioslave) Subversion per a KDevelop
-Description[de]=Ein-/Ausgabemodul für Subversion (KDevelop)
-Description[el]=Subversion ioslave για το KDevelop
-Description[es]=El ioslave de Subversion para KDevelop
-Description[et]=KDevelopi Subversioni IO-moodul
-Description[fr]=Esclave d'E/S (ioslave) Subversion pour KDevelop
-Description[hu]=Subversion KDE-protokoll a KDevelophoz
-Description[it]=ioslave di subversion per KDevelop
-Description[ja]=KDevelop のための Subversion ioslave
-Description[ms]=IOslave Subversion untuk KDevelop
-Description[nds]=KDevelop-In-/Utgaavmoduul för Subversion
-Description[nl]=Subversion-ioslave voor KDevelop
-Description[pl]=Wtyczka protokołu Subversion dla KDevelopa
-Description[pt]='Ioslave' do Subversion para o KDevelop
-Description[pt_BR]='Ioslave' do Subversion para o KDevelop
-Description[ru]=Поддержка протокола Subversion для KDevelop
-Description[sk]=Subversion ioslave pre KDevelop
-Description[sr]=KIOSlave Subversion-а за KDevelop
-Description[sr@Latn]=KIOSlave Subversion-a za KDevelop
-Description[sv]=Subversion I/O-slav för KDevelop
-Description[zh_TW]=KDevelop 的 Subversion ioslave
+Description=Subversion ioslave for TDevelop
+Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop
+Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop)
+Description[el]=Subversion ioslave για το TDevelop
+Description[es]=El ioslave de Subversion para TDevelop
+Description[et]=TDevelopi Subversioni IO-moodul
+Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop
+Description[hu]=Subversion KDE-protokoll a TDevelophoz
+Description[it]=ioslave di subversion per TDevelop
+Description[ja]=TDevelop のための Subversion ioslave
+Description[ms]=IOslave Subversion untuk TDevelop
+Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion
+Description[nl]=Subversion-ioslave voor TDevelop
+Description[pl]=Wtyczka protokołu Subversion dla TDevelopa
+Description[pt]='Ioslave' do Subversion para o TDevelop
+Description[pt_BR]='Ioslave' do Subversion para o TDevelop
+Description[ru]=Поддержка протокола Subversion для TDevelop
+Description[sk]=Subversion ioslave pre TDevelop
+Description[sr]=KIOSlave Subversion-а за TDevelop
+Description[sr@Latn]=KIOSlave Subversion-a za TDevelop
+Description[sv]=Subversion I/O-slav för TDevelop
+Description[zh_TW]=TDevelop 的 Subversion ioslave
 maxInstances=5
 class=:internet
diff --git a/vcs/subversion/kdevsvn+svn.protocol b/vcs/subversion/kdevsvn+svn.protocol
index 0f9ab069..c4b56816 100644
--- a/vcs/subversion/kdevsvn+svn.protocol
+++ b/vcs/subversion/kdevsvn+svn.protocol
@@ -13,27 +13,27 @@ deleteRecursive=true
 listing=Name,Size,Date,Owner
 defaultMimetype=application/octet-stream
 Icon=remote
-Description=Subversion ioslave for KDevelop
-Description[ca]=L'esclau io (ioslave) Subversion per a KDevelop
-Description[de]=Ein-/Ausgabemodul für Subversion (KDevelop)
-Description[el]=Subversion ioslave για το KDevelop
-Description[es]=El ioslave de Subversion para KDevelop
-Description[et]=KDevelopi Subversioni IO-moodul
-Description[fr]=Esclave d'E/S (ioslave) Subversion pour KDevelop
-Description[hu]=Subversion KDE-protokoll a KDevelophoz
-Description[it]=ioslave di subversion per KDevelop
-Description[ja]=KDevelop のための Subversion ioslave
-Description[ms]=IOslave Subversion untuk KDevelop
-Description[nds]=KDevelop-In-/Utgaavmoduul för Subversion
-Description[nl]=Subversion-ioslave voor KDevelop
-Description[pl]=Wtyczka protokołu Subversion dla KDevelopa
-Description[pt]='Ioslave' do Subversion para o KDevelop
-Description[pt_BR]='Ioslave' do Subversion para o KDevelop
-Description[ru]=Поддержка протокола Subversion для KDevelop
-Description[sk]=Subversion ioslave pre KDevelop
-Description[sr]=KIOSlave Subversion-а за KDevelop
-Description[sr@Latn]=KIOSlave Subversion-a za KDevelop
-Description[sv]=Subversion I/O-slav för KDevelop
-Description[zh_TW]=KDevelop 的 Subversion ioslave
+Description=Subversion ioslave for TDevelop
+Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop
+Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop)
+Description[el]=Subversion ioslave για το TDevelop
+Description[es]=El ioslave de Subversion para TDevelop
+Description[et]=TDevelopi Subversioni IO-moodul
+Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop
+Description[hu]=Subversion KDE-protokoll a TDevelophoz
+Description[it]=ioslave di subversion per TDevelop
+Description[ja]=TDevelop のための Subversion ioslave
+Description[ms]=IOslave Subversion untuk TDevelop
+Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion
+Description[nl]=Subversion-ioslave voor TDevelop
+Description[pl]=Wtyczka protokołu Subversion dla TDevelopa
+Description[pt]='Ioslave' do Subversion para o TDevelop
+Description[pt_BR]='Ioslave' do Subversion para o TDevelop
+Description[ru]=Поддержка протокола Subversion для TDevelop
+Description[sk]=Subversion ioslave pre TDevelop
+Description[sr]=KIOSlave Subversion-а за TDevelop
+Description[sr@Latn]=KIOSlave Subversion-a za TDevelop
+Description[sv]=Subversion I/O-slav för TDevelop
+Description[zh_TW]=TDevelop 的 Subversion ioslave
 maxInstances=5
 class=:internet