Update XDG information in support of bug report 892.

227 files changed, 807 insertions, 807 deletions

diff --git a/akregator/src/akregator.desktop b/akregator/src/akregator.desktop
index 79b5e8762..0c8d051e9 100644
--- a/akregator/src/akregator.desktop
+++ b/akregator/src/akregator.desktop
@@ -103,5 +103,5 @@ Comment[uz]=TDE учун RSS янгиликларни ўқувчи
 Comment[zh_CN]=TDE RSS 新闻收集器
 Comment[zh_TW]=TDE 的 RSS 收集器
 Terminal=false
-Categories=Qt;KDE;Network;News;
+Categories=Qt;TDE;Network;News;
 X-DCOP-ServiceType=Unique
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index d18bb4188..ffa7c9052 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -237,7 +237,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
 
 void Part::loadPlugins()
 {
-    // "[X-KDE-akregator-plugintype] == 'storage'"
+    // "[X-TDE-akregator-plugintype] == 'storage'"
     KTrader::OfferList offers = PluginManager::query();
 
     for( KTrader::OfferList::ConstIterator it = offers.begin(), end = offers.end(); it != end; ++it )
diff --git a/akregator/src/akregator_part.desktop b/akregator/src/akregator_part.desktop
index 7dcd91f7d..fa0da1c65 100644
--- a/akregator/src/akregator_part.desktop
+++ b/akregator/src/akregator_part.desktop
@@ -8,6 +8,6 @@ Name[pt_BR]=Componente do aKregator
 Name[sv]=aKregator-delprogram
 Name[ta]=aKregatorபகுதி
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libakregatorpart
+X-TDE-Library=libakregatorpart
 Type=Service
 Icon=akregator
diff --git a/akregator/src/akregator_plugin.desktop b/akregator/src/akregator_plugin.desktop
index 540179344..bb02126c2 100644
--- a/akregator/src/akregator_plugin.desktop
+++ b/akregator/src/akregator_plugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Akregator/Plugin
+X-TDE-ServiceType=Akregator/Plugin
 Comment=Plugin for Akregator
 Comment[af]=Inprop module vir Akregator
 Comment[be]=Утулка для Akregator
@@ -54,31 +54,31 @@ Comment[zh_TW]=Akregator 外掛程式
 
 
 # Type of plugin, e.g. "storage".
-[PropertyDef::X-KDE-akregator-plugintype]
+[PropertyDef::X-TDE-akregator-plugintype]
 Type=TQString
 
 # Internal name for identification, not translated.
-[PropertyDef::X-KDE-akregator-name]
+[PropertyDef::X-TDE-akregator-name]
 Type=TQString
 
 # List of authors.
-[PropertyDef::X-KDE-akregator-authors]
+[PropertyDef::X-TDE-akregator-authors]
 Type=TQStringList
 
 # List of author's email addresses.
-[PropertyDef::X-KDE-akregator-email]
+[PropertyDef::X-TDE-akregator-email]
 Type=TQStringList
 
 # Priority of the plugin. When KTrader returns multiple offers, the one with the highest rank is chosen.
 # Range: 0 (disabled) - 255 (highest)
-[PropertyDef::X-KDE-akregator-rank]
+[PropertyDef::X-TDE-akregator-rank]
 Type=int
 
 # Version of the plugin.
-[PropertyDef::X-KDE-akregator-version]
+[PropertyDef::X-TDE-akregator-version]
 Type=int
 
 # Version of the framework this plugin is compatible with.
 # Must be bumped after making incompatible changes.
-[PropertyDef::X-KDE-akregator-framework-version]
+[PropertyDef::X-TDE-akregator-framework-version]
 Type=int
diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
index 1e63cfc06..61323a87f 100644
--- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
+++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
@@ -43,7 +43,7 @@ Name[tr]=Metakit depolama arka ucu
 Name[uk]=Програма зберігання Metakit
 Name[zh_CN]=Metakit 存储后端
 Name[zh_TW]=Metakit 儲存後端介面
-X-KDE-Library=libakregator_mk4storage_plugin
+X-TDE-Library=libakregator_mk4storage_plugin
 Comment=Plugin for Akregator
 Comment[af]=Inprop module vir Akregator
 Comment[be]=Утулка для Akregator
@@ -96,11 +96,11 @@ Comment[zh_CN]=Akregator 插件
 Comment[zh_TW]=Akregator 外掛程式
 ServiceTypes=Akregator/Plugin
 
-X-KDE-akregator-plugintype=storage
-X-KDE-akregator-name=metakit
-X-KDE-akregator-authors=Frank Osterfeld
[email protected]
-X-KDE-akregator-rank=255
-X-KDE-akregator-version=1
-X-KDE-akregator-framework-version=1
+X-TDE-akregator-plugintype=storage
+X-TDE-akregator-name=metakit
+X-TDE-akregator-authors=Frank Osterfeld
[email protected]
+X-TDE-akregator-rank=255
+X-TDE-akregator-version=1
+X-TDE-akregator-framework-version=1
 
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index d12016d45..efa034691 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -44,12 +44,12 @@ PluginManager::query( const TQString& constraint )
 {
     // Add versioning constraint
     TQString
-    str  = "[X-KDE-akregator-framework-version] == ";
+    str  = "[X-TDE-akregator-framework-version] == ";
     str += TQString::number( FrameworkVersion );
     str += " and ";
     if (!constraint.stripWhiteSpace().isEmpty())
         str += constraint + " and ";
-    str += "[X-KDE-akregator-rank] > 0";
+    str += "[X-TDE-akregator-rank] > 0";
 
     kdDebug() << "Plugin trader constraint: " << str << endl;
 
@@ -71,7 +71,7 @@ PluginManager::createFromQuery( const TQString &constraint )
     int rank = 0;
     uint current = 0;
     for ( uint i = 0; i < offers.count(); i++ ) {
-        if ( offers[i]->property( "X-KDE-akregator-rank" ).toInt() > rank )
+        if ( offers[i]->property( "X-TDE-akregator-rank" ).toInt() > rank )
             current = i;
     }
 
@@ -169,10 +169,10 @@ PluginManager::showAbout( const TQString &constraint )
 
     str += body.arg( i18n( "Name" ),                s->name() );
     str += body.arg( i18n( "Library" ),             s->library() );
-    str += body.arg( i18n( "Authors" ),             s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
-    str += body.arg( i18n( "Email" ),               s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
-    str += body.arg( i18n( "Version" ),             s->property( "X-KDE-akregator-version" ).toString() );
-    str += body.arg( i18n( "Framework Version" ),   s->property( "X-KDE-akregator-framework-version" ).toString() );
+    str += body.arg( i18n( "Authors" ),             s->property( "X-TDE-akregator-authors" ).toStringList().join( "\n" ) );
+    str += body.arg( i18n( "Email" ),               s->property( "X-TDE-akregator-email" ).toStringList().join( "\n" ) );
+    str += body.arg( i18n( "Version" ),             s->property( "X-TDE-akregator-version" ).toString() );
+    str += body.arg( i18n( "Framework Version" ),   s->property( "X-TDE-akregator-framework-version" ).toString() );
 
     str += "</table></body></html>";
 
@@ -189,12 +189,12 @@ PluginManager::dump( const KService::Ptr service )
       << "name                          : " << service->name() << endl
       << "library                       : " << service->library() << endl
       << "desktopEntryPath              : " << service->desktopEntryPath() << endl
-      << "X-KDE-akregator-plugintype       : " << service->property( "X-KDE-akregator-plugintype" ).toString() << endl
-      << "X-KDE-akregator-name             : " << service->property( "X-KDE-akregator-name" ).toString() << endl
-      << "X-KDE-akregator-authors          : " << service->property( "X-KDE-akregator-authors" ).toStringList() << endl
-      << "X-KDE-akregator-rank             : " << service->property( "X-KDE-akregator-rank" ).toString() << endl
-      << "X-KDE-akregator-version          : " << service->property( "X-KDE-akregator-version" ).toString() << endl
-      << "X-KDE-akregator-framework-version: " << service->property( "X-KDE-akregator-framework-version" ).toString()
+      << "X-TDE-akregator-plugintype       : " << service->property( "X-TDE-akregator-plugintype" ).toString() << endl
+      << "X-TDE-akregator-name             : " << service->property( "X-TDE-akregator-name" ).toString() << endl
+      << "X-TDE-akregator-authors          : " << service->property( "X-TDE-akregator-authors" ).toStringList() << endl
+      << "X-TDE-akregator-rank             : " << service->property( "X-TDE-akregator-rank" ).toString() << endl
+      << "X-TDE-akregator-version          : " << service->property( "X-TDE-akregator-version" ).toString() << endl
+      << "X-TDE-akregator-framework-version: " << service->property( "X-TDE-akregator-framework-version" ).toString()
       << endl;
 
 }
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index fa6fa6ba6..1fb2cc719 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -4,13 +4,13 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kleopatra/configuration-appearance.html
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kleopatra
-X-KDE-FactoryName=kleopatra_config_appear
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kleopatra
-X-KDE-ParentComponents=kleopatra
-X-KDE-CfgDlgHierarchy=Kleopatra
+X-TDE-ModuleType=Library
+X-TDE-Library=kleopatra
+X-TDE-FactoryName=kleopatra_config_appear
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kleopatra
+X-TDE-ParentComponents=kleopatra
+X-TDE-CfgDlgHierarchy=Kleopatra
 
 Name=Appearance
 Name[ar]=المظهر
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index 9153b003f..f645cffb5 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -4,13 +4,13 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kleopatra/configuration.html#configuration-directory-services
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kleopatra
-X-KDE-FactoryName=kleopatra_config_dirserv
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kleopatra
-X-KDE-ParentComponents=kleopatra
-X-KDE-CfgDlgHierarchy=Kleopatra
+X-TDE-ModuleType=Library
+X-TDE-Library=kleopatra
+X-TDE-FactoryName=kleopatra_config_dirserv
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kleopatra
+X-TDE-ParentComponents=kleopatra
+X-TDE-CfgDlgHierarchy=Kleopatra
 
 Name=Directory Services
 Name[ar]=خدمات الدليل
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index a14ffb3c7..beec7945d 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -4,13 +4,13 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kleopatra/configuration-dn-order.html
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kleopatra
-X-KDE-FactoryName=kleopatra_config_dnorder
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kleopatra
-X-KDE-ParentComponents=kleopatra
-X-KDE-CfgDlgHierarchy=Kleopatra
+X-TDE-ModuleType=Library
+X-TDE-Library=kleopatra
+X-TDE-FactoryName=kleopatra_config_dnorder
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kleopatra
+X-TDE-ParentComponents=kleopatra
+X-TDE-CfgDlgHierarchy=Kleopatra
 
 Name=DN-Attribute Order
 Name[bg]=Подредба
diff --git a/certmanager/kleopatra_import.desktop b/certmanager/kleopatra_import.desktop
index 382daf5ea..1c6a28794 100644
--- a/certmanager/kleopatra_import.desktop
+++ b/certmanager/kleopatra_import.desktop
@@ -10,4 +10,4 @@ Exec=kleopatra --import-certificate %u
 NoDisplay=true
 MimeType=application/pkcs7-mime;application/x-x509-ca-cert;application/x-pkcs12;
 
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook
index 8385c1bea..0d5565c92 100644
--- a/doc/kalarm/index.docbook
+++ b/doc/kalarm/index.docbook
@@ -3967,14 +3967,14 @@ Internet Calendaring and Scheduling Core Object Specification
 (iCalendar)</ulink>. This is the standard format used by all tdepim
 applications. &kalarm; uses certain non-standard properties in the
 Alarm component, in conformance with RFC2445:
-<literal>X-KDE-KALARM-NEXTRECUR</literal>,
-<literal>X-KDE-KALARM-REPEAT</literal>,
-<literal>X-KDE-KALARM-TYPE</literal>,
-<literal>X-KDE-KALARM-NEXTREPEAT</literal>,
-<literal>X-KDE-KALARM-FONTCOLOR</literal>,
-<literal>X-KDE-KALARM-VOLUME</literal>,
-<literal>X-KDE-KALARM-SPEAK</literal>,
-<literal>X-KDE-KALARM-EMAILID</literal>.</para>
+<literal>X-TDE-KALARM-NEXTRECUR</literal>,
+<literal>X-TDE-KALARM-REPEAT</literal>,
+<literal>X-TDE-KALARM-TYPE</literal>,
+<literal>X-TDE-KALARM-NEXTREPEAT</literal>,
+<literal>X-TDE-KALARM-FONTCOLOR</literal>,
+<literal>X-TDE-KALARM-VOLUME</literal>,
+<literal>X-TDE-KALARM-SPEAK</literal>,
+<literal>X-TDE-KALARM-EMAILID</literal>.</para>
 </answer>
 </qandaentry>
 
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop b/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
index 0d8eb8f93..b4694dbc6 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
@@ -6,5 +6,5 @@ Type=Application
 Comment=Tool to update the old distribution lists to the new ones.
 Terminal=false
 NoDisplay=true
-X-KDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true
+X-TDE-autostart-condition=kabcdistlistupdaterrc:Startup:EnableAutostart:true
 OnlyShowIn=TDE;
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index 7efea76f6..e0a282b74 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -76,7 +76,7 @@ void ContactEditorWidgetManager::reload()
   mFactories.clear();
   kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl;
   const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget",
-    TQString( "[X-KDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
+    TQString( "[X-TDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
 
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/dcopaddressbook.desktop b/kaddressbook/dcopaddressbook.desktop
index feea50c0e..83540e611 100644
--- a/kaddressbook/dcopaddressbook.desktop
+++ b/kaddressbook/dcopaddressbook.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=DCOP/AddressBook
+X-TDE-ServiceType=DCOP/AddressBook
 Comment=Address Book with a DCOP interface
 Comment[af]=Adres boek met 'n DCOP koppelvlak
 Comment[ar]=دفتر عناوين مع واجهة DCOP
diff --git a/kaddressbook/editors/cryptosettings.desktop b/kaddressbook/editors/cryptosettings.desktop
index 4baaa54ae..063613f83 100644
--- a/kaddressbook/editors/cryptosettings.desktop
+++ b/kaddressbook/editors/cryptosettings.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_cryptosettings
+X-TDE-Library=libkaddrbk_cryptosettings
 Name=Crypto Preferences
 Name[af]=Kripto Voorkeure
 Name[be]=Перавагі крыптаграфіі
@@ -52,4 +52,4 @@ Name[zh_CN]=加密首选项
 Name[zh_TW]=加密設定
 Type=Service
 ServiceTypes=KAddressBook/ContactEditorWidget
-X-KDE-KAddressBook-CEWPluginVersion=1
+X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/imaddresseditor.desktop b/kaddressbook/editors/imaddresseditor.desktop
index bb6b341c4..205e0f0d0 100644
--- a/kaddressbook/editors/imaddresseditor.desktop
+++ b/kaddressbook/editors/imaddresseditor.desktop
@@ -97,5 +97,5 @@ Comment[uk]=Редактор адрес миттєвого зв'язку
 Comment[zh_CN]=即时通讯地址编辑器
 Comment[zh_TW]=即時通訊位址編輯器
 ServiceTypes=KAddressBook/ContactEditorWidget
-X-KDE-Library=libkaddrbk_instantmessaging
-X-KDE-KAddressBook-CEWPluginVersion=1
+X-TDE-Library=libkaddrbk_instantmessaging
+X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index d878454ac..f8a92e1cb 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -242,7 +242,7 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
       ++addressIt;
     }
 
-    TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
+    TQString addrBookField = (*protocolIt)->property( "X-TDE-InstantMessagingKABCField" ).toString();
     if ( !lst.isEmpty() )
       addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
     else
@@ -466,7 +466,7 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c
   TQValueList<KPluginInfo *>::ConstIterator it;
   KPluginInfo * protocol = 0;
   for ( it = mProtocols.begin(); it != mProtocols.end(); ++it ) {
-    if ( (*it)->property( "X-KDE-InstantMessagingKABCField" ).toString() == fieldValue ) {
+    if ( (*it)->property( "X-TDE-InstantMessagingKABCField" ).toString() == fieldValue ) {
       protocol = *it;
       break;
     }
diff --git a/kaddressbook/editors/kaddressbookimprotocol.desktop b/kaddressbook/editors/kaddressbookimprotocol.desktop
index 26969adfa..af271abc6 100644
--- a/kaddressbook/editors/kaddressbookimprotocol.desktop
+++ b/kaddressbook/editors/kaddressbookimprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KABC/IMProtocol
-X-KDE-KAddressBook-CEWVersion=1
+X-TDE-ServiceType=KABC/IMProtocol
+X-TDE-KAddressBook-CEWVersion=1
 Name=KAddressbook Instant Messaging Protocol
 Name[af]=KAddressbook kits boodskap protokol
 Name[bg]=Протокол за мигновени съобщения за адресника
@@ -51,6 +51,6 @@ Name[tr]=KAddressbook Hızlı Mesajlaşma Protokolü
 Name[uk]=Протокол миттєвого зв'язку KAddressbook
 Name[zh_CN]=KAddressbook 即时通讯协议
 Name[zh_TW]=KAddressbook 即時通訊協定
-[PropertyDef::X-KDE-InstantMessagingKABCField]
+[PropertyDef::X-TDE-InstantMessagingKABCField]
 Type=TQString
 
diff --git a/kaddressbook/editors/protocols/aimprotocol.desktop b/kaddressbook/editors/protocols/aimprotocol.desktop
index a29098d8d..05bdad5cf 100644
--- a/kaddressbook/editors/protocols/aimprotocol.desktop
+++ b/kaddressbook/editors/protocols/aimprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=aim_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/aim
+X-TDE-InstantMessagingKABCField=messaging/aim
 Comment=AIM Protocol
 Comment[ar]=ميفاق AIM
 Comment[be]=Пратакол AIM
diff --git a/kaddressbook/editors/protocols/gaduprotocol.desktop b/kaddressbook/editors/protocols/gaduprotocol.desktop
index 9ccea3c52..4b739297c 100644
--- a/kaddressbook/editors/protocols/gaduprotocol.desktop
+++ b/kaddressbook/editors/protocols/gaduprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=gadu_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/gadu
+X-TDE-InstantMessagingKABCField=messaging/gadu
 Comment=Gadu-Gadu Protocol
 Comment[af]=Gadu-Gadu protokol
 Comment[ar]=ميفاق Gadu-Gadu
diff --git a/kaddressbook/editors/protocols/groupwiseprotocol.desktop b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
index 0fc2cce0f..d60c62898 100644
--- a/kaddressbook/editors/protocols/groupwiseprotocol.desktop
+++ b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=groupwise_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/groupwise
+X-TDE-InstantMessagingKABCField=messaging/groupwise
 Comment=Novell GroupWise Messenger
 Comment[af]=Novell GroupWise boodskappe
 Comment[bg]=Месинджър Novell GroupWise
diff --git a/kaddressbook/editors/protocols/icqprotocol.desktop b/kaddressbook/editors/protocols/icqprotocol.desktop
index be9fff528..1c578aea3 100644
--- a/kaddressbook/editors/protocols/icqprotocol.desktop
+++ b/kaddressbook/editors/protocols/icqprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=icq_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/icq
+X-TDE-InstantMessagingKABCField=messaging/icq
 Comment=ICQ Protocol
 Comment[af]=ICQ protokol
 Comment[be]=Пратакол ICQ
diff --git a/kaddressbook/editors/protocols/ircprotocol.desktop b/kaddressbook/editors/protocols/ircprotocol.desktop
index 40f73a367..a0380f2c1 100644
--- a/kaddressbook/editors/protocols/ircprotocol.desktop
+++ b/kaddressbook/editors/protocols/ircprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=irc_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/irc
+X-TDE-InstantMessagingKABCField=messaging/irc
 Comment=Internet Relay Chat
 Comment[bg]=Протокол IRC
 Comment[fa]=گپ بازپخش اینترنت
diff --git a/kaddressbook/editors/protocols/jabberprotocol.desktop b/kaddressbook/editors/protocols/jabberprotocol.desktop
index b34f88093..f70ffc51d 100644
--- a/kaddressbook/editors/protocols/jabberprotocol.desktop
+++ b/kaddressbook/editors/protocols/jabberprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=jabber_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/xmpp
+X-TDE-InstantMessagingKABCField=messaging/xmpp
 Comment=Jabber Protocol
 Comment[af]=Jabber protokol
 Comment[ar]=ميفاق Jabber
diff --git a/kaddressbook/editors/protocols/meanwhileprotocol.desktop b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
index 23e9fe3d8..e011e778b 100644
--- a/kaddressbook/editors/protocols/meanwhileprotocol.desktop
+++ b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=meanwhile_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/meanwhile
+X-TDE-InstantMessagingKABCField=messaging/meanwhile
 Comment=Meanwhile Protocol
 Comment[af]=Meanwhile protokol
 Comment[ar]=ميفاق Meanwhile
diff --git a/kaddressbook/editors/protocols/msnprotocol.desktop b/kaddressbook/editors/protocols/msnprotocol.desktop
index 1256278a5..148137159 100644
--- a/kaddressbook/editors/protocols/msnprotocol.desktop
+++ b/kaddressbook/editors/protocols/msnprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=msn_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/msn
+X-TDE-InstantMessagingKABCField=messaging/msn
 Comment=MSN Messenger
 Comment[af]=MSN boodskapper
 Comment[bg]=Протокол MSN
diff --git a/kaddressbook/editors/protocols/skypeprotocol.desktop b/kaddressbook/editors/protocols/skypeprotocol.desktop
index a5c67fc47..79ad339a8 100644
--- a/kaddressbook/editors/protocols/skypeprotocol.desktop
+++ b/kaddressbook/editors/protocols/skypeprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=skype_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/skype
+X-TDE-InstantMessagingKABCField=messaging/skype
 Comment=Skype Internet Telephony
 Comment[af]=Skype Internet Telefoon
 Comment[bg]=Интернет телефония чрез Skype
diff --git a/kaddressbook/editors/protocols/smsprotocol.desktop b/kaddressbook/editors/protocols/smsprotocol.desktop
index 38710e837..975082eac 100644
--- a/kaddressbook/editors/protocols/smsprotocol.desktop
+++ b/kaddressbook/editors/protocols/smsprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=sms_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/sms
+X-TDE-InstantMessagingKABCField=messaging/sms
 Comment=SMS Protocol
 Comment[af]=SMS protokol
 Comment[be]=Пратакол SMS
diff --git a/kaddressbook/editors/protocols/yahooprotocol.desktop b/kaddressbook/editors/protocols/yahooprotocol.desktop
index 8064f772f..9849e1461 100644
--- a/kaddressbook/editors/protocols/yahooprotocol.desktop
+++ b/kaddressbook/editors/protocols/yahooprotocol.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=yahoo_protocol
 ServiceTypes=KABC/IMProtocol,KPluginInfo
-X-KDE-InstantMessagingKABCField=messaging/yahoo
+X-TDE-InstantMessagingKABCField=messaging/yahoo
 Comment=Yahoo Protocol
 Comment[af]=Yahoo protokol
 Comment[ar]=ميفاق Yahoo
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 6f49e32e1..aa17b625b 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -217,7 +217,7 @@ void ExtensionManager::createExtensionWidgets()
 
   // load the other extensions
   const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension",
-    TQString( "[X-KDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
+    TQString( "[X-TDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
 
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
diff --git a/kaddressbook/features/distributionlist.desktop b/kaddressbook/features/distributionlist.desktop
index 844a48961..0afd5d4bf 100644
--- a/kaddressbook/features/distributionlist.desktop
+++ b/kaddressbook/features/distributionlist.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_distributionlist
+X-TDE-Library=libkaddrbk_distributionlist
 Name=KAB Distribution List Plugin
 Name[af]=KAB verspreiding lys inprop module
 Name[ar]=ملحق قائمة توزيع KAB
@@ -109,4 +109,4 @@ Comment[zh_CN]=管理分发列表的插件
 Comment[zh_TW]=管理分配清單外掛程式
 Type=Service
 ServiceTypes=KAddressBook/Extension
-X-KDE-KAddressBook-ExtensionPluginVersion=1
+X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/features/distributionlistng.desktop b/kaddressbook/features/distributionlistng.desktop
index e805a91a7..cef774280 100644
--- a/kaddressbook/features/distributionlistng.desktop
+++ b/kaddressbook/features/distributionlistng.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_distributionlistng
+X-TDE-Library=libkaddrbk_distributionlistng
 Name=KAB Distribution List Next Generation Plugin
 Name[bg]=Приставка от следващо поколение за списъка за разпращане на KAB
 Name[ca]=Endollable de la propera generació de la llista de distribució KAB
@@ -75,4 +75,4 @@ Comment[zh_CN]=管理分发列表的插件
 Comment[zh_TW]=管理分配清單外掛程式
 Type=Service
 ServiceTypes=KAddressBook/Extension
-X-KDE-KAddressBook-ExtensionPluginVersion=1
+X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/features/resourceselection.desktop b/kaddressbook/features/resourceselection.desktop
index b1f336988..4fb70bed6 100644
--- a/kaddressbook/features/resourceselection.desktop
+++ b/kaddressbook/features/resourceselection.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_resourceselection
+X-TDE-Library=libkaddrbk_resourceselection
 Name=Address Book Management Plugin
 Name[af]=Adres boek bestuur inprop module
 Name[be]=Дапаўненне "Кіраванне адраснамі кнігамі"
@@ -105,4 +105,4 @@ Comment[zh_CN]=管理地址簿的插件
 Comment[zh_TW]=管理通訊錄外掛程式
 Type=Service
 ServiceTypes=KAddressBook/Extension
-X-KDE-KAddressBook-ExtensionPluginVersion=1
+X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop b/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
index e8159d594..f628974f0 100644
--- a/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
+++ b/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KAddressBook/ContactEditorWidget
+X-TDE-ServiceType=KAddressBook/ContactEditorWidget
 Comment=KAddressBook Contact Editor Widget Plugin
 Comment[af]=KAddressBook kontak redigeerder inprop module
 Comment[bg]=Приставка за редактиране на контактите от адресника
@@ -50,5 +50,5 @@ Comment[uk]=Втулок редагування контактів адресн�
 Comment[zh_CN]=KAddressBook 联系人编辑部件插件
 Comment[zh_TW]=KAddressBook 聯絡人編輯器外掛程式
 
-[PropertyDef::X-KDE-KAddressBook-CEWPluginVersion]
+[PropertyDef::X-TDE-KAddressBook-CEWPluginVersion]
 Type=int
diff --git a/kaddressbook/interfaces/kaddressbook_extension.desktop b/kaddressbook/interfaces/kaddressbook_extension.desktop
index 0bf353967..5bd72bc36 100644
--- a/kaddressbook/interfaces/kaddressbook_extension.desktop
+++ b/kaddressbook/interfaces/kaddressbook_extension.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KAddressBook/Extension
+X-TDE-ServiceType=KAddressBook/Extension
 Comment=KAddressBook Extension Plugin
 Comment[af]=KAddressBook uitbrei inprop module
 Comment[be]=Дапаўненне K Адраснай кнігі "Пашырэнне"
@@ -54,5 +54,5 @@ Comment[uk]=Втулок розширення адресної книги KAddre
 Comment[zh_CN]=KAddressBook 扩展插件
 Comment[zh_TW]=KAddressBook 延伸外掛程式
 
-[PropertyDef::X-KDE-KAddressBook-ExtensionPluginVersion]
+[PropertyDef::X-TDE-KAddressBook-ExtensionPluginVersion]
 Type=int
diff --git a/kaddressbook/interfaces/kaddressbook_xxport.desktop b/kaddressbook/interfaces/kaddressbook_xxport.desktop
index 3d9e5503e..bdc96b1f1 100644
--- a/kaddressbook/interfaces/kaddressbook_xxport.desktop
+++ b/kaddressbook/interfaces/kaddressbook_xxport.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KAddressBook/XXPort
+X-TDE-ServiceType=KAddressBook/XXPort
 Comment=KAddressBook Import/Export Plugin
 Comment[af]=KAddressBook Invoer/Uitvoer inprop module
 Comment[be]=Дапаўненне K Адраснай кнігі "Імпарт/Экспарт"
@@ -55,6 +55,6 @@ Comment[uz]=Манзиллар дафтари учун импорт/экспор
 Comment[zh_CN]=KAddressBook 导入/导出插件
 Comment[zh_TW]=KAddressBook 匯入/匯出外掛程式
 
-[PropertyDef::X-KDE-KAddressBook-XXPortPluginVersion]
+[PropertyDef::X-TDE-KAddressBook-XXPortPluginVersion]
 Type=int
 
diff --git a/kaddressbook/kaddressbook.desktop b/kaddressbook/kaddressbook.desktop
index a636c7760..1d9633fca 100644
--- a/kaddressbook/kaddressbook.desktop
+++ b/kaddressbook/kaddressbook.desktop
@@ -72,10 +72,10 @@ Icon=kaddressbook
 Type=Application
 DocPath=kaddressbook/index.html
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kaddressbook
 MimeType=text/x-vcard;text/x-ldif;
 ServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook
-X-KDE-Library=libkaddressbookpart
-Categories=Qt;KDE;Office;ContactManagement;
+X-TDE-Library=libkaddressbookpart
+Categories=Qt;TDE;Office;ContactManagement;
diff --git a/kaddressbook/kaddressbook_view.desktop b/kaddressbook/kaddressbook_view.desktop
index ffd4e8d5c..ca478f905 100644
--- a/kaddressbook/kaddressbook_view.desktop
+++ b/kaddressbook/kaddressbook_view.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KAddressBook/View
+X-TDE-ServiceType=KAddressBook/View
 Comment=KAddressBook View Plugin
 Comment[af]=KAddressBook besigtig inprop module
 Comment[be]=Дапаўненне K Адраснай кнігі "Выгляд"
@@ -55,5 +55,5 @@ Comment[uk]=Втулок перегляду адресної книги KAddress
 Comment[zh_CN]=KAddressBook 查看插件
 Comment[zh_TW]=KAddressBook 檢視外掛程式
 
-[PropertyDef::X-KDE-KAddressBook-ViewPluginVersion]
+[PropertyDef::X-TDE-KAddressBook-ViewPluginVersion]
 Type=int
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index f5e5d450d..fdf752b07 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -4,13 +4,13 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kabconfig
-X-KDE-FactoryName=kabconfig
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kaddressbook
-X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
-X-KDE-CfgDlgHierarchy=KAB
+X-TDE-ModuleType=Library
+X-TDE-Library=kabconfig
+X-TDE-FactoryName=kabconfig
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kaddressbook
+X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
+X-TDE-CfgDlgHierarchy=KAB
 
 Name=General
 Name[af]=Algemeen
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index c2d97c0f8..2806171c9 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -4,12 +4,12 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kabcustomfields
-X-KDE-FactoryName=kabcustomfields
-X-KDE-ParentApp=kaddressbook
-X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
-X-KDE-CfgDlgHierarchy=KAB
+X-TDE-ModuleType=Library
+X-TDE-Library=kabcustomfields
+X-TDE-FactoryName=kabcustomfields
+X-TDE-ParentApp=kaddressbook
+X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
+X-TDE-CfgDlgHierarchy=KAB
 
 Name=Custom Pages
 Name[af]=Pasmaak Blaaie
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 2d29acdf0..321f9c81d 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -4,12 +4,12 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kabldapconfig
-X-KDE-FactoryName=kabldapconfig
-X-KDE-ParentApp=kaddressbook
-X-KDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
-X-KDE-CfgDlgHierarchy=KAB
+X-TDE-ModuleType=Library
+X-TDE-Library=kabldapconfig
+X-TDE-FactoryName=kabldapconfig
+X-TDE-ParentApp=kaddressbook
+X-TDE-ParentComponents=kaddressbook,kontact_kaddressbookplugin
+X-TDE-CfgDlgHierarchy=KAB
 
 Name=LDAP Lookup
 Name[af]=LDAP Opkyk
diff --git a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
index 90d73eac3..1c10ab8b4 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
+++ b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
@@ -52,5 +52,5 @@ Name[zh_CN]=电子名片文件
 Name[zh_TW]=電子名片檔
 ServiceTypes=ThumbCreator
 MimeTypes=text/x-vcard,text/x-ldif
-X-KDE-Library=ldifvcardthumbnail
+X-TDE-Library=ldifvcardthumbnail
 CacheThumbnail=false
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 073898dfe..aca8113fc 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -387,7 +387,7 @@ void ViewManager::scrollDown()
 void ViewManager::createViewFactories()
 {
   const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View",
-    TQString( "[X-KDE-KAddressBook-ViewPluginVersion] == %1" ).arg(  KAB_VIEW_PLUGIN_VERSION ) );
+    TQString( "[X-TDE-KAddressBook-ViewPluginVersion] == %1" ).arg(  KAB_VIEW_PLUGIN_VERSION ) );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
diff --git a/kaddressbook/views/cardview.desktop b/kaddressbook/views/cardview.desktop
index 7dfe4152d..30d81b86e 100644
--- a/kaddressbook/views/cardview.desktop
+++ b/kaddressbook/views/cardview.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_cardview
+X-TDE-Library=libkaddrbk_cardview
 Name=Card View
 Name[af]=Kaard Aansig
 Name[ar]=عرض البظاقة
@@ -58,4 +58,4 @@ Name[zh_CN]=卡片视图
 Name[zh_TW]=卡片檢視
 Type=Service
 ServiceTypes=KAddressBook/View
-X-KDE-KAddressBook-ViewPluginVersion=1
+X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/views/iconview.desktop b/kaddressbook/views/iconview.desktop
index 4e99a5c5b..17a7b1be7 100644
--- a/kaddressbook/views/iconview.desktop
+++ b/kaddressbook/views/iconview.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_iconview
+X-TDE-Library=libkaddrbk_iconview
 Name=Icon View
 Name[af]=Ikoon Aansig
 Name[ar]=عرض الأيقونات
@@ -71,4 +71,4 @@ Name[zh_TW]=圖示檢視
 Name[zu]=Umboniso we Icon
 Type=Service
 ServiceTypes=KAddressBook/View
-X-KDE-KAddressBook-ViewPluginVersion=1
+X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/views/tableview.desktop b/kaddressbook/views/tableview.desktop
index 71856c965..501a9f890 100644
--- a/kaddressbook/views/tableview.desktop
+++ b/kaddressbook/views/tableview.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_tableview
+X-TDE-Library=libkaddrbk_tableview
 Name=Table View
 Name[af]=Tabel Aansig
 Name[ar]=عرض الجدول
@@ -59,4 +59,4 @@ Name[zh_CN]=表格视图
 Name[zh_TW]=表格檢視
 Type=Service
 ServiceTypes=KAddressBook/View
-X-KDE-KAddressBook-ViewPluginVersion=1
+X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/xxport/bookmark_xxport.desktop b/kaddressbook/xxport/bookmark_xxport.desktop
index 186d1378e..47c9e4552 100644
--- a/kaddressbook/xxport/bookmark_xxport.desktop
+++ b/kaddressbook/xxport/bookmark_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_bookmark_xxport
+X-TDE-Library=libkaddrbk_bookmark_xxport
 Name=KAB Bookmark XXPort Plugin
 Name[af]=KAB boekmerk XXPort inprop module
 Name[be]=Дапаўненне KAB "Экспарт у закладкі"
@@ -98,4 +98,4 @@ Comment[zh_CN]=将联系人的网址导出为书签的插件
 Comment[zh_TW]=匯出聯絡人的網頁成書籤的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/csv_xxport.desktop b/kaddressbook/xxport/csv_xxport.desktop
index 9031c2226..15a9383bd 100644
--- a/kaddressbook/xxport/csv_xxport.desktop
+++ b/kaddressbook/xxport/csv_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_csv_xxport
+X-TDE-Library=libkaddrbk_csv_xxport
 Name=KAB CSV XXPort Plugin
 Name[af]=KAB CSV XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт/Экспарт CSV"
@@ -97,4 +97,4 @@ Comment[zh_CN]=导入和导出 CSV 格式联系人的插件
 Comment[zh_TW]=以 CSV 格式匯入與匯出聯絡人外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/eudora_xxport.desktop b/kaddressbook/xxport/eudora_xxport.desktop
index 10adbfa7e..a34cab7e9 100644
--- a/kaddressbook/xxport/eudora_xxport.desktop
+++ b/kaddressbook/xxport/eudora_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_eudora_xxport
+X-TDE-Library=libkaddrbk_eudora_xxport
 Name=KAB Eudora XXPort Plugin
 Name[af]=KAB Eudora XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт/Экспарт Eudora"
@@ -99,4 +99,4 @@ Comment[zh_CN]=导入和导出 Eudora 联系人的插件
 Comment[zh_TW]=匯入與匯出 Eudora 聯絡人的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/gnokii_xxport.desktop b/kaddressbook/xxport/gnokii_xxport.desktop
index e6152fd73..4e6525728 100644
--- a/kaddressbook/xxport/gnokii_xxport.desktop
+++ b/kaddressbook/xxport/gnokii_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_gnokii_xxport
+X-TDE-Library=libkaddrbk_gnokii_xxport
 Name=KAB Mobile Phone XXPort Plugin
 Name[af]=KAB selfoon XXPort inprop module
 Name[bg]=Приставка за XXPort на мобилен телефон на KAB
@@ -98,4 +98,4 @@ Comment[zh_CN]=导入和导出地址簿项的移动电话插件
 Comment[zh_TW]=匯入與匯出通訊錄的手機外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/kde2_xxport.desktop b/kaddressbook/xxport/kde2_xxport.desktop
index d47d108f5..43fad3152 100644
--- a/kaddressbook/xxport/kde2_xxport.desktop
+++ b/kaddressbook/xxport/kde2_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_kde2_xxport
+X-TDE-Library=libkaddrbk_kde2_xxport
 Name=KAB KDE2 XXPort Plugin
 Name[af]=KAB KDE2 XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт/Экспарт KDE2"
@@ -100,4 +100,4 @@ Comment[zh_CN]=导入旧的 KDE 2 地址簿的插件
 Comment[zh_TW]=匯入舊的 KDE2 通訊錄的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/ldif_xxport.desktop b/kaddressbook/xxport/ldif_xxport.desktop
index 1274b4d86..2409974a7 100644
--- a/kaddressbook/xxport/ldif_xxport.desktop
+++ b/kaddressbook/xxport/ldif_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_ldif_xxport
+X-TDE-Library=libkaddrbk_ldif_xxport
 Name=KAB LDIF XXPort Plugin
 Name[af]=KAB LDIF XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт LDIF"
@@ -100,4 +100,4 @@ Comment[zh_CN]=导入和导出 Netscape 和 Mozilla LDIF 格式联系人的插�
 Comment[zh_TW]=匯入與匯出 Netscape 與 Mozilla LDIF 格式聯絡人的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/opera_xxport.desktop b/kaddressbook/xxport/opera_xxport.desktop
index c1d3c2002..7a2833b62 100644
--- a/kaddressbook/xxport/opera_xxport.desktop
+++ b/kaddressbook/xxport/opera_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_opera_xxport
+X-TDE-Library=libkaddrbk_opera_xxport
 Name=KAB Opera XXPort Plugin
 Name[af]=KAB Opera XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт Opera"
@@ -98,4 +98,4 @@ Comment[zh_CN]=导入 Opera 联系人的插件
 Comment[zh_TW]=匯入 Opera 聯絡人的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/pab_xxport.desktop b/kaddressbook/xxport/pab_xxport.desktop
index c0af8e3d6..84a144b55 100644
--- a/kaddressbook/xxport/pab_xxport.desktop
+++ b/kaddressbook/xxport/pab_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_pab_xxport
+X-TDE-Library=libkaddrbk_pab_xxport
 Name=KAB MS Exchange Personal Addressbook XXPort Plugin
 Name[af]=KAB MS Exchange adresboek XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт пэрсанальнай адраснай кнігі MS Exchange"
@@ -98,4 +98,4 @@ Comment[zh_CN]=导入 MS Exchange 个人地址簿的插件
 Comment[zh_TW]=匯入 MS Exchange Personal 通訊錄的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/vcard_xxport.desktop b/kaddressbook/xxport/vcard_xxport.desktop
index 0745d5a52..63e75796d 100644
--- a/kaddressbook/xxport/vcard_xxport.desktop
+++ b/kaddressbook/xxport/vcard_xxport.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkaddrbk_vcard_xxport
+X-TDE-Library=libkaddrbk_vcard_xxport
 Name=KAB vCard XXPort Plugin
 Name[af]=KAB vCard XXPort inprop module
 Name[be]=Дапаўненне KAB "Імпарт/Экспарт vCard"
@@ -100,4 +100,4 @@ Comment[zh_CN]=导入和导出 vCard 格式联系人的插件
 Comment[zh_TW]=匯入與匯出 vCard 格式聯絡人的外掛程式
 Type=Service
 ServiceTypes=KAddressBook/XXPort
-X-KDE-KAddressBook-XXPortPluginVersion=1
+X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 38a9a89a1..3c10fc967 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -121,7 +121,7 @@ void XXPortManager::loadPlugins()
   mXXPortObjects.clear();
 
   const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort",
-    TQString( "[X-KDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
+    TQString( "[X-TDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index d39567938..78e57ad1e 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -48,12 +48,12 @@ TQString KAEvent::calVersionString()  { return TQString::fromLatin1("1.5.0"); }
 int     KAEvent::calVersion()        { return KAlarm::Version(1,5,0); }
 
 // Custom calendar properties.
-// Note that all custom property names are prefixed with X-KDE-KALARM- in the calendar file.
+// Note that all custom property names are prefixed with X-TDE-KALARM- in the calendar file.
 // - Event properties
-static const TQCString NEXT_RECUR_PROPERTY("NEXTRECUR");     // X-KDE-KALARM-NEXTRECUR property
-static const TQCString REPEAT_PROPERTY("REPEAT");            // X-KDE-KALARM-REPEAT property
+static const TQCString NEXT_RECUR_PROPERTY("NEXTRECUR");     // X-TDE-KALARM-NEXTRECUR property
+static const TQCString REPEAT_PROPERTY("REPEAT");            // X-TDE-KALARM-REPEAT property
 // - General alarm properties
-static const TQCString TYPE_PROPERTY("TYPE");    // X-KDE-KALARM-TYPE property
+static const TQCString TYPE_PROPERTY("TYPE");    // X-TDE-KALARM-TYPE property
 static const TQString FILE_TYPE                  = TQString::fromLatin1("FILE");
 static const TQString AT_LOGIN_TYPE              = TQString::fromLatin1("LOGIN");
 static const TQString REMINDER_TYPE              = TQString::fromLatin1("REMINDER");
@@ -64,14 +64,14 @@ static const TQString DATE_DEFERRAL_TYPE         = TQString::fromLatin1("DATE_DE
 static const TQString DISPLAYING_TYPE            = TQString::fromLatin1("DISPLAYING");   // used only in displaying calendar
 static const TQString PRE_ACTION_TYPE            = TQString::fromLatin1("PRE");
 static const TQString POST_ACTION_TYPE           = TQString::fromLatin1("POST");
-static const TQCString NEXT_REPEAT_PROPERTY("NEXTREPEAT");   // X-KDE-KALARM-NEXTREPEAT property
+static const TQCString NEXT_REPEAT_PROPERTY("NEXTREPEAT");   // X-TDE-KALARM-NEXTREPEAT property
 // - Display alarm properties
-static const TQCString FONT_COLOUR_PROPERTY("FONTCOLOR");    // X-KDE-KALARM-FONTCOLOR property
+static const TQCString FONT_COLOUR_PROPERTY("FONTCOLOR");    // X-TDE-KALARM-FONTCOLOR property
 // - Email alarm properties
-static const TQCString EMAIL_ID_PROPERTY("EMAILID");         // X-KDE-KALARM-EMAILID property
+static const TQCString EMAIL_ID_PROPERTY("EMAILID");         // X-TDE-KALARM-EMAILID property
 // - Audio alarm properties
-static const TQCString VOLUME_PROPERTY("VOLUME");            // X-KDE-KALARM-VOLUME property
-static const TQCString SPEAK_PROPERTY("SPEAK");              // X-KDE-KALARM-SPEAK property
+static const TQCString VOLUME_PROPERTY("VOLUME");            // X-TDE-KALARM-VOLUME property
+static const TQCString SPEAK_PROPERTY("SPEAK");              // X-TDE-KALARM-SPEAK property
 
 // Event categories
 static const TQString DATE_ONLY_CATEGORY        = TQString::fromLatin1("DATE");
@@ -1065,7 +1065,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 	if (!mMainExpired  ||  original)
 	{
 		/* The alarm offset must always be zero for the main alarm. To determine
-		 * which recurrence is due, the property X-KDE-KALARM_NEXTRECUR is used.
+		 * which recurrence is due, the property X-TDE-KALARM_NEXTRECUR is used.
 		 * If the alarm offset was non-zero, exception dates and rules would not
 		 * work since they apply to the event time, not the alarm time.
 		 */
@@ -1216,7 +1216,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 
 /******************************************************************************
  * Create a new alarm for a libkcal event, and initialise it according to the
- * alarm action. If 'types' is non-null, it is appended to the X-KDE-KALARM-TYPE
+ * alarm action. If 'types' is non-null, it is appended to the X-TDE-KALARM-TYPE
  * property value list.
  */
 Alarm* KAEvent::initKCalAlarm(Event& event, const DateTime& dt, const TQStringList& types, KAAlarm::Type type) const
@@ -2650,7 +2650,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 	static const TQString EXEC_IN_XTERM_CAT  = TQString::fromLatin1("XTERM");
 
 	// KAlarm pre-1.4.22 properties
-	static const TQCString KMAIL_ID_PROPERTY("KMAILID");    // X-KDE-KALARM-KMAILID property
+	static const TQCString KMAIL_ID_PROPERTY("KMAILID");    // X-TDE-KALARM-KMAILID property
 
 	if (version >= calVersion())
 		return;
@@ -2691,7 +2691,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 		{
 			/*
 			 * It's a KAlarm pre-0.9 calendar file.
-			 * All alarms were of type DISPLAY. Instead of the X-KDE-KALARM-TYPE
+			 * All alarms were of type DISPLAY. Instead of the X-TDE-KALARM-TYPE
 			 * alarm property, characteristics were stored as a prefix to the
 			 * alarm DESCRIPTION property, as follows:
 			 *   SETQNO;[FLAGS];TYPE:TEXT
@@ -2815,7 +2815,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Set the DTEND time to the DTSTART time.
 			 * Convert all alarm times to DTSTART offsets.
 			 * For display alarms, convert the first unlabelled category to an
-			 * X-KDE-KALARM-FONTCOLOUR property.
+			 * X-TDE-KALARM-FONTCOLOUR property.
 			 * Convert BEEP category into an audio alarm with no audio file.
 			 */
 			if (uidStatus(event->uid()) == EXPIRED)
@@ -2948,7 +2948,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			/*
 			 * It's a KAlarm pre-1.4.14 calendar file.
 			 * For recurring events, convert the main alarm offset to an absolute
-			 * time in the X-KDE-KALARM-NEXTRECUR property, and convert main
+			 * time in the X-TDE-KALARM-NEXTRECUR property, and convert main
 			 * alarm offsets to zero and deferral alarm offsets to be relative to
 			 * the next recurrence.
 			 */
diff --git a/kalarm/kalarm.desktop b/kalarm/kalarm.desktop
index 903432206..9749750e3 100644
--- a/kalarm/kalarm.desktop
+++ b/kalarm/kalarm.desktop
@@ -69,6 +69,6 @@ GenericName[zh_CN]=个人日程提醒
 GenericName[zh_TW]=個人鬧鐘排程程式
 Terminal=false
 X-DCOP-ServiceType=Unique
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;Office;Calendar;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Utility;X-TDE-Utilities-PIM;Office;Calendar;
 OnlyShowIn=TDE;
diff --git a/kalarm/kalarm.tray.desktop b/kalarm/kalarm.tray.desktop
index f147a8eb0..f54f87547 100644
--- a/kalarm/kalarm.tray.desktop
+++ b/kalarm/kalarm.tray.desktop
@@ -68,5 +68,5 @@ Comment[uk]=Персональний планувальник нагадуван
 Comment[zh_CN]=个人日程提醒程序：以系统托盘图标启动
 Comment[zh_TW]=警示/提醒訊息排程器：以系統列圖示的方式啟動
 Terminal=false
-X-KDE-autostart-phase=2
-X-KDE-autostart-condition=kalarmrc:General:AutostartTrayDummy:false
+X-TDE-autostart-phase=2
+X-TDE-autostart-condition=kalarmrc:General:AutostartTrayDummy:false
diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop
index a707b5cc3..7342be1bc 100644
--- a/kalarm/kalarmd/kalarmd.autostart.desktop
+++ b/kalarm/kalarmd/kalarmd.autostart.desktop
@@ -95,6 +95,6 @@ Comment[zh_CN]=登录时自动启动 KAlarm 定时守护进程
 Comment[zh_TW]=登入時自動啟動 KAlarm 鬧鐘守護程式
 Terminal=false
 NoDisplay=true
-X-KDE-autostart-phase=2
-X-KDE-autostart-condition=kalarmdrc:General:Autostart:false
-X-KDE-StartupNotify=true
+X-TDE-autostart-phase=2
+X-TDE-autostart-condition=kalarmdrc:General:Autostart:false
+X-TDE-StartupNotify=true
diff --git a/kandy/src/kandy.desktop b/kandy/src/kandy.desktop
index c1967d801..ee08bcf5f 100644
--- a/kandy/src/kandy.desktop
+++ b/kandy/src/kandy.desktop
@@ -115,4 +115,4 @@ GenericName[zh_TW]=行動電話工具
 GenericName[zu]=Ithuluzi Lamakhala ekhukhwini
 Terminal=false
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;Telephony;
+Categories=Qt;TDE;Utility;Telephony;
diff --git a/karm/karm_part.desktop b/karm/karm_part.desktop
index 652d705d8..6dd02c162 100644
--- a/karm/karm_part.desktop
+++ b/karm/karm_part.desktop
@@ -12,5 +12,5 @@ Name[sv]=Karm-delprogram
 Name[tr]=karmpart
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-Library=libkarmpart
+X-TDE-Library=libkarmpart
 Type=Service
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index e895d2639..153a8f33a 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -1165,7 +1165,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from,
     for (event = events.begin(); event != events.end(); ++event)
     {
 
-      // KArm events have the custom property X-KDE-Karm-duration
+      // KArm events have the custom property X-TDE-Karm-duration
       if (! processed.contains( (*event)->uid()))
       {
         // If an event spans multiple days, CalendarLocal::rawEventsForDate
diff --git a/karm/karmstorage.h b/karm/karmstorage.h
index 7e8b04b1a..796c42dbe 100644
--- a/karm/karmstorage.h
+++ b/karm/karmstorage.h
@@ -169,7 +169,7 @@ class KarmStorage
      *
      * In both cases (postive or negative delta), we create a custom iCalendar
      * property that stores the delta (in seconds).  This property is called
-     * X-KDE-karm-duration.
+     * X-TDE-karm-duration.
      *
      * Note that the KArm UI allows the user to change both the session and
      * the total task time, and this routine does not account for all posibile
diff --git a/karm/support/karm.desktop b/karm/support/karm.desktop
index 736f497ce..63aae1e82 100644
--- a/karm/support/karm.desktop
+++ b/karm/support/karm.desktop
@@ -73,6 +73,6 @@ Path=
 DocPath=karm/index.html
 Type=Application
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;X-KDE-Utilities-PIM;Office;Calendar;
+Categories=Qt;TDE;X-TDE-Utilities-PIM;Office;Calendar;
diff --git a/karm/taskview.h b/karm/taskview.h
index a6444c386..64b4d3de2 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -159,7 +159,7 @@ class TaskView : public KListView
     void markTaskAsIncomplete();
 
     /** Subtracts time from all active tasks, and does not log event. 
-     * The time is stored in memory and in X-KDE-karm-duration. It is
+     * The time is stored in memory and in X-TDE-karm-duration. It is
      * increased automatically every minute to display the right duration.
      */
     void extractTime( int minutes );
diff --git a/karm/test/example.ics b/karm/test/example.ics
index 8cfe93525..443b23a66 100644
--- a/karm/test/example.ics
+++ b/karm/test/example.ics
@@ -4,8 +4,8 @@ VERSION:2.0
 BEGIN:VTODO
 DTSTAMP:20061125T204432Z
 ORGANIZER;CN=root:MAILTO:
-X-KDE-karm-totalSessionTime:0
-X-KDE-karm-totalTaskTime:0
+X-TDE-karm-totalSessionTime:0
+X-TDE-karm-totalTaskTime:0
 CREATED:20061118T183926Z
 UID:libkcal-1156600660.458
 SEQUENCE:0
@@ -19,8 +19,8 @@ END:VTODO
 BEGIN:VTODO
 DTSTAMP:20061125T204432Z
 ORGANIZER;CN=root:MAILTO:
-X-KDE-karm-totalSessionTime:0
-X-KDE-karm-totalTaskTime:0
+X-TDE-karm-totalSessionTime:0
+X-TDE-karm-totalTaskTime:0
 CREATED:20061118T183934Z
 UID:libkcal-1923273586.967
 SEQUENCE:0
@@ -35,8 +35,8 @@ END:VTODO
 BEGIN:VTODO
 DTSTAMP:20061125T204432Z
 ORGANIZER;CN=root:MAILTO:
-X-KDE-karm-totalSessionTime:90
-X-KDE-karm-totalTaskTime:90
+X-TDE-karm-totalSessionTime:90
+X-TDE-karm-totalTaskTime:90
 CREATED:20061118T184032Z
 UID:libkcal-61950406.193
 SEQUENCE:0
@@ -51,8 +51,8 @@ END:VTODO
 BEGIN:VTODO
 DTSTAMP:20061125T204432Z
 ORGANIZER;CN=root:MAILTO:
-X-KDE-karm-totalSessionTime:184
-X-KDE-karm-totalTaskTime:184
+X-TDE-karm-totalSessionTime:184
+X-TDE-karm-totalTaskTime:184
 CREATED:20061118T184044Z
 UID:libkcal-1755408865.833
 SEQUENCE:0
@@ -67,8 +67,8 @@ END:VTODO
 BEGIN:VTODO
 DTSTAMP:20061125T204432Z
 ORGANIZER;CN=root:MAILTO:
-X-KDE-karm-totalSessionTime:156
-X-KDE-karm-totalTaskTime:156
+X-TDE-karm-totalSessionTime:156
+X-TDE-karm-totalTaskTime:156
 CREATED:20061118T184054Z
 UID:libkcal-1177224330.526
 SEQUENCE:0
@@ -82,7 +82,7 @@ END:VTODO
 BEGIN:VEVENT
 DTSTAMP:20061125T204432Z
 ORGANIZER:MAILTO:
-X-KDE-karm-duration:9360
+X-TDE-karm-duration:9360
 CREATED:20061118T184102Z
 UID:libkcal-733807033.405
 SEQUENCE:0
@@ -100,7 +100,7 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20061125T204432Z
 ORGANIZER:MAILTO:
-X-KDE-karm-duration:5400
+X-TDE-karm-duration:5400
 CREATED:20061118T184114Z
 UID:libkcal-552065854.752
 SEQUENCE:0
@@ -118,7 +118,7 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20061125T204432Z
 ORGANIZER:MAILTO:
-X-KDE-karm-duration:10920
+X-TDE-karm-duration:10920
 CREATED:20061118T184125Z
 UID:libkcal-691043213.294
 SEQUENCE:0
@@ -136,7 +136,7 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20061125T204432Z
 ORGANIZER:MAILTO:
-X-KDE-karm-duration:2
+X-TDE-karm-duration:2
 CREATED:20061118T183930Z
 UID:libkcal-251324967.864
 SEQUENCE:0
@@ -154,7 +154,7 @@ END:VEVENT
 BEGIN:VEVENT
 DTSTAMP:20061125T204432Z
 ORGANIZER:MAILTO:
-X-KDE-karm-duration:95
+X-TDE-karm-duration:95
 CREATED:20061118T184306Z
 UID:libkcal-729762004.89
 SEQUENCE:0
diff --git a/kfile-plugins/ics/kfile_ics.desktop b/kfile-plugins/ics/kfile_ics.desktop
index ce3f2188a..a085d707f 100644
--- a/kfile-plugins/ics/kfile_ics.desktop
+++ b/kfile-plugins/ics/kfile_ics.desktop
@@ -50,7 +50,7 @@ Name[uk]=Інформація про ICS
 Name[zh_CN]=ICS 信息
 Name[zh_TW]=ICS 資訊
 ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_ics
+X-TDE-Library=kfile_ics
 MimeType=text/calendar
 PreferredGroups=ICSInfo
 PreferredItems=Events,Todos,Journals
diff --git a/kfile-plugins/palm-databases/kfile_palm.desktop b/kfile-plugins/palm-databases/kfile_palm.desktop
index 66ccbfe90..5669357d5 100644
--- a/kfile-plugins/palm-databases/kfile_palm.desktop
+++ b/kfile-plugins/palm-databases/kfile_palm.desktop
@@ -53,7 +53,7 @@ Name[uk]=Інформація про базу даних PalmOS
 Name[zh_CN]=PalmOS 数据库信息
 Name[zh_TW]=PalmOS 資料庫資訊
 ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_palm
+X-TDE-Library=kfile_palm
 MimeType=application/vnd.palm
 PreferredGroups=General
 PreferredItems=Name,DBType,TypeID,CreatorID,NrRecords,Size
diff --git a/kfile-plugins/rfc822/kfile_rfc822.desktop b/kfile-plugins/rfc822/kfile_rfc822.desktop
index b6928cfdb..7717f3482 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.desktop
+++ b/kfile-plugins/rfc822/kfile_rfc822.desktop
@@ -56,7 +56,7 @@ Name[uk]=Інформація про повідомлення ел. пошти
 Name[zh_CN]=电子邮件信息
 Name[zh_TW]=電子郵件資訊
 ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_rfc822
+X-TDE-Library=kfile_rfc822
 MimeType=message/rfc822
 PreferredGroups=Technical
 PreferredItems=From,To,Subject,Date,Content-Type
diff --git a/kfile-plugins/vcf/kfile_vcf.desktop b/kfile-plugins/vcf/kfile_vcf.desktop
index 4d1c5b4b3..88ba00d15 100644
--- a/kfile-plugins/vcf/kfile_vcf.desktop
+++ b/kfile-plugins/vcf/kfile_vcf.desktop
@@ -59,7 +59,7 @@ Name[zh_CN]=vCard 信息
 Name[zh_TW]=vCard 資訊
 Name[zu]=Ulwazi lwe-vCard
 ServiceTypes=KFilePlugin
-X-KDE-Library=kfile_vcf
+X-TDE-Library=kfile_vcf
 MimeType=text/x-vcard
 PreferredGroups=Technical
 PreferredItems=Name,Email,Telephone
diff --git a/kitchensync/src/kitchensync.desktop b/kitchensync/src/kitchensync.desktop
index e9f5ae60c..15206b83d 100644
--- a/kitchensync/src/kitchensync.desktop
+++ b/kitchensync/src/kitchensync.desktop
@@ -52,9 +52,9 @@ Icon=kitchensync
 Type=Application
 DocPath=kitchensync/index.html
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kitchensync
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libkitchensyncpart
-Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
+X-TDE-Library=libkitchensyncpart
+Categories=Qt;TDE;Utility;X-TDE-Utilities-PIM;
diff --git a/kmail/KMail.desktop b/kmail/KMail.desktop
index 556c94098..360e1ff0f 100644
--- a/kmail/KMail.desktop
+++ b/kmail/KMail.desktop
@@ -84,8 +84,8 @@ GenericName[zh_TW]=收發信軟體
 GenericName[zu]=Imeyili Yomthengi
 Terminal=false
 
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kmail
 ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
-Categories=Qt;KDE;Network;Office;Email;
+Categories=Qt;TDE;Network;Office;Email;
diff --git a/kmail/application_octetstream.desktop b/kmail/application_octetstream.desktop
index ec2bbf1ec..409b1112c 100644
--- a/kmail/application_octetstream.desktop
+++ b/kmail/application_octetstream.desktop
@@ -80,4 +80,4 @@ Comment[zh_CN]=application/octet-stream 的格式化插件
 
 [Plugin]
 Type=application/octet-stream
-X-KDE-Library=libkmail_bodypartformatter_application_octetstream
+X-TDE-Library=libkmail_bodypartformatter_application_octetstream
diff --git a/kmail/dcopimap.desktop b/kmail/dcopimap.desktop
index 0e6afdeba..196acbd56 100644
--- a/kmail/dcopimap.desktop
+++ b/kmail/dcopimap.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=DCOP/ResourceBackend/IMAP
+X-TDE-ServiceType=DCOP/ResourceBackend/IMAP
 Comment=Mail program with a DCOP interface
 Comment[af]=E-pos program met 'n DCOP koppelvlak
 Comment[be]=Паштовая праграма з DCOP інтэрфэйсам
diff --git a/kmail/dcopmail.desktop b/kmail/dcopmail.desktop
index 26aaaa569..b971405b9 100644
--- a/kmail/dcopmail.desktop
+++ b/kmail/dcopmail.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=DCOP/Mailer
+X-TDE-ServiceType=DCOP/Mailer
 Comment=Mail program with a DCOP interface
 Comment[af]=E-pos program met 'n DCOP koppelvlak
 Comment[be]=Паштовая праграма з DCOP інтэрфэйсам
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index c2e58a03e..e510c7d4c 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -3,13 +3,13 @@ Icon=network
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_accounts
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_accounts
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Accounts
 Name[af]=Rekeninge
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 3008ea543..753a66bb9 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -3,13 +3,13 @@ Icon=looknfeel
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_appearance
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_appearance
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Appearance
 Name[ar]=المظهر
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index 4cc868bbc..bdb44e282 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -3,13 +3,13 @@ Icon=edit
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_composer
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_composer
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Composer
 Name[ar]=المحرر
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index fe985db67..cba142ff3 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -3,13 +3,13 @@ Icon=identity
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_identity
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_identity
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Identities
 Name[ar]=الهويات
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index 7c1d946fd..3cc3e3201 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -3,13 +3,13 @@ Icon=misc
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_misc
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_misc
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Misc
 Name[af]=Allerlei
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index 4d1a2a402..a99d19536 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -3,13 +3,13 @@ Icon=encrypted
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmail
-X-KDE-FactoryName=kmail_config_security
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kmail
-X-KDE-ParentComponents=kmail,kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KMail
+X-TDE-ModuleType=Library
+X-TDE-Library=kmail
+X-TDE-FactoryName=kmail_config_security
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kmail
+X-TDE-ParentComponents=kmail,kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KMail
 
 Name=Security
 Name[af]=Sekuriteit
diff --git a/kmail/kmail_view.desktop b/kmail/kmail_view.desktop
index 8110b86ea..1cf8225c7 100644
--- a/kmail/kmail_view.desktop
+++ b/kmail/kmail_view.desktop
@@ -17,6 +17,6 @@ DocPath=kmail/index.html
 NoDisplay=true
 MimeType=message/rfc822;application/mbox;application/x-mimearchive;
 
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kmail
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 6ea0dd9f6..037fbb0dd 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -968,9 +968,9 @@ KMFilterActionRemoveHeader::KMFilterActionRemoveHeader()
   mParameterList << ""
                  << "Reply-To"
                  << "Delivered-To"
-                 << "X-KDE-PR-Message"
-                 << "X-KDE-PR-Package"
-                 << "X-KDE-PR-Keywords";
+                 << "X-TDE-PR-Message"
+                 << "X-TDE-PR-Package"
+                 << "X-TDE-PR-Keywords";
   mParameter = *mParameterList.at(0);
 }
 
@@ -1041,9 +1041,9 @@ KMFilterActionAddHeader::KMFilterActionAddHeader()
   mParameterList << ""
                  << "Reply-To"
                  << "Delivered-To"
-                 << "X-KDE-PR-Message"
-                 << "X-KDE-PR-Package"
-                 << "X-KDE-PR-Keywords";
+                 << "X-TDE-PR-Message"
+                 << "X-TDE-PR-Package"
+                 << "X-TDE-PR-Keywords";
   mParameter = *mParameterList.at(0);
 }
 
@@ -1183,9 +1183,9 @@ KMFilterActionRewriteHeader::KMFilterActionRewriteHeader()
                  << "Subject"
                  << "Reply-To"
                  << "Delivered-To"
-                 << "X-KDE-PR-Message"
-                 << "X-KDE-PR-Package"
-                 << "X-KDE-PR-Keywords";
+                 << "X-TDE-PR-Message"
+                 << "X-TDE-PR-Package"
+                 << "X-TDE-PR-Keywords";
   mParameter = *mParameterList.at(0);
 }
 
diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop
index adb3c9ab9..794b0ccb7 100644
--- a/kmobile/devices/digicam/libkmobile_digicam.desktop
+++ b/kmobile/devices/digicam/libkmobile_digicam.desktop
@@ -108,5 +108,5 @@ Comment[zh_CN]=此驱动程序支持许多数码相机
 Comment[zh_TW]=此驅動程式支援許多數位相機
 Type=Service
 ServiceTypes=kdedevice/mobiledevice
-X-KDE-Library=libkmobile_digicam
+X-TDE-Library=libkmobile_digicam
 Icon=mobile_camera
diff --git a/kmobile/devices/gammu/libkmobile_gammu.desktop b/kmobile/devices/gammu/libkmobile_gammu.desktop
index f706b6806..ac96284eb 100644
--- a/kmobile/devices/gammu/libkmobile_gammu.desktop
+++ b/kmobile/devices/gammu/libkmobile_gammu.desktop
@@ -102,5 +102,5 @@ Comment[zh_CN]=此驱动程序通过 gammu 库支持许多诺基亚和其它移�
 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gammu 函式庫
 Type=Service
 ServiceTypes=kdedevice/mobiledevice
-X-KDE-Library=libkmobile_gammu
+X-TDE-Library=libkmobile_gammu
 Icon=mobile_phone
diff --git a/kmobile/devices/gnokii/libkmobile_gnokii.desktop b/kmobile/devices/gnokii/libkmobile_gnokii.desktop
index 7e732ecd2..a6db9fdf7 100644
--- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop
+++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop
@@ -102,5 +102,5 @@ Comment[zh_CN]=此驱动程序通过 gnokii 库支持许多诺基亚和其它移
 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gnokii 函式庫
 Type=Service
 ServiceTypes=kdedevice/mobiledevice
-X-KDE-Library=libkmobile_gnokii
+X-TDE-Library=libkmobile_gnokii
 Icon=mobile_phone
diff --git a/kmobile/devices/skeleton/libkmobile_skeleton.desktop b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
index 72943d15a..998fcbae3 100644
--- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop
+++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
@@ -103,5 +103,5 @@ Comment[zh_CN]=移动万能设备
 Comment[zh_TW]=行動通訊空殼裝置
 Type=Service
 ServiceTypes=kdedevice/mobiledevice
-X-KDE-Library=libkmobile_skeleton
+X-TDE-Library=libkmobile_skeleton
 Icon=mobile_unknown
diff --git a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop b/kmobile/kioslave/mimetypes/mobile_addressbook.desktop
index 44c03dafd..cf56e0247 100644
--- a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop
+++ b/kmobile/kioslave/mimetypes/mobile_addressbook.desktop
@@ -57,4 +57,4 @@ Type=MimeType
 MimeType=inode/addressbook
 Patterns=
 
-X-KDE-AutoEmbed=true
+X-TDE-AutoEmbed=true
diff --git a/kmobile/kioslave/mimetypes/mobile_calendar.desktop b/kmobile/kioslave/mimetypes/mobile_calendar.desktop
index 935e0d885..09d133ab5 100644
--- a/kmobile/kioslave/mimetypes/mobile_calendar.desktop
+++ b/kmobile/kioslave/mimetypes/mobile_calendar.desktop
@@ -57,4 +57,4 @@ Type=MimeType
 MimeType=inode/calendar
 Patterns=
 
-X-KDE-AutoEmbed=true
+X-TDE-AutoEmbed=true
diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/kioslave/mimetypes/mobile_device.desktop
index 4462b124d..2f59d2dec 100644
--- a/kmobile/kioslave/mimetypes/mobile_device.desktop
+++ b/kmobile/kioslave/mimetypes/mobile_device.desktop
@@ -61,4 +61,4 @@ Type=MimeType
 MimeType=kdedevice/mobiledevice
 Patterns=
 
-X-KDE-AutoEmbed=true
+X-TDE-AutoEmbed=true
diff --git a/kmobile/kioslave/mimetypes/mobile_notes.desktop b/kmobile/kioslave/mimetypes/mobile_notes.desktop
index fa68bad6f..7878c13d9 100644
--- a/kmobile/kioslave/mimetypes/mobile_notes.desktop
+++ b/kmobile/kioslave/mimetypes/mobile_notes.desktop
@@ -55,4 +55,4 @@ Type=MimeType
 MimeType=inode/notes
 Patterns=
 
-X-KDE-AutoEmbed=true
+X-TDE-AutoEmbed=true
diff --git a/kmobile/kmobile.desktop b/kmobile/kmobile.desktop
index 9d3ad2b8b..04e06ebe5 100644
--- a/kmobile/kmobile.desktop
+++ b/kmobile/kmobile.desktop
@@ -125,10 +125,10 @@ Comment[uk]=Менеджер мобільних пристроїв TDE
 Comment[zh_CN]=TDE 移动设备管理器
 Comment[zh_TW]=TDE 行動裝置管理員
 
-X-KDE-StartupNotify=false
+X-TDE-StartupNotify=false
 X-DCOP-ServiceType=Unique
-# X-KDE-autostart-after=panel
-# X-KDE-Library=kmobile_panelapplet
-# X-KDE-UniqueApplet=true
-# # X-KDE-autostart-condition=kmobilerc:General:AutoStart:true
-Categories=Qt;KDE;Utility;
+# X-TDE-autostart-after=panel
+# X-TDE-Library=kmobile_panelapplet
+# X-TDE-UniqueApplet=true
+# # X-TDE-autostart-condition=kmobilerc:General:AutoStart:true
+Categories=Qt;TDE;Utility;
diff --git a/kmobile/libkmobile.desktop b/kmobile/libkmobile.desktop
index e96761bf9..1f135851f 100644
--- a/kmobile/libkmobile.desktop
+++ b/kmobile/libkmobile.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=kdedevice/mobiledevice
+X-TDE-ServiceType=kdedevice/mobiledevice
 Name=TDE Mobile Device Lowlevel Hardware Driver
 Name[af]=TDE draagbare toestel laevlak hardeware toestel
 Name[bs]=TDE hardverski drajver niskog nivoa za mobilne uređaje
diff --git a/knode/KNode.desktop b/knode/KNode.desktop
index 99e5d8674..437212c34 100644
--- a/knode/KNode.desktop
+++ b/knode/KNode.desktop
@@ -79,6 +79,6 @@ GenericName[xh]=Umfundi weendaba
 GenericName[zh_CN]=新闻阅读器
 GenericName[zh_TW]=新聞閱讀器
 GenericName[zu]=Umfundi wezindaba
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Network;News;
+Categories=Qt;TDE;Network;News;
diff --git a/knode/knode_config_accounts.desktop b/knode/knode_config_accounts.desktop
index f311b260d..f9ea7ba78 100644
--- a/knode/knode_config_accounts.desktop
+++ b/knode/knode_config_accounts.desktop
@@ -3,13 +3,13 @@ Icon=network
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_accounts
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_accounts
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Accounts
 Name[af]=Rekeninge
diff --git a/knode/knode_config_appearance.desktop b/knode/knode_config_appearance.desktop
index 2e734de40..65fb49080 100644
--- a/knode/knode_config_appearance.desktop
+++ b/knode/knode_config_appearance.desktop
@@ -3,13 +3,13 @@ Icon=looknfeel
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_appearance
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_appearance
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Appearance
 Name[ar]=المظهر
diff --git a/knode/knode_config_cleanup.desktop b/knode/knode_config_cleanup.desktop
index e6afc8cca..0d857a697 100644
--- a/knode/knode_config_cleanup.desktop
+++ b/knode/knode_config_cleanup.desktop
@@ -3,13 +3,13 @@ Icon=wizard
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_cleanup
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_cleanup
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Cleanup
 Name[ar]=التنظيف
diff --git a/knode/knode_config_identity.desktop b/knode/knode_config_identity.desktop
index f7c0fae9c..c8f6b54a5 100644
--- a/knode/knode_config_identity.desktop
+++ b/knode/knode_config_identity.desktop
@@ -3,13 +3,13 @@ Icon=identity
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_identity
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_identity
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Identity
 Name[af]=Identiteit
diff --git a/knode/knode_config_post_news.desktop b/knode/knode_config_post_news.desktop
index 8d1658b11..06776f0f3 100644
--- a/knode/knode_config_post_news.desktop
+++ b/knode/knode_config_post_news.desktop
@@ -3,13 +3,13 @@ Icon=mail_forward
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_post_news
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_post_news
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Posting News
 Name[af]=Pos Nuus
diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop
index 5fd3ee459..5177616cb 100644
--- a/knode/knode_config_privacy.desktop
+++ b/knode/knode_config_privacy.desktop
@@ -3,13 +3,13 @@ Icon=password
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_privacy
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_privacy
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Signing/Verifying
 Name[af]=Teken/Bevestig
diff --git a/knode/knode_config_read_news.desktop b/knode/knode_config_read_news.desktop
index a8ba3e2d7..6af38c8e7 100644
--- a/knode/knode_config_read_news.desktop
+++ b/knode/knode_config_read_news.desktop
@@ -3,13 +3,13 @@ Icon=mail_get
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=knode
-X-KDE-FactoryName=knode_config_read_news
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=knode
-X-KDE-ParentComponents=knode,kontact_knodeplugin
-X-KDE-CfgDlgHierarchy=KNode
+X-TDE-ModuleType=Library
+X-TDE-Library=knode
+X-TDE-FactoryName=knode_config_read_news
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=knode
+X-TDE-ParentComponents=knode,kontact_knodeplugin
+X-TDE-CfgDlgHierarchy=KNode
 
 Name=Reading News
 Name[af]=Lees Nuus
diff --git a/knotes/knotes.desktop b/knotes/knotes.desktop
index 6a099e585..63c03664c 100644
--- a/knotes/knotes.desktop
+++ b/knotes/knotes.desktop
@@ -85,6 +85,6 @@ Name[ta]=கேகுறிப்புகள்
 Name[th]=บันทึกช่วยจำ
 Name[zh_TW]=KNotes 便利貼
 
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;Office;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;Office;
diff --git a/knotes/knotes_manager.desktop b/knotes/knotes_manager.desktop
index f518c6e32..1d572b3db 100644
--- a/knotes/knotes_manager.desktop
+++ b/knotes/knotes_manager.desktop
@@ -57,4 +57,4 @@ Name[zh_TW]=備忘錄
 Type=Service
 ServiceTypes=KResources/Manager
 
-X-KDE-ResourceFamily=notes
+X-TDE-ResourceFamily=notes
diff --git a/knotes/local.desktop b/knotes/local.desktop
index c0748995b..5485f12f2 100644
--- a/knotes/local.desktop
+++ b/knotes/local.desktop
@@ -51,8 +51,8 @@ Name[tr]=Yerel Dosyadaki Notlar
 Name[uk]=Нотатки у локальному файлі
 Name[zh_CN]=本地文件中的便笺
 Name[zh_TW]=本地檔備忘錄
-X-KDE-Library=knotes_local
+X-TDE-Library=knotes_local
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=notes
-X-KDE-ResourceType=file
+X-TDE-ResourceFamily=notes
+X-TDE-ResourceType=file
diff --git a/konsolekalendar/konsolekalendar.desktop b/konsolekalendar/konsolekalendar.desktop
index 0dfdc2aff..11d2ad803 100644
--- a/konsolekalendar/konsolekalendar.desktop
+++ b/konsolekalendar/konsolekalendar.desktop
@@ -26,4 +26,4 @@ Type=Application
 DocPath=konsolekalendar/index.html
 Terminal=false
 NoDisplay=true
-Categories=Qt;KDE;Utility;
+Categories=Qt;TDE;Utility;
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index 76f7f714c..950b9eea3 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -65,7 +65,7 @@ See KAddressbookPlugin (plugins/kaddressbook/*) for a working example.
 Don't forget to
 ===============
 * Define the service type, using a "Type=ServiceType" .desktop file,
-with "X-KDE-ServiceType=DCOP/Foo".
+with "X-TDE-ServiceType=DCOP/Foo".
 See e.g. tdepim/kaddressbook/dcopaddressbook.desktop
 
 * Add DCOP/Foo to the application's ServiceTypes list, in its .desktop file
diff --git a/kontact/interfaces/kontactplugin.desktop b/kontact/interfaces/kontactplugin.desktop
index d2fec8889..fc4f17cb2 100644
--- a/kontact/interfaces/kontactplugin.desktop
+++ b/kontact/interfaces/kontactplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Kontact/Plugin
+X-TDE-ServiceType=Kontact/Plugin
 Name=Kontact Plugin
 Name[af]=Kontact inprop module
 Name[ar]=قابس Kontact
@@ -55,15 +55,15 @@ Name[uz]=Kontact учун плагин
 Name[zh_CN]=Kontact 插件
 Name[zh_TW]=Kontack 外掛程式
 
-[PropertyDef::X-KDE-KontactPluginVersion]
+[PropertyDef::X-TDE-KontactPluginVersion]
 Type=int
-[PropertyDef::X-KDE-KontactPartLibraryName]
+[PropertyDef::X-TDE-KontactPartLibraryName]
 Type=TQString
-[PropertyDef::X-KDE-KontactPartExecutableName]
+[PropertyDef::X-TDE-KontactPartExecutableName]
 Type=TQString
-[PropertyDef::X-KDE-KontactPartLoadOnStart]
+[PropertyDef::X-TDE-KontactPartLoadOnStart]
 Type=bool
-[PropertyDef::X-KDE-KontactPluginHasSummary]
+[PropertyDef::X-TDE-KontactPluginHasSummary]
 Type=bool
-[PropertyDef::X-KDE-KontactPluginHasPart]
+[PropertyDef::X-TDE-KontactPluginHasPart]
 Type=bool
diff --git a/kontact/plugins/akregator/akregatorplugin.desktop b/kontact/plugins/akregator/akregatorplugin.desktop
index 6b44fbc4a..88c8436bb 100644
--- a/kontact/plugins/akregator/akregatorplugin.desktop
+++ b/kontact/plugins/akregator/akregatorplugin.desktop
@@ -3,15 +3,15 @@ Type=Service
 Icon=akregator
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_akregator
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libakregatorpart
-X-KDE-KontactPartLoadOnStart=false
+X-TDE-Library=libkontact_akregator
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libakregatorpart
+X-TDE-KontactPartLoadOnStart=false
 
-X-KDE-PluginInfo-Name=kontact_akregator
-X-KDE-PluginInfo-Version=1.0b2
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_akregator
+X-TDE-PluginInfo-Version=1.0b2
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Feed Reader Component (Akregator Plugin)
 Comment[bg]=Приставка за Akregator
diff --git a/kontact/plugins/akregator/akregatorplugin3.2.desktop b/kontact/plugins/akregator/akregatorplugin3.2.desktop
index 81f9f074b..ae5eca99e 100644
--- a/kontact/plugins/akregator/akregatorplugin3.2.desktop
+++ b/kontact/plugins/akregator/akregatorplugin3.2.desktop
@@ -3,14 +3,14 @@ Type=Service
 Icon=akregator
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_akregator
-X-KDE-KontactPluginVersion=3
-X-KDE-KontactPartLibraryName=libakregatorpart
+X-TDE-Library=libkontact_akregator
+X-TDE-KontactPluginVersion=3
+X-TDE-KontactPartLibraryName=libakregatorpart
 
-X-KDE-PluginInfo-Name=kontact_akregator
-X-KDE-PluginInfo-Version=1.0b2
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_akregator
+X-TDE-PluginInfo-Version=1.0b2
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Akregator Plugin
 Comment[af]=Akregator inprop module
diff --git a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
index 29e5cb23f..ed628178f 100644
--- a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+++ b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
@@ -3,17 +3,17 @@ Type=Service
 Icon=kontact_contacts
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_kaddressbookplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkaddressbookpart
-X-KDE-KontactPartExecutableName=kaddressbook
-X-KDE-KontactPluginHasSummary=false
+X-TDE-Library=libkontact_kaddressbookplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkaddressbookpart
+X-TDE-KontactPartExecutableName=kaddressbook
+X-TDE-KontactPluginHasSummary=false
 
-X-KDE-PluginInfo-Website=http://www.kaddressbook.org/
-X-KDE-PluginInfo-Name=kontact_kaddressbookplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://www.kaddressbook.org/
+X-TDE-PluginInfo-Name=kontact_kaddressbookplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Contacts Component (KAdressbook Plugin)
 Comment[bg]=Приставка за адресника
diff --git a/kontact/plugins/karm/karmplugin.desktop b/kontact/plugins/karm/karmplugin.desktop
index c6b39dfc3..40ce11bbb 100644
--- a/kontact/plugins/karm/karmplugin.desktop
+++ b/kontact/plugins/karm/karmplugin.desktop
@@ -3,14 +3,14 @@ Type=Service
 Icon=karm
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_karm
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkarmpart
+X-TDE-Library=libkontact_karm
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkarmpart
 
-X-KDE-PluginInfo-Name=kontact_karm
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-TDE-PluginInfo-Name=kontact_karm
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=false
 
 Comment=Time Tracker Component (KArm Plugin)
 Comment[bg]=Приставка за KArm
diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop
index 8b8fd76b3..126b5ee7c 100644
--- a/kontact/plugins/kitchensync/kitchensync.desktop
+++ b/kontact/plugins/kitchensync/kitchensync.desktop
@@ -3,14 +3,14 @@ Type=Service
 Icon=kitchensync
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_kitchensync
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkitchensyncpart
+X-TDE-Library=libkontact_kitchensync
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkitchensyncpart
 
-X-KDE-PluginInfo-Name=kontact_kitchensync
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-TDE-PluginInfo-Name=kontact_kitchensync
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=false
 
 Comment=Synchronization Component (Kitchensynk Plugin)
 Comment[bg]=Приставка за синхронизация
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index d616429e7..c5af05991 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -3,12 +3,12 @@ Icon=kontact_mail
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kmailsummary
-X-KDE-FactoryName=kmailsummary
-X-KDE-ParentApp=kontact_kmailplugin
-X-KDE-ParentComponents=kontact_kmailplugin
-X-KDE-CfgDlgHierarchy=KontactSummary
+X-TDE-ModuleType=Library
+X-TDE-Library=kmailsummary
+X-TDE-FactoryName=kmailsummary
+X-TDE-ParentApp=kontact_kmailplugin
+X-TDE-ParentComponents=kontact_kmailplugin
+X-TDE-CfgDlgHierarchy=KontactSummary
 
 Name=E-Mail Overview
 Name[bg]=Преглед на пощата
diff --git a/kontact/plugins/kmail/kmailplugin.desktop b/kontact/plugins/kmail/kmailplugin.desktop
index 7758a8e2a..601263ef6 100644
--- a/kontact/plugins/kmail/kmailplugin.desktop
+++ b/kontact/plugins/kmail/kmailplugin.desktop
@@ -3,18 +3,18 @@ Type=Service
 Icon=kontact_mail
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_kmailplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkmailpart
-X-KDE-KontactPartExecutableName=kmail
-X-KDE-KontactPartLoadOnStart=true
-X-KDE-KontactPluginHasSummary=true
+X-TDE-Library=libkontact_kmailplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkmailpart
+X-TDE-KontactPartExecutableName=kmail
+X-TDE-KontactPartLoadOnStart=true
+X-TDE-KontactPluginHasSummary=true
 
-X-KDE-PluginInfo-Website=http://kmail.kde.org/
-X-KDE-PluginInfo-Name=kontact_kmailplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://kmail.kde.org/
+X-TDE-PluginInfo-Name=kontact_kmailplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=E-Mail Component (KMail Plugin)
 Comment[bg]=Модул за е-поща
diff --git a/kontact/plugins/knode/knodeplugin.desktop b/kontact/plugins/knode/knodeplugin.desktop
index 559eaadde..c9562ec34 100644
--- a/kontact/plugins/knode/knodeplugin.desktop
+++ b/kontact/plugins/knode/knodeplugin.desktop
@@ -3,15 +3,15 @@ Type=Service
 Icon=kontact_news
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_knodeplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libknodepart
-X-KDE-KontactPartExecutableName=knode
+X-TDE-Library=libkontact_knodeplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libknodepart
+X-TDE-KontactPartExecutableName=knode
 
-X-KDE-PluginInfo-Name=kontact_knodeplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=false
+X-TDE-PluginInfo-Name=kontact_knodeplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=false
 
 Comment=Newsreader Component (KNode Plugin)
 Comment[bg]=Приставка за KNode
diff --git a/kontact/plugins/knotes/knotesplugin.desktop b/kontact/plugins/knotes/knotesplugin.desktop
index 71068d94f..0f30f6b28 100644
--- a/kontact/plugins/knotes/knotesplugin.desktop
+++ b/kontact/plugins/knotes/knotesplugin.desktop
@@ -3,15 +3,15 @@ Type=Service
 Icon=kontact_notes
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_knotesplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPluginHasSummary=true
+X-TDE-Library=libkontact_knotesplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPluginHasSummary=true
 
-X-KDE-PluginInfo-Website=http://pim.kde.org/components/knotes.php
-X-KDE-PluginInfo-Name=kontact_knotesplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://pim.kde.org/components/knotes.php
+X-TDE-PluginInfo-Name=kontact_knotesplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Notes Component (KNotes Plugin)
 Comment[bg]=Приставка за бележки
diff --git a/kontact/plugins/korganizer/journalplugin.desktop b/kontact/plugins/korganizer/journalplugin.desktop
index f24c1206c..3e09a48c8 100644
--- a/kontact/plugins/korganizer/journalplugin.desktop
+++ b/kontact/plugins/korganizer/journalplugin.desktop
@@ -3,17 +3,17 @@ Type=Service
 Icon=kontact_journal
 ServiceTypes=Kontact/Plugin
 
-X-KDE-Library=libkontact_journalplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkorganizerpart
-X-KDE-KontactPartExecutableName=korganizer
-X-KDE-KontactPluginHasSummary=false
+X-TDE-Library=libkontact_journalplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkorganizerpart
+X-TDE-KontactPartExecutableName=korganizer
+X-TDE-KontactPluginHasSummary=false
 
-X-KDE-PluginInfo-Website=http://korganizer.kde.org
-X-KDE-PluginInfo-Name=kontact_journalplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://korganizer.kde.org
+X-TDE-PluginInfo-Name=kontact_journalplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Journal Component (KOrganizer Plugin)
 Comment[bg]=Приставка за KOrganizer
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index 175ed6242..bb89934bc 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -3,12 +3,12 @@ Icon=kontact_date
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korgsummary
-X-KDE-FactoryName=korgsummary
-X-KDE-ParentApp=kontact_korganizerplugin,kontact_todoplugin
-X-KDE-ParentComponents=kontact_korganizerplugin,kontact_todoplugin
-X-KDE-CfgDlgHierarchy=KontactSummary
+X-TDE-ModuleType=Library
+X-TDE-Library=korgsummary
+X-TDE-FactoryName=korgsummary
+X-TDE-ParentApp=kontact_korganizerplugin,kontact_todoplugin
+X-TDE-ParentComponents=kontact_korganizerplugin,kontact_todoplugin
+X-TDE-CfgDlgHierarchy=KontactSummary
 
 Name=Appointment and To-do Overview
 Name[bg]=Преглед на срещи и задачи
diff --git a/kontact/plugins/korganizer/korganizerplugin.desktop b/kontact/plugins/korganizer/korganizerplugin.desktop
index 896320c15..6cbed4b99 100644
--- a/kontact/plugins/korganizer/korganizerplugin.desktop
+++ b/kontact/plugins/korganizer/korganizerplugin.desktop
@@ -3,17 +3,17 @@ Type=Service
 Icon=kontact_date
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_korganizerplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkorganizerpart
-X-KDE-KontactPartExecutableName=korganizer
-X-KDE-KontactPluginHasSummary=true
+X-TDE-Library=libkontact_korganizerplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkorganizerpart
+X-TDE-KontactPartExecutableName=korganizer
+X-TDE-KontactPluginHasSummary=true
 
-X-KDE-PluginInfo-Website=http://korganizer.kde.org
-X-KDE-PluginInfo-Name=kontact_korganizerplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://korganizer.kde.org
+X-TDE-PluginInfo-Name=kontact_korganizerplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Calendar Component (KOrganizer Plugin)
 Comment[bg]=Приставка за KOrganizer
diff --git a/kontact/plugins/korganizer/todoplugin.desktop b/kontact/plugins/korganizer/todoplugin.desktop
index dde1a0c1b..fdb5872ac 100644
--- a/kontact/plugins/korganizer/todoplugin.desktop
+++ b/kontact/plugins/korganizer/todoplugin.desktop
@@ -3,17 +3,17 @@ Type=Service
 Icon=kontact_todo
 ServiceTypes=Kontact/Plugin
 
-X-KDE-Library=libkontact_todoplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPartLibraryName=libkorganizerpart
-X-KDE-KontactPartExecutableName=korganizer
-X-KDE-KontactPluginHasSummary=true
+X-TDE-Library=libkontact_todoplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPartLibraryName=libkorganizerpart
+X-TDE-KontactPartExecutableName=korganizer
+X-TDE-KontactPluginHasSummary=true
 
-X-KDE-PluginInfo-Website=http://korganizer.kde.org
-X-KDE-PluginInfo-Name=kontact_todoplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://korganizer.kde.org
+X-TDE-PluginInfo-Name=kontact_todoplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=To-do List Component (KOrganizer plugin)
 Comment[bg]=Приставка за KOrganizer
diff --git a/kontact/plugins/kpilot/kpilotplugin.desktop b/kontact/plugins/kpilot/kpilotplugin.desktop
index 68f8d9d29..d6a9a384c 100644
--- a/kontact/plugins/kpilot/kpilotplugin.desktop
+++ b/kontact/plugins/kpilot/kpilotplugin.desktop
@@ -3,17 +3,17 @@ Type=Service
 Icon=kpilot
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_kpilotplugin
-X-KDE-KontactIdentifier=kpilot
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPluginHasSummary=true
-X-KDE-KontactPluginHasPart=false
+X-TDE-Library=libkontact_kpilotplugin
+X-TDE-KontactIdentifier=kpilot
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPluginHasSummary=true
+X-TDE-KontactPluginHasPart=false
 
-X-KDE-PluginInfo-Website=http://www.slac.com/~pilone/kpilot_home/
-X-KDE-PluginInfo-Name=kontact_kpilotplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Website=http://www.slac.com/~pilone/kpilot_home/
+X-TDE-PluginInfo-Name=kontact_kpilotplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Palm Tools Component (KPilot Plugin)
 Comment[bg]=Приставка за KPilot
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index 3e57621c1..b395d1313 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -3,12 +3,12 @@ Icon=knode
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kontactknt
-X-KDE-FactoryName=kontactknt
-X-KDE-ParentApp=kontact_newstickerplugin
-X-KDE-ParentComponents=kontact_newstickerplugin
-X-KDE-CfgDlgHierarchy=KontactSummary
+X-TDE-ModuleType=Library
+X-TDE-Library=kontactknt
+X-TDE-FactoryName=kontactknt
+X-TDE-ParentApp=kontact_newstickerplugin
+X-TDE-ParentComponents=kontact_newstickerplugin
+X-TDE-CfgDlgHierarchy=KontactSummary
 
 Name=News Ticker
 Name[af]=Nuus tikker
diff --git a/kontact/plugins/newsticker/newstickerplugin.desktop b/kontact/plugins/newsticker/newstickerplugin.desktop
index 079f90079..a15f787f0 100644
--- a/kontact/plugins/newsticker/newstickerplugin.desktop
+++ b/kontact/plugins/newsticker/newstickerplugin.desktop
@@ -4,15 +4,15 @@ Icon=knewsticker
 ServiceTypes=Kontact/Plugin,KPluginInfo
 TryExec=rssservice
 
-X-KDE-Library=libkontact_newstickerplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPluginHasSummary=true
-X-KDE-KontactPluginHasPart=false
+X-TDE-Library=libkontact_newstickerplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPluginHasSummary=true
+X-TDE-KontactPluginHasPart=false
 
-X-KDE-PluginInfo-Name=kontact_newstickerplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_newstickerplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Newsticker Component
 Comment[bg]=Компонент за новини
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index 6835ce8fd..dbed97243 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -3,12 +3,12 @@ Icon=cookie
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=sdsummary
-X-KDE-FactoryName=sdsummary
-X-KDE-ParentApp=kontact_specialdatesplugin
-X-KDE-ParentComponents=kontact_specialdatesplugin
-X-KDE-CfgDlgHierarchy=KontactSummary
+X-TDE-ModuleType=Library
+X-TDE-Library=sdsummary
+X-TDE-FactoryName=sdsummary
+X-TDE-ParentApp=kontact_specialdatesplugin
+X-TDE-ParentComponents=kontact_specialdatesplugin
+X-TDE-CfgDlgHierarchy=KontactSummary
 
 Name=Special Dates Overview
 Name[bg]=Преглед на специални случаи
diff --git a/kontact/plugins/specialdates/specialdatesplugin.desktop b/kontact/plugins/specialdates/specialdatesplugin.desktop
index cb6a691c0..ebb8c21fc 100644
--- a/kontact/plugins/specialdates/specialdatesplugin.desktop
+++ b/kontact/plugins/specialdates/specialdatesplugin.desktop
@@ -3,15 +3,15 @@ Type=Service
 Icon=cookie
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_specialdatesplugin
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPluginHasPart=false
-X-KDE-KontactPluginHasSummary=true
+X-TDE-Library=libkontact_specialdatesplugin
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPluginHasPart=false
+X-TDE-KontactPluginHasSummary=true
 
-X-KDE-PluginInfo-Name=kontact_specialdatesplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_specialdatesplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Name=Special Dates
 Name[af]=Spesiale datums
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 767d62c7f..80550802e 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -120,7 +120,7 @@ void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
       TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
 
@@ -150,7 +150,7 @@ void KCMKontactSummary::load()
     if ( !(*it)->isPluginEnabled() )
       continue;
 
-    TQVariant var = (*it)->property( "X-KDE-KontactPluginHasSummary" );
+    TQVariant var = (*it)->property( "X-TDE-KontactPluginHasSummary" );
     if ( !var.isValid() )
       continue;
 
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index b4100a59f..bb5e95d0b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -3,12 +3,12 @@ Icon=kontact_summary
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kontactsummary
-X-KDE-FactoryName=kontactsummary
-X-KDE-ParentApp=kontact_summaryplugin
-X-KDE-ParentComponents=kontact_summaryplugin
-X-KDE-CfgDlgHierarchy=KontactSummary
+X-TDE-ModuleType=Library
+X-TDE-Library=kontactsummary
+X-TDE-FactoryName=kontactsummary
+X-TDE-ParentApp=kontact_summaryplugin
+X-TDE-ParentComponents=kontact_summaryplugin
+X-TDE-CfgDlgHierarchy=KontactSummary
 
 Name=Summary View Items
 Name[bg]=Обобщение
diff --git a/kontact/plugins/summary/summaryplugin.desktop b/kontact/plugins/summary/summaryplugin.desktop
index 79f8119de..d8cb9bb98 100644
--- a/kontact/plugins/summary/summaryplugin.desktop
+++ b/kontact/plugins/summary/summaryplugin.desktop
@@ -3,13 +3,13 @@ Type=Service
 Icon=kontact_summary
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkontact_summaryplugin
-X-KDE-KontactPluginVersion=6
+X-TDE-Library=libkontact_summaryplugin
+X-TDE-KontactPluginVersion=6
 
-X-KDE-PluginInfo-Name=kontact_summaryplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_summaryplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Summary View Component
 Comment[bg]=Обобщение
diff --git a/kontact/plugins/test/kptestplugin.desktop b/kontact/plugins/test/kptestplugin.desktop
index 75e0988e4..703a0d7e9 100644
--- a/kontact/plugins/test/kptestplugin.desktop
+++ b/kontact/plugins/test/kptestplugin.desktop
@@ -3,12 +3,12 @@ Type=Service
 Icon=konsole
 ServiceTypes=Kontact/Plugin,KPluginInfo
 
-X-KDE-Library=libkptestplugin
-X-KDE-KontactPluginVersion=6
+X-TDE-Library=libkptestplugin
+X-TDE-KontactPluginVersion=6
 
-X-KDE-PluginInfo-Name=kptestplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-EnabledByDefault=false
+X-TDE-PluginInfo-Name=kptestplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-EnabledByDefault=false
 
 Comment=Kontact Test Plugin
 Comment[af]=Kontact toets inprop module
diff --git a/kontact/plugins/weather/weatherplugin.desktop b/kontact/plugins/weather/weatherplugin.desktop
index 80d9be8e4..92b765ed8 100644
--- a/kontact/plugins/weather/weatherplugin.desktop
+++ b/kontact/plugins/weather/weatherplugin.desktop
@@ -4,16 +4,16 @@ Icon=kweather
 ServiceTypes=Kontact/Plugin,KPluginInfo
 TryExec=kweatherservice
 
-X-KDE-Library=libkontact_weatherplugin
-X-KDE-KontactIdentifier=weather
-X-KDE-KontactPluginVersion=6
-X-KDE-KontactPluginHasSummary=true
-X-KDE-KontactPluginHasPart=false
+X-TDE-Library=libkontact_weatherplugin
+X-TDE-KontactIdentifier=weather
+X-TDE-KontactPluginVersion=6
+X-TDE-KontactPluginHasSummary=true
+X-TDE-KontactPluginHasPart=false
 
-X-KDE-PluginInfo-Name=kontact_weatherplugin
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Name=kontact_weatherplugin
+X-TDE-PluginInfo-Version=0.1
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 
 Comment=Kontact Weather Component
 Comment[bg]=Приставка за метеорологичното време
diff --git a/kontact/src/Kontact.desktop b/kontact/src/Kontact.desktop
index a4127aac0..82ec08bb5 100644
--- a/kontact/src/Kontact.desktop
+++ b/kontact/src/Kontact.desktop
@@ -64,6 +64,6 @@ GenericName[uz]=Шахсий маълумот бошқарувчиси
 GenericName[zh_CN]=个人信息管理器
 GenericName[zh_TW]=個人資訊管理者
 Terminal=false
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office;Network;Email;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Office;Network;Email;
 DocPath=kontact/index.html
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index cd9478f0a..2f5849bf9 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -115,20 +115,20 @@ void PluginSelection::readConfig()
 {
   const KTrader::OfferList offers = KTrader::self()->query(
       TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   int activeComponent = 0;
   mPluginCombo->clear();
   for ( KService::List::ConstIterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = *it;
     // skip summary only plugins
-    TQVariant var = service->property( "X-KDE-KontactPluginHasPart" );
+    TQVariant var = service->property( "X-TDE-KontactPluginHasPart" );
     if ( var.isValid() && var.toBool() == false )
       continue;
     mPluginCombo->insertItem( service->name() );
     mPluginList.append( service );
 
-    if ( service->property("X-KDE-PluginInfo-Name").toString() == mItem->value() )
+    if ( service->property("X-TDE-PluginInfo-Name").toString() == mItem->value() )
       activeComponent = mPluginList.count() - 1;
   }
 
@@ -138,7 +138,7 @@ void PluginSelection::readConfig()
 void PluginSelection::writeConfig()
 {
   KService::Ptr ptr = *( mPluginList.at( mPluginCombo->currentItem() ) );
-  mItem->setValue( ptr->property("X-KDE-PluginInfo-Name").toString() );
+  mItem->setValue( ptr->property("X-TDE-PluginInfo-Name").toString() );
 }
 
 TQValueList<TQWidget *> PluginSelection::widgets() const
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index ec184ea5b..6ea38e238 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -4,13 +4,13 @@ Icon=kontact
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=kontact
-X-KDE-FactoryName=kontactconfig
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=kontact
-X-KDE-ParentComponents=kontact
-X-KDE-Weight=0
+X-TDE-ModuleType=Library
+X-TDE-Library=kontact
+X-TDE-FactoryName=kontactconfig
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=kontact
+X-TDE-ParentComponents=kontact
+X-TDE-Weight=0
 
 Name=Kontact
 Name[be]=Кантакт
diff --git a/kontact/src/kontactdcop.desktop b/kontact/src/kontactdcop.desktop
index fdd07b9cc..805eeeadf 100644
--- a/kontact/src/kontactdcop.desktop
+++ b/kontact/src/kontactdcop.desktop
@@ -14,5 +14,5 @@ NoDisplay=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kontact
 ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
-X-KDE-StartupNotify=false
-Categories=Qt;KDE;Office
+X-TDE-StartupNotify=false
+Categories=Qt;TDE;Office
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 67fe055f5..99fff1538 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -77,11 +77,11 @@ static void listPlugins()
   KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
     TQString::fromLatin1( "Kontact/Plugin" ),
-    TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+    TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = (*it);
     // skip summary only plugins
-    TQVariant var = service->property( "X-KDE-KontactPluginHasPart" );
+    TQVariant var = service->property( "X-TDE-KontactPluginHasPart" );
     if ( var.isValid() && var.toBool() == false )
       continue;
     cout << service->library().remove( "libkontact_" ).latin1() << endl;
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index fb39e64fd..41e026a69 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -125,7 +125,7 @@ void MainWindow::initGUI()
 
   KTrader::OfferList offers = KTrader::self()->query(
       TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
   KPluginInfo::List::Iterator it;
@@ -138,7 +138,7 @@ void MainWindow::initGUI()
     action->setName( (*it)->pluginName().latin1() );
     action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
 
-    TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" );
+    TQVariant hasPartProp = (*it)->property( "X-TDE-KontactPluginHasPart" );
     if ( !hasPartProp.isValid() || hasPartProp.toBool() ) {
       mActionPlugins.append( action );
     }
@@ -552,10 +552,10 @@ void MainWindow::loadPlugins()
     plugin->setTitle( (*it)->name() );
     plugin->setIcon( (*it)->icon() );
 
-    TQVariant libNameProp = (*it)->property( "X-KDE-KontactPartLibraryName" );
-    TQVariant exeNameProp = (*it)->property( "X-KDE-KontactPartExecutableName" );
-    TQVariant loadOnStart = (*it)->property( "X-KDE-KontactPartLoadOnStart" );
-    TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" );
+    TQVariant libNameProp = (*it)->property( "X-TDE-KontactPartLibraryName" );
+    TQVariant exeNameProp = (*it)->property( "X-TDE-KontactPartExecutableName" );
+    TQVariant loadOnStart = (*it)->property( "X-TDE-KontactPartLoadOnStart" );
+    TQVariant hasPartProp = (*it)->property( "X-TDE-KontactPluginHasPart" );
 
     if ( !loadOnStart.isNull() && loadOnStart.toBool() )
       mDelayedPreload.append( plugin );
diff --git a/korganizer/dcopcalendar.desktop b/korganizer/dcopcalendar.desktop
index ac1ccf4ee..dad559509 100644
--- a/korganizer/dcopcalendar.desktop
+++ b/korganizer/dcopcalendar.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=DCOP/Organizer
+X-TDE-ServiceType=DCOP/Organizer
 Comment=Organizer with a DCOP interface
 Comment[af]=Organiseerder met 'n DCOP koppelvlak
 Comment[be]=Арганізатар з DCOP інтэрфэйсам
diff --git a/korganizer/interfaces/calendar/calendardecoration.desktop b/korganizer/interfaces/calendar/calendardecoration.desktop
index b44db80ad..95d498369 100644
--- a/korganizer/interfaces/calendar/calendardecoration.desktop
+++ b/korganizer/interfaces/calendar/calendardecoration.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Calendar/Decoration
+X-TDE-ServiceType=Calendar/Decoration
 Comment=Calendar Decoration Plugin
 Comment[af]=Kalender Versiering Inplak
 Comment[bg]=Приставка за декорация на календара
diff --git a/korganizer/interfaces/calendar/calendarplugin.desktop b/korganizer/interfaces/calendar/calendarplugin.desktop
index d5c0ab560..21055f7a5 100644
--- a/korganizer/interfaces/calendar/calendarplugin.desktop
+++ b/korganizer/interfaces/calendar/calendarplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Calendar/Plugin
+X-TDE-ServiceType=Calendar/Plugin
 Comment=Calendar Plugin
 Comment[af]=Kalender Inplak
 Comment[az]=Təqvim Əlavəsi
@@ -68,5 +68,5 @@ Comment[zh_CN]=日历插件
 Comment[zh_TW]=行事曆外掛程式
 Comment[zu]=Iplagi Yekhalanda
 
-[PropertyDef::X-KDE-KOrganizer-HasSettings]
+[PropertyDef::X-TDE-KOrganizer-HasSettings]
 Type=bool
diff --git a/korganizer/interfaces/korganizer/korganizerpart.desktop b/korganizer/interfaces/korganizer/korganizerpart.desktop
index c1b84659d..dda4476b9 100644
--- a/korganizer/interfaces/korganizer/korganizerpart.desktop
+++ b/korganizer/interfaces/korganizer/korganizerpart.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KOrganizer/Part
+X-TDE-ServiceType=KOrganizer/Part
 Comment=KOrganizer Part
 Comment[af]=Korganizer Deel
 Comment[be]=Частка "K Арганізатар"
@@ -58,8 +58,8 @@ Comment[zh_CN]=KOrganizer 部件
 Comment[zh_TW]=KOrganizer 組件
 Comment[zu]=KUmgqugquzeleli Wengxenye
 
-[PropertyDef::X-KDE-KOrganizer-HasSettings]
+[PropertyDef::X-TDE-KOrganizer-HasSettings]
 Type=bool
 
-[PropertyDef::X-KDE-PluginInterfaceVersion]
+[PropertyDef::X-TDE-PluginInterfaceVersion]
 Type=int
diff --git a/korganizer/interfaces/korganizer/korgprintplugin.desktop b/korganizer/interfaces/korganizer/korgprintplugin.desktop
index 05cbd1b91..80a2a8a95 100644
--- a/korganizer/interfaces/korganizer/korgprintplugin.desktop
+++ b/korganizer/interfaces/korganizer/korgprintplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KOrganizer/PrintPlugin
+X-TDE-ServiceType=KOrganizer/PrintPlugin
 Comment=KOrganizer Part
 Comment[af]=Korganizer Deel
 Comment[be]=Частка "K Арганізатар"
@@ -58,8 +58,8 @@ Comment[zh_CN]=KOrganizer 部件
 Comment[zh_TW]=KOrganizer 組件
 Comment[zu]=KUmgqugquzeleli Wengxenye
 
-[PropertyDef::X-KDE-KOrganizer-HasSettings]
+[PropertyDef::X-TDE-KOrganizer-HasSettings]
 Type=bool
 
-[PropertyDef::X-KDE-PluginInterfaceVersion]
+[PropertyDef::X-TDE-PluginInterfaceVersion]
 Type=int
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index 7503d2de4..0096b1496 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -66,7 +66,7 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
 {
   TQString constraint;
   if ( version >= 0 ) {
-    constraint = TQString("[X-KDE-PluginInterfaceVersion] == %1")
+    constraint = TQString("[X-TDE-PluginInterfaceVersion] == %1")
                  .arg( TQString::number( version ) );
   }
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 50f832475..15003755f 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1196,7 +1196,7 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i )
     return;
   }
 
-  TQVariant variant = item->service()->property( "X-KDE-KOrganizer-HasSettings" );
+  TQVariant variant = item->service()->property( "X-TDE-KOrganizer-HasSettings" );
 
   bool hasSettings = true;
   if ( variant.isValid() )
diff --git a/korganizer/korgac/korgac.desktop b/korganizer/korgac/korgac.desktop
index c312190bf..c20f2f5f3 100644
--- a/korganizer/korgac/korgac.desktop
+++ b/korganizer/korgac/korgac.desktop
@@ -89,7 +89,7 @@ GenericName[uk]=Демон клієнта нагадування для KOrganiz
 GenericName[zh_CN]=KOrganizer 定时守护进程的客户端程序
 GenericName[zh_TW]=KOrganizr 提醒守護程式客戶端
 Terminal=false
-X-KDE-autostart-after=panel
-X-KDE-autostart-condition=korgacrc:General:Autostart:true
+X-TDE-autostart-after=panel
+X-TDE-autostart-condition=korgacrc:General:Autostart:true
 NoDisplay=true
 OnlyShowIn=TDE;
diff --git a/korganizer/korganizer.desktop b/korganizer/korganizer.desktop
index b3337dd0f..a75e4d596 100644
--- a/korganizer/korganizer.desktop
+++ b/korganizer/korganizer.desktop
@@ -139,8 +139,8 @@ GenericName[uz]=Шахсий органайзер
 GenericName[zh_CN]=个人日程安排
 GenericName[zh_TW]=個人行程組織軟體
 ServiceTypes=Browser/View,DCOP/Organizer
-X-KDE-Library=libkorganizerpart
-X-KDE-StartupNotify=true
+X-TDE-Library=libkorganizerpart
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=korganizer
-Categories=Qt;KDE;Office;ProjectManagement;
+Categories=Qt;TDE;Office;ProjectManagement;
diff --git a/korganizer/korganizer_configcolors.desktop b/korganizer/korganizer_configcolors.desktop
index 9a2c7f158..a86bf5314 100644
--- a/korganizer/korganizer_configcolors.desktop
+++ b/korganizer/korganizer_configcolors.desktop
@@ -3,13 +3,13 @@ Icon=colors
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigcolors
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigcolors
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Colors
 Name[af]=Kleure
diff --git a/korganizer/korganizer_configdesignerfields.desktop b/korganizer/korganizer_configdesignerfields.desktop
index 5263f22d3..0cdc7bc12 100644
--- a/korganizer/korganizer_configdesignerfields.desktop
+++ b/korganizer/korganizer_configdesignerfields.desktop
@@ -4,12 +4,12 @@ Type=Service
 ServiceTypes=KCModule
 DocPath=korganizer/preferences.html
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korgdesignerfields
-X-KDE-ParentApp=kaddressbook
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korgdesignerfields
+X-TDE-ParentApp=kaddressbook
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Custom Pages
 Name[af]=Pasmaak Blaaie
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index cacdc75f5..3c0e5ea6e 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -3,13 +3,13 @@ Icon=fonts
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigfonts
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigfonts
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Fonts
 Name[af]=Skrif tipes
diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop
index 2bae305c8..76070297c 100644
--- a/korganizer/korganizer_configfreebusy.desktop
+++ b/korganizer/korganizer_configfreebusy.desktop
@@ -3,13 +3,13 @@ Icon=personal
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigfreebusy
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigfreebusy
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Free/Busy
 Name[af]=Beskikbaar/Besig
diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop
index 6386deda6..e27fdc019 100644
--- a/korganizer/korganizer_configgroupautomation.desktop
+++ b/korganizer/korganizer_configgroupautomation.desktop
@@ -3,13 +3,13 @@ Icon=personal
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfiggroupautomation
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfiggroupautomation
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Group Automation
 Name[af]=Groep outomatisasie
diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop
index 710f6df7b..693a0efeb 100644
--- a/korganizer/korganizer_configgroupscheduling.desktop
+++ b/korganizer/korganizer_configgroupscheduling.desktop
@@ -3,13 +3,13 @@ Icon=personal
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfiggroupscheduling
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfiggroupscheduling
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Group Scheduling
 Name[af]=Groep Skedulering
diff --git a/korganizer/korganizer_configmain.desktop b/korganizer/korganizer_configmain.desktop
index 1f5c5bde0..1685307c2 100644
--- a/korganizer/korganizer_configmain.desktop
+++ b/korganizer/korganizer_configmain.desktop
@@ -3,13 +3,13 @@ Icon=identity
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigmain
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigmain
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Personal
 Name[af]=Persoonlik
diff --git a/korganizer/korganizer_configplugins.desktop b/korganizer/korganizer_configplugins.desktop
index 2488f1ade..0fc7d0607 100644
--- a/korganizer/korganizer_configplugins.desktop
+++ b/korganizer/korganizer_configplugins.desktop
@@ -3,13 +3,13 @@ Icon=identity
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigplugins
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigplugins
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Plugins
 Name[af]=Inprop modules
diff --git a/korganizer/korganizer_configtime.desktop b/korganizer/korganizer_configtime.desktop
index a1eebdbc9..482d0de15 100644
--- a/korganizer/korganizer_configtime.desktop
+++ b/korganizer/korganizer_configtime.desktop
@@ -3,13 +3,13 @@ Icon=clock
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigtime
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigtime
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Time & Date
 Name[af]=Datum & Tyd
diff --git a/korganizer/korganizer_configviews.desktop b/korganizer/korganizer_configviews.desktop
index d46f352a7..f9fd9f119 100644
--- a/korganizer/korganizer_configviews.desktop
+++ b/korganizer/korganizer_configviews.desktop
@@ -3,13 +3,13 @@ Icon=viewmag
 Type=Service
 ServiceTypes=KCModule
 
-X-KDE-ModuleType=Library
-X-KDE-Library=korganizer
-X-KDE-FactoryName=korganizerconfigviews
-X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=korganizer
-X-KDE-ParentComponents=korganizer,kontact_korganizerplugin
-X-KDE-CfgDlgHierarchy=KOrganizer
+X-TDE-ModuleType=Library
+X-TDE-Library=korganizer
+X-TDE-FactoryName=korganizerconfigviews
+X-TDE-HasReadOnlyMode=false
+X-TDE-ParentApp=korganizer
+X-TDE-ParentComponents=korganizer,kontact_korganizerplugin
+X-TDE-CfgDlgHierarchy=KOrganizer
 
 Name=Views
 Name[af]=Aansigte
diff --git a/korganizer/plugins/datenums/datenums.desktop b/korganizer/plugins/datenums/datenums.desktop
index b93e3d1de..d35a0925f 100644
--- a/korganizer/plugins/datenums/datenums.desktop
+++ b/korganizer/plugins/datenums/datenums.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_datenums
+X-TDE-Library=libkorg_datenums
 Name=Date Numbers Plugin for Calendars
 Name[af]=Dag nommer inprop module vir kalenders
 Name[ar]=قابس أرقام التاريخ للتقويم
@@ -93,5 +93,5 @@ Comment[zh_CN]=此插件可对每天在议事日程视图中上方显示该日�
 Comment[zh_TW]=對每一天，此外掛程式會顯示這是一年中的第幾天。
 Type=Service
 ServiceTypes=Calendar/Plugin,Calendar/Decoration
-X-KDE-KOrganizer-HasSettings=true
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=true
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/exchange/exchange.desktop b/korganizer/plugins/exchange/exchange.desktop
index 95484e3b4..7d80fa1de 100644
--- a/korganizer/plugins/exchange/exchange.desktop
+++ b/korganizer/plugins/exchange/exchange.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_exchange
+X-TDE-Library=libkorg_exchange
 Name=Microsoft Exchange 2000 Plugin for KOrganizer
 Name[af]=Microsoft Exchange 2000 inprop module vir KOrganizer
 Name[be]=Дапаўненне K Арганізатара "Microsoft Exchange 2000"
@@ -95,5 +95,5 @@ Comment[zh_CN]=此插件允许 KOrganizer 用户与 Microsoft Exchange 2000 群�
 Comment[zh_TW]=這個外掛程式允許 KOrganizer 使用者與 Microsoft Exchange 2000 群組伺服器一起工作。
 Type=Service
 ServiceTypes=KOrganizer/Part
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/hebrew/hebrew.desktop b/korganizer/plugins/hebrew/hebrew.desktop
index dc67c2eba..3329228fe 100644
--- a/korganizer/plugins/hebrew/hebrew.desktop
+++ b/korganizer/plugins/hebrew/hebrew.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_hebrew
+X-TDE-Library=libkorg_hebrew
 Name=Jewish Calendar Plugin
 Name[af]=Joodse kalender inprop module
 Name[bg]=Приставка за еврейския календар
@@ -95,5 +95,5 @@ Comment[zh_CN]=在 KOrganizer 中显示犹太教日历系统的全部日期。
 Comment[zh_TW]=顯示所有猶太行事曆的日期
 Type=Service
 ServiceTypes=Calendar/Plugin,Calendar/Decoration
-X-KDE-KOrganizer-HasSettings=true
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=true
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/printing/journal/journalprint.desktop b/korganizer/plugins/printing/journal/journalprint.desktop
index 6d811fcec..63a4aaad1 100644
--- a/korganizer/plugins/printing/journal/journalprint.desktop
+++ b/korganizer/plugins/printing/journal/journalprint.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_journalprint
+X-TDE-Library=libkorg_journalprint
 Name=Journal Print Style
 Name[af]=Joernaal druk styl
 Name[bg]=Стил на отпечатване на календар
@@ -89,5 +89,5 @@ Comment[zh_CN]=此插件允许您打印日记项目。
 Comment[zh_TW]=此外掛程式讓您印出日誌項目。
 Type=Service
 ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/printing/list/listprint.desktop b/korganizer/plugins/printing/list/listprint.desktop
index 6be822b85..77c8781da 100644
--- a/korganizer/plugins/printing/list/listprint.desktop
+++ b/korganizer/plugins/printing/list/listprint.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_listprint
+X-TDE-Library=libkorg_listprint
 Name=List Print Style
 Name[af]=Lys druk styl
 Name[bg]=Печат като списък
@@ -89,5 +89,5 @@ Comment[zh_CN]=此插件允许您以列表格式打印事件和待办事宜。
 Comment[zh_TW]=此外掛程式允許您以清單格式印出事件與待辦事項。
 Type=Service
 ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop b/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
index 59ed74c21..f90ecdbd6 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_whatsnextprint
+X-TDE-Library=libkorg_whatsnextprint
 Name=What's Next Print Style
 Name[af]=Wat is volgende - druk styl
 Name[bg]=Стил за отпечатване на "Какво следва"
@@ -89,5 +89,5 @@ Comment[zh_CN]=此插件允许您打印所有即将到达的事件和代办事�
 Comment[zh_TW]=此外掛程式允許您印出即將發生的事件與待辦事項清單。
 Type=Service
 ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/printing/year/yearprint.desktop b/korganizer/plugins/printing/year/yearprint.desktop
index 40f1de60b..c08bdd453 100644
--- a/korganizer/plugins/printing/year/yearprint.desktop
+++ b/korganizer/plugins/printing/year/yearprint.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_yearlyprint
+X-TDE-Library=libkorg_yearlyprint
 Name=Yearly Print Style
 Name[af]=Druk styl: Jaarliks
 Name[bg]=Стил за отпечатване на годишно разписание
@@ -78,5 +78,5 @@ Comment[zh_CN]=此插件允许您打印年历。
 Comment[zh_TW]=此外掛程式讓您印出年曆。
 Type=Service
 ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/projectview/projectview.desktop b/korganizer/plugins/projectview/projectview.desktop
index e6c3bef7a..7befec305 100644
--- a/korganizer/plugins/projectview/projectview.desktop
+++ b/korganizer/plugins/projectview/projectview.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_projectview
+X-TDE-Library=libkorg_projectview
 Name=Project View Plugin for KOrganizer
 Name[af]=Projek Besigtig Inplak vir Korganizer
 Name[az]=KOrganizer Layihə Nümayiş Əlavəsi
@@ -106,5 +106,5 @@ Comment[zh_CN]=此插件为 KOrganizer 提供了项目规划视图(类似于待�
 Comment[zh_TW]=此外掛程式提供 KOrganizer 專案計畫檢視。如果您開啟此外掛程式，您可以切換專案檢視與待辦事項清單。
 Type=Service
 ServiceTypes=KOrganizer/Part
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/timespanview/timespanview.desktop b/korganizer/plugins/timespanview/timespanview.desktop
index 72e403bb0..0efdd9907 100644
--- a/korganizer/plugins/timespanview/timespanview.desktop
+++ b/korganizer/plugins/timespanview/timespanview.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-X-KDE-Library=libkorg_timespanview
+X-TDE-Library=libkorg_timespanview
 Name=Timespan View Plugin for KOrganizer
 Name[af]=Tydlyn aansig inprop module vir KOrganizer
 Name[bg]=Приставка за разпределението на времето в организатора
@@ -88,5 +88,5 @@ Comment[zh_CN]=此插件为 KOrganizer 提供了时间跨度视图(类似于待�
 Comment[zh_TW]=此外掛程式提供時間檢視模式。如果您開啟此外掛程式，您可以切換時間檢視，讓您使用類似甘特圖的圖形來檢視事件。
 Type=Service
 ServiceTypes=KOrganizer/Part
-X-KDE-KOrganizer-HasSettings=false
-X-KDE-PluginInterfaceVersion=2
+X-TDE-KOrganizer-HasSettings=false
+X-TDE-PluginInterfaceVersion=2
diff --git a/korn/KOrn.desktop b/korn/KOrn.desktop
index faec2f932..c795ac491 100644
--- a/korn/KOrn.desktop
+++ b/korn/KOrn.desktop
@@ -73,4 +73,4 @@ Name[ne]=कर्न
 Name[ta]=கார்ன்
 Name[zh_TW]=Korn 信件通知
 X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Office;Email;
+Categories=Qt;TDE;Office;Email;
diff --git a/kresources/birthdays/kabc.desktop b/kresources/birthdays/kabc.desktop
index cea676fa6..493e9aa32 100644
--- a/kresources/birthdays/kabc.desktop
+++ b/kresources/birthdays/kabc.desktop
@@ -54,8 +54,8 @@ Name[tr]=KDE Adres Defterinden Doğum Günleri
 Name[uk]=Дні народження з KAddressBook
 Name[zh_CN]=KAddressBook 中的生日
 Name[zh_TW]=自 KaddressBook 匯入生日
-X-KDE-Library=kcal_kabc
+X-TDE-Library=kcal_kabc
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=birthdays
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=birthdays
diff --git a/kresources/blogging/blogging.desktop b/kresources/blogging/blogging.desktop
index 23b367a93..7714a362a 100644
--- a/kresources/blogging/blogging.desktop
+++ b/kresources/blogging/blogging.desktop
@@ -42,8 +42,8 @@ Name[tr]=Web Günlüğü gibi, bir Sunucuya yazar
 Name[uk]=Журнали як веб-щоденники на сервері
 Name[zh_CN]=日记作为服务器上的博客日志
 Name[zh_TW]=日誌做為伺服器上的部落格
-X-KDE-Library=kcal_blogging
+X-TDE-Library=kcal_blogging
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=blogging
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=blogging
diff --git a/kresources/caldav/kcal_caldav.desktop b/kresources/caldav/kcal_caldav.desktop
index a49607a4d..b237c04b4 100644
--- a/kresources/caldav/kcal_caldav.desktop
+++ b/kresources/caldav/kcal_caldav.desktop
@@ -45,8 +45,8 @@ Name[tr]=CalDAV Sunucusu (ör. Google Calendar)
 Name[uk]=Сервер CalDAV (напр., Google Calendar)
 Name[zh_CN]=CalDAV 服务器(如 Google Calendar)
 Name[zh_TW]=CalDAV 伺服器 (如: Google Calendar)
-X-KDE-Library=kcal_caldav
+X-TDE-Library=kcal_caldav
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=caldav
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=caldav
diff --git a/kresources/carddav/kabc_carddav.desktop b/kresources/carddav/kabc_carddav.desktop
index c7d0b9c12..585d11b36 100644
--- a/kresources/carddav/kabc_carddav.desktop
+++ b/kresources/carddav/kabc_carddav.desktop
@@ -45,8 +45,8 @@ Name[tr]=CardDAV Sunucusu (ör. Zimbra Contacts)
 Name[uk]=Сервер CardDAV (напр., Zimbra Contacts)
 Name[zh_CN]=CardDAV 服务器(如 Zimbra Contacts)
 Name[zh_TW]=CardDAV 伺服器 (如: Zimbra Contacts)
-X-KDE-Library=kabc_carddav
+X-TDE-Library=kabc_carddav
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=carddav
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=carddav
diff --git a/kresources/egroupware/kabc_xmlrpc.desktop b/kresources/egroupware/kabc_xmlrpc.desktop
index d7f8d5d62..6eeb94f33 100644
--- a/kresources/egroupware/kabc_xmlrpc.desktop
+++ b/kresources/egroupware/kabc_xmlrpc.desktop
@@ -43,8 +43,8 @@ Name[tr]=eGroupware Sunucusu (XML-RPC ile)
 Name[uk]=Сервер eGroupware (через XML-RPC)
 Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
-X-KDE-Library=kabc_xmlrpc
+X-TDE-Library=kabc_xmlrpc
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=xmlrpc
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=xmlrpc
diff --git a/kresources/egroupware/kcal_xmlrpc.desktop b/kresources/egroupware/kcal_xmlrpc.desktop
index 93a54217f..4a6134e5d 100644
--- a/kresources/egroupware/kcal_xmlrpc.desktop
+++ b/kresources/egroupware/kcal_xmlrpc.desktop
@@ -43,8 +43,8 @@ Name[tr]=eGroupware Sunucusu (XML-RPC ile)
 Name[uk]=Сервер eGroupware (через XML-RPC)
 Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
-X-KDE-Library=kcal_xmlrpc
+X-TDE-Library=kcal_xmlrpc
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=xmlrpc
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=xmlrpc
diff --git a/kresources/egroupware/knotes_xmlrpc.desktop b/kresources/egroupware/knotes_xmlrpc.desktop
index b3f4faa6a..93d5e4713 100644
--- a/kresources/egroupware/knotes_xmlrpc.desktop
+++ b/kresources/egroupware/knotes_xmlrpc.desktop
@@ -43,8 +43,8 @@ Name[tr]=eGroupware Sunucusu (XML-RPC ile)
 Name[uk]=Сервер eGroupware (через XML-RPC)
 Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
-X-KDE-Library=knotes_xmlrpc
+X-TDE-Library=knotes_xmlrpc
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=notes
-X-KDE-ResourceType=xmlrpc
+X-TDE-ResourceFamily=notes
+X-TDE-ResourceType=xmlrpc
diff --git a/kresources/exchange/exchange.desktop b/kresources/exchange/exchange.desktop
index 5bfe8a1ed..0ee32090c 100644
--- a/kresources/exchange/exchange.desktop
+++ b/kresources/exchange/exchange.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Service
-X-KDE-Library=resourcecalendarexchange
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=exchange
+X-TDE-Library=resourcecalendarexchange
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=exchange
 ServiceTypes=KResources/Plugin
 Name=Exchange 2000 Server
 Name[af]=Exchange 2000 Bediener
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.desktop b/kresources/featureplan/kcal_resourcefeatureplan.desktop
index 11b98fe26..2bca3fbe4 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.desktop
+++ b/kresources/featureplan/kcal_resourcefeatureplan.desktop
@@ -34,8 +34,8 @@ Name[ta]=XML பண்பு திட்டம்
 Name[tr]=XML Özellik Planı
 Name[zh_CN]=XML 特性计划
 Name[zh_TW]=XML 功能計畫
-X-KDE-Library=kcal_resourcefeatureplan
+X-TDE-Library=kcal_resourcefeatureplan
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=featureplan
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=featureplan
diff --git a/kresources/groupdav/kabc_groupdav.desktop b/kresources/groupdav/kabc_groupdav.desktop
index 2d40ff75c..c10ea97c2 100644
--- a/kresources/groupdav/kabc_groupdav.desktop
+++ b/kresources/groupdav/kabc_groupdav.desktop
@@ -45,8 +45,8 @@ Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware)
 Name[uk]=Сервер GroupDAV (напр., OpenGroupware)
 Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware)
 Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware)
-X-KDE-Library=kabc_groupdav
+X-TDE-Library=kabc_groupdav
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=groupdav
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=groupdav
diff --git a/kresources/groupdav/kcal_groupdav.desktop b/kresources/groupdav/kcal_groupdav.desktop
index 9a759663b..288659d6c 100644
--- a/kresources/groupdav/kcal_groupdav.desktop
+++ b/kresources/groupdav/kcal_groupdav.desktop
@@ -45,8 +45,8 @@ Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware)
 Name[uk]=Сервер GroupDAV (напр., OpenGroupware)
 Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware)
 Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware)
-X-KDE-Library=kcal_groupdav
+X-TDE-Library=kcal_groupdav
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=groupdav
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=groupdav
diff --git a/kresources/groupware/kabc_groupware.desktop b/kresources/groupware/kabc_groupware.desktop
index f2c56b26a..dee5d9c24 100644
--- a/kresources/groupware/kabc_groupware.desktop
+++ b/kresources/groupware/kabc_groupware.desktop
@@ -42,8 +42,8 @@ Name[tr]=Grupyazılımı(Groupware) Sunucusu
 Name[uk]=Сервер Groupware
 Name[zh_CN]=群件服务器
 Name[zh_TW]=群組伺服器
-X-KDE-Library=kabc_groupware
+X-TDE-Library=kabc_groupware
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=groupware
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=groupware
diff --git a/kresources/groupware/kcal_groupware.desktop b/kresources/groupware/kcal_groupware.desktop
index 9692900dd..42c4bc9aa 100644
--- a/kresources/groupware/kcal_groupware.desktop
+++ b/kresources/groupware/kcal_groupware.desktop
@@ -42,8 +42,8 @@ Name[tr]=Grupyazılımı(Groupware) Sunucusu
 Name[uk]=Сервер Groupware
 Name[zh_CN]=群件服务器
 Name[zh_TW]=群組伺服器
-X-KDE-Library=kcal_groupware
+X-TDE-Library=kcal_groupware
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=groupware
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=groupware
diff --git a/kresources/groupwise/kabc_groupwise.desktop b/kresources/groupwise/kabc_groupwise.desktop
index e23fe3cab..695ab445b 100644
--- a/kresources/groupwise/kabc_groupwise.desktop
+++ b/kresources/groupwise/kabc_groupwise.desktop
@@ -43,8 +43,8 @@ Name[tr]=Novell GroupWise Sunucusu
 Name[uk]=Сервер Novell GroupWise
 Name[zh_CN]=Novell GroupWise 服务器
 Name[zh_TW]=Novell 群組伺服器
-X-KDE-Library=kabc_groupwise
+X-TDE-Library=kabc_groupwise
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=groupwise
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=groupwise
diff --git a/kresources/groupwise/kcal_groupwise.desktop b/kresources/groupwise/kcal_groupwise.desktop
index 15fb959b3..3933a0ba2 100644
--- a/kresources/groupwise/kcal_groupwise.desktop
+++ b/kresources/groupwise/kcal_groupwise.desktop
@@ -43,8 +43,8 @@ Name[tr]=Novell GroupWise Sunucusu
 Name[uk]=Сервер Novell GroupWise
 Name[zh_CN]=Novell GroupWise 服务器
 Name[zh_TW]=Novell 群組伺服器
-X-KDE-Library=kcal_groupwise
+X-TDE-Library=kcal_groupwise
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=groupwise
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=groupwise
diff --git a/kresources/kolab/kabc/kolab.desktop b/kresources/kolab/kabc/kolab.desktop
index c0c9c80d7..cff369468 100644
--- a/kresources/kolab/kabc/kolab.desktop
+++ b/kresources/kolab/kabc/kolab.desktop
@@ -45,8 +45,8 @@ Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Adres Defteri
 Name[uk]=Адресна книга на сервері IMAP через KMail
 Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的地址簿
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的通訊錄
-X-KDE-Library=kabc_kolab
+X-TDE-Library=kabc_kolab
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=imap
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=imap
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 2617da4a1..ddc31491b 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -532,7 +532,7 @@ bool Incidence::loadAttribute( TQDomElement& element )
         // Unhandled tag - save for later storage
         //kdDebug() << "Saving unhandled tag " << element.tagName() << endl;
         Custom c;
-        c.key = TQCString( "X-KDE-KolabUnhandled-" ) + element.tagName().latin1();
+        c.key = TQCString( "X-TDE-KolabUnhandled-" ) + element.tagName().latin1();
         c.value = element.text();
         mCustomList.append( c );
     }
@@ -574,8 +574,8 @@ void Incidence::saveCustomAttributes( TQDomElement& element ) const
   for ( ; it != mCustomList.end(); ++it ) {
     TQString key = (*it).key;
     Q_ASSERT( !key.isEmpty() );
-    if ( key.startsWith( "X-KDE-KolabUnhandled-" ) ) {
-      key = key.mid( strlen( "X-KDE-KolabUnhandled-" ) );
+    if ( key.startsWith( "X-TDE-KolabUnhandled-" ) ) {
+      key = key.mid( strlen( "X-TDE-KolabUnhandled-" ) );
       writeString( element, key, (*it).value );
     } else {
       // Let's use attributes so that other tag-preserving-code doesn't need sub-elements
diff --git a/kresources/kolab/kcal/kolab.desktop b/kresources/kolab/kcal/kolab.desktop
index 21b412ed2..b8fb5aa2e 100644
--- a/kresources/kolab/kcal/kolab.desktop
+++ b/kresources/kolab/kcal/kolab.desktop
@@ -45,8 +45,8 @@ Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Takvim
 Name[uk]=Календар на сервері IMAP через KMail
 Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的行事曆
-X-KDE-Library=kcal_kolab
+X-TDE-Library=kcal_kolab
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=imap
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=imap
diff --git a/kresources/kolab/knotes/kolabresource.desktop b/kresources/kolab/knotes/kolabresource.desktop
index 5a53529dc..14c7f1571 100644
--- a/kresources/kolab/knotes/kolabresource.desktop
+++ b/kresources/kolab/knotes/kolabresource.desktop
@@ -45,8 +45,8 @@ Name[tr]=KMail aracılığı ile IMAP Sunucu
 Name[uk]=Сервер IMAP через KMail
 Name[zh_CN]=通过 KMail 访问 IMAP 服务器
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器
-X-KDE-Library=knotes_kolab
+X-TDE-Library=knotes_kolab
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=notes
-X-KDE-ResourceType=imap
+X-TDE-ResourceFamily=notes
+X-TDE-ResourceType=imap
diff --git a/kresources/newexchange/kabc_newexchange.desktop b/kresources/newexchange/kabc_newexchange.desktop
index d48d30f29..c48d5f3cf 100644
--- a/kresources/newexchange/kabc_newexchange.desktop
+++ b/kresources/newexchange/kabc_newexchange.desktop
@@ -44,8 +44,8 @@ Name[tr]=Bir Exchange Sunucusu üzerinde Adres Defteri (deneyimsel)
 Name[uk]=Адресна книга на сервері Exchange (експериментальне)
 Name[zh_CN]=Exchange 服务器上的地址簿(试验性)
 Name[zh_TW]=Exchanger 伺服器的通訊錄(實驗中)
-X-KDE-Library=kabc_newexchange
+X-TDE-Library=kabc_newexchange
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=newexchange
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=newexchange
diff --git a/kresources/newexchange/kcal_newexchange.desktop b/kresources/newexchange/kcal_newexchange.desktop
index a0dd29c1e..4b5b335b2 100644
--- a/kresources/newexchange/kcal_newexchange.desktop
+++ b/kresources/newexchange/kcal_newexchange.desktop
@@ -44,8 +44,8 @@ Name[tr]=Bir Exchange Sunucusu üzerinde Takvim (deneyimsel)
 Name[uk]=Календар на сервері Exchange (експериментальне)
 Name[zh_CN]=Exchange 服务器上的日历(试验性)
 Name[zh_TW]=Exchanger 伺服器上的行事曆(實驗中)
-X-KDE-Library=kcal_newexchange
+X-TDE-Library=kcal_newexchange
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=newexchange
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=newexchange
diff --git a/kresources/remote/remote.desktop b/kresources/remote/remote.desktop
index 2ddebc7e4..4b003173c 100644
--- a/kresources/remote/remote.desktop
+++ b/kresources/remote/remote.desktop
@@ -50,8 +50,8 @@ Name[tr]=Uzak Dosyadaki Takvim
 Name[uk]=Календар у віддаленому файлі
 Name[zh_CN]=远程文件中的日历
 Name[zh_TW]=遠端檔案的行事曆
-X-KDE-Library=kcal_remote
+X-TDE-Library=kcal_remote
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=remote
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=remote
diff --git a/kresources/scalix/kabc/scalix.desktop b/kresources/scalix/kabc/scalix.desktop
index 97212513c..e5ae218b2 100644
--- a/kresources/scalix/kabc/scalix.desktop
+++ b/kresources/scalix/kabc/scalix.desktop
@@ -23,8 +23,8 @@ Name[sv]=Adressbok på Scalix-server via Kmail
 Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri
 Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄
-X-KDE-Library=kabc_scalix
+X-TDE-Library=kabc_scalix
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=scalix
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=scalix
diff --git a/kresources/scalix/kcal/scalix.desktop b/kresources/scalix/kcal/scalix.desktop
index 2d87bfcbe..097f6968a 100644
--- a/kresources/scalix/kcal/scalix.desktop
+++ b/kresources/scalix/kcal/scalix.desktop
@@ -24,8 +24,8 @@ Name[sv]=Kalender på Scalix-server via Kmail
 Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
 Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的行事曆
-X-KDE-Library=kcal_scalix
+X-TDE-Library=kcal_scalix
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=scalix
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=scalix
diff --git a/kresources/scalix/knotes/scalix.desktop b/kresources/scalix/knotes/scalix.desktop
index 82c34afa6..1ef606493 100644
--- a/kresources/scalix/knotes/scalix.desktop
+++ b/kresources/scalix/knotes/scalix.desktop
@@ -23,8 +23,8 @@ Name[sv]=Anteckningar på Scalix-server via Kmail
 Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim
 Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的便條
-X-KDE-Library=knotes_scalix
+X-TDE-Library=knotes_scalix
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=notes
-X-KDE-ResourceType=scalix
+X-TDE-ResourceFamily=notes
+X-TDE-ResourceType=scalix
diff --git a/kresources/slox/kabc_ox.desktop b/kresources/slox/kabc_ox.desktop
index 8388f0800..39570ad29 100644
--- a/kresources/slox/kabc_ox.desktop
+++ b/kresources/slox/kabc_ox.desktop
@@ -39,8 +39,8 @@ Name[tr]=OpenXchange Sunucusu
 Name[uk]=Сервер OpenXchange
 Name[zh_CN]=OpenXchange 服务器
 Name[zh_TW]=OpenXchange 伺服器
-X-KDE-Library=kabc_slox
+X-TDE-Library=kabc_slox
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=ox
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=ox
diff --git a/kresources/slox/kabc_slox.desktop b/kresources/slox/kabc_slox.desktop
index 5a0192caa..6c7b0352c 100644
--- a/kresources/slox/kabc_slox.desktop
+++ b/kresources/slox/kabc_slox.desktop
@@ -44,8 +44,8 @@ Name[tr]=SUSE LINUX Openexchange Sunucusu
 Name[uk]=Сервер SUSE LINUX Openexchange
 Name[zh_CN]=SUSE LINUX Openexchange 服务器
 Name[zh_TW]=SUSE LINUX Openexchange 伺服器
-X-KDE-Library=kabc_slox
+X-TDE-Library=kabc_slox
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=contact
-X-KDE-ResourceType=slox
+X-TDE-ResourceFamily=contact
+X-TDE-ResourceType=slox
diff --git a/kresources/slox/kcal_ox.desktop b/kresources/slox/kcal_ox.desktop
index 5bc7600ae..6d0e5ec66 100644
--- a/kresources/slox/kcal_ox.desktop
+++ b/kresources/slox/kcal_ox.desktop
@@ -39,8 +39,8 @@ Name[tr]=OpenXchange Sunucusu
 Name[uk]=Сервер OpenXchange
 Name[zh_CN]=OpenXchange 服务器
 Name[zh_TW]=OpenXchange 伺服器
-X-KDE-Library=kcal_slox
+X-TDE-Library=kcal_slox
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=ox
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=ox
diff --git a/kresources/slox/kcal_slox.desktop b/kresources/slox/kcal_slox.desktop
index b4fe8e7a8..9b9198d73 100644
--- a/kresources/slox/kcal_slox.desktop
+++ b/kresources/slox/kcal_slox.desktop
@@ -44,8 +44,8 @@ Name[tr]=SUSE LINUX Openexchange Sunucusu
 Name[uk]=Сервер SUSE LINUX Openexchange
 Name[zh_CN]=SUSE LINUX Openexchange 服务器
 Name[zh_TW]=SUSE LINUX Openexchange 伺服器
-X-KDE-Library=kcal_slox
+X-TDE-Library=kcal_slox
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=slox
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=slox
diff --git a/kresources/tvanytime/kcal_tvanytime.desktop b/kresources/tvanytime/kcal_tvanytime.desktop
index 217c8e400..9f6eef3c2 100644
--- a/kresources/tvanytime/kcal_tvanytime.desktop
+++ b/kresources/tvanytime/kcal_tvanytime.desktop
@@ -44,8 +44,8 @@ Name[tr]=TV Programı
 Name[uk]=Програма телебачення
 Name[zh_CN]=电视日程安排
 Name[zh_TW]=電視時刻表
-X-KDE-Library=kcal_tvanytime
+X-TDE-Library=kcal_tvanytime
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=tvschedule
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=tvschedule
diff --git a/ktnef/gui/ktnef.desktop b/ktnef/gui/ktnef.desktop
index e52850567..2a45f1e83 100644
--- a/ktnef/gui/ktnef.desktop
+++ b/ktnef/gui/ktnef.desktop
@@ -104,4 +104,4 @@ Comment[zh_CN]=TNEF 文件的查看/提取器
 Comment[zh_TW]=TNEF 檔案檢視器
 Terminal=false
 MimeType=application/ms-tnef;
-Categories=Qt;KDE;Office;
+Categories=Qt;TDE;Office;
diff --git a/libkcal/DESIGN b/libkcal/DESIGN
index 37023c1a4..aecd10e85 100644
--- a/libkcal/DESIGN
+++ b/libkcal/DESIGN
@@ -41,7 +41,7 @@ The get-method that returns the schedulingID checks if this is set
 at all. If not, it returns the UID. And when the incidence is saved in
 iCal, the schedulingID (i.e. the UID if no SID is there) is saved in
 the iCal UID field, and if schedulingID is not null, the UID of the
-incidence is saved in X-KDE-LIBKCAL-ID. The reason for this is
+incidence is saved in X-TDE-LIBKCAL-ID. The reason for this is
 compatibility with other iCal based applications, because they expect
 the UID of the invitation to be saved in the iCal UID field. In the
 Kolab resource XML format, there is a tag <scheduling-id> where it is
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index ca31645a8..7940d23c5 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -60,7 +60,7 @@ void CustomProperties::setCustomProperty(const TQCString &app, const TQCString &
 {
   if (value.isNull() || key.isEmpty() || app.isEmpty())
     return;
-  TQCString property = "X-KDE-" + app + "-" + key;
+  TQCString property = "X-TDE-" + app + "-" + key;
   if (!checkName(property))
     return;
   mProperties[property] = value;
@@ -69,12 +69,12 @@ void CustomProperties::setCustomProperty(const TQCString &app, const TQCString &
 
 void CustomProperties::removeCustomProperty(const TQCString &app, const TQCString &key)
 {
-  removeNonKDECustomProperty(TQCString("X-KDE-" + app + "-" + key));
+  removeNonKDECustomProperty(TQCString("X-TDE-" + app + "-" + key));
 }
 
 TQString CustomProperties::customProperty(const TQCString &app, const TQCString &key) const
 {
-  return nonKDECustomProperty(TQCString("X-KDE-" + app + "-" + key));
+  return nonKDECustomProperty(TQCString("X-TDE-" + app + "-" + key));
 }
 
 void CustomProperties::setNonKDECustomProperty(const TQCString &name, const TQString &value)
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index c840f69e6..e1b020dc6 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -33,7 +33,7 @@ namespace KCal {
 /**
   This class represents custom calendar properties.
   It is used as a base class for classes which represent calendar components.
-  A custom property name written by libkcal has the form X-KDE-APP-KEY where
+  A custom property name written by libkcal has the form X-TDE-APP-KEY where
   APP represents the application name, and KEY distinguishes individual
   properties for the application.
   In keeping with RFC2445, property names must be composed only of the
diff --git a/libkcal/kcal_manager.desktop b/libkcal/kcal_manager.desktop
index a2e57091a..263dbd706 100644
--- a/libkcal/kcal_manager.desktop
+++ b/libkcal/kcal_manager.desktop
@@ -60,4 +60,4 @@ Name[zh_TW]=行事曆
 Type=Service
 ServiceTypes=KResources/Manager
 
-X-KDE-ResourceFamily=calendar
+X-TDE-ResourceFamily=calendar
diff --git a/libkcal/local.desktop b/libkcal/local.desktop
index 9cf91413e..a1ca7a083 100644
--- a/libkcal/local.desktop
+++ b/libkcal/local.desktop
@@ -52,8 +52,8 @@ Name[tr]=Yerel Dosyadaki Takvim
 Name[uk]=Календар у локальному файлі
 Name[zh_CN]=本地文件中的日历
 Name[zh_TW]=本地檔案中的行事曆
-X-KDE-Library=kcal_local
+X-TDE-Library=kcal_local
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=file
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=file
diff --git a/libkcal/localdir.desktop b/libkcal/localdir.desktop
index d7e4b4137..54e7ac46d 100644
--- a/libkcal/localdir.desktop
+++ b/libkcal/localdir.desktop
@@ -52,8 +52,8 @@ Name[tr]=Yerel Dizindeki Takvim
 Name[uk]=Календар у локальному каталозі
 Name[zh_CN]=本地目录中的日历
 Name[zh_TW]=本地目錄中的行事曆
-X-KDE-Library=kcal_localdir
+X-TDE-Library=kcal_localdir
 Type=Service
 ServiceTypes=KResources/Plugin
-X-KDE-ResourceFamily=calendar
-X-KDE-ResourceType=localdir
+X-TDE-ResourceFamily=calendar
+X-TDE-ResourceType=localdir
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase01.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase01.ics
index 3e8d86844..fff4fa885 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase01.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase01.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 days
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase02.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase02.ics
index 84ff2b68b..0bcae4a63 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase02.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase02.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 3 weeks on Tu\, Sa and Su
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase03.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase03.ics
index d2065905e..1fccb050e 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase03.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase03.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 hours
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase04.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase04.ics
index f2a55fd41..437c42afa 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase04.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase04.ics
@@ -17,7 +17,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 hours 3 minutes
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT4H3M
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase05.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase05.ics
index ef7311eb4..4a65cd39d 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase05.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase05.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 2 months on the 24th
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase06.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase06.ics
index 4d65ed9ad..db3e221a3 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase06.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase06.ics
@@ -15,15 +15,15 @@ BEGIN:VALARM
 DESCRIPTION:At login
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 BEGIN:VALARM
 DESCRIPTION:At login
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:-P9DT35S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
-X-KDE-KALARM-TYPE:LOGIN
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-TYPE:LOGIN
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase07.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase07.ics
index f141388fe..8ab3ae731 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase07.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase07.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:every 3 years on the 3. tuesday in may and november
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase08.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase08.ics
index 3f71409d1..13bbdbc6e 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase08.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase08.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:every 2 months on the 2nd-to-last wednesday
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase09.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase09.ics
index 8912493ed..14d76646a 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase09.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase09.ics
@@ -17,7 +17,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 minutes
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT16M
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase10.ics b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase10.ics
index db2b5eb81..06751468e 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase10.ics
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCase10.ics
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:every 2 years on the 27. of march\, july and november
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCases.ics.all b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCases.ics.all
index da63af3fe..fe0fac389 100644
--- a/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCases.ics.all
+++ b/libkcal/tests/data/RecurrenceRule/KAlarm_3.4/KAlarm_TestCases.ics.all
@@ -16,7 +16,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 days
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -36,7 +36,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 3 weeks on Tu\, Sa and Su
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -56,7 +56,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 hours
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -77,7 +77,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 hours 3 minutes
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT4H3M
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -97,7 +97,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 2 months on the 24th
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -116,15 +116,15 @@ BEGIN:VALARM
 DESCRIPTION:At login
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 BEGIN:VALARM
 DESCRIPTION:At login
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:-P9DT35S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
-X-KDE-KALARM-TYPE:LOGIN
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-TYPE:LOGIN
 END:VALARM
 
 END:VEVENT
@@ -144,7 +144,7 @@ BEGIN:VALARM
 DESCRIPTION:every 3 years on the 3. tuesday in may and november
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -164,7 +164,7 @@ BEGIN:VALARM
 DESCRIPTION:every 2 months on the 2nd-to-last wednesday
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -185,7 +185,7 @@ BEGIN:VALARM
 DESCRIPTION:Every 4 minutes
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT16M
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
@@ -205,7 +205,7 @@ BEGIN:VALARM
 DESCRIPTION:every 2 years on the 27. of march\, july and november
 ACTION:DISPLAY
 TRIGGER;VALUE=DURATION:PT0S
-X-KDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
+X-TDE-KALARM-FONTCOLOR:#ff0000\;#000000\;
 END:VALARM
 
 END:VEVENT
diff --git a/libkcal/tests/testfb.cpp b/libkcal/tests/testfb.cpp
index c72d0071f..819827921 100644
--- a/libkcal/tests/testfb.cpp
+++ b/libkcal/tests/testfb.cpp
@@ -37,7 +37,7 @@ int main( int, char ** )
     "VERSION:2.0\n"
     "BEGIN:VFREEBUSY\n"
     "ORGANIZER:MAILTO:[email protected]\n"
-    "X-KDE-Foo:bla\n"
+    "X-TDE-Foo:bla\n"
     "DTSTAMP:20071202T152453Z\n"
     "URL:http://mail.kdab.net/freebusy/test3%40kdab.net.ifb\n"
     "DTSTART:19700101T000000Z\n"
diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index 00b178ef4..5ceb12582 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -4,10 +4,10 @@ Icon=komposer
 Type=Application
 Terminal=false
 
-X-KDE-ModuleType=Library
-X-KDE-Library=komposer
-X-KDE-FactoryName=komposerconfig
-X-KDE-HasReadOnlyMode=false
+X-TDE-ModuleType=Library
+X-TDE-Library=komposer
+X-TDE-FactoryName=komposerconfig
+X-TDE-HasReadOnlyMode=false
 
 Name=Komposer
 Name[cy]=Kyfansoddydd
diff --git a/libtdepim/komposer/core/komposereditor.desktop b/libtdepim/komposer/core/komposereditor.desktop
index fd1c1341e..9d5347af7 100644
--- a/libtdepim/komposer/core/komposereditor.desktop
+++ b/libtdepim/komposer/core/komposereditor.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Komposer/Editor
-X-KDE-Derived=Komposer/Plugin
+X-TDE-ServiceType=Komposer/Editor
+X-TDE-Derived=Komposer/Plugin
 Comment=Komposer Editor
 Comment[af]=Komposer Redigeerder
 Comment[bg]=Писане на форматиран текст
diff --git a/libtdepim/komposer/core/komposerplugin.desktop b/libtdepim/komposer/core/komposerplugin.desktop
index b398e1c67..39dfdb6c2 100644
--- a/libtdepim/komposer/core/komposerplugin.desktop
+++ b/libtdepim/komposer/core/komposerplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=Komposer/Plugin
-X-KDE-Derived=KPluginInfo
+X-TDE-ServiceType=Komposer/Plugin
+X-TDE-Derived=KPluginInfo
 Name=Komposer Plugin
 Name[af]=Komposer inprop module
 Name[bg]=Приставка за Komposer
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2a55d7349..1a64a6753 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -311,7 +311,7 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
   int error = 0;
   Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>(
     TQString::fromLatin1( "Komposer/Plugin" ),
-    TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+    TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
     this, 0, TQStringList(), &error );
 
   if ( plugin ) {
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 38895f7b6..442914508 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -69,7 +69,7 @@ namespace Komposer
                                                = TQString() ) const;
 
     /**
-     * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name
+     * @brief Search by plugin name. This is the key used as X-TDE-PluginInfo-Name
      * in the .desktop file, e.g. "komposer_attachment"
      *
      * @return The @ref Plugin object found by the search, or a null
@@ -135,7 +135,7 @@ namespace Komposer
      * config file.
      *
      * @param name is the name of the plugin as it is listed in the .desktop
-     * file in the X-KDE-Library field.
+     * file in the X-TDE-Library field.
      *
      * Returns false when no appropriate plugin can be found.
      */
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index e3fdc5824..5aed441a9 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -108,7 +108,7 @@ EditorSelection::readConfig()
     if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )
       continue;
 
-    TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString();
+    TQString name = (*it)->property( "X-TDE-KomposerIdentifier" ).toString();
     m_editorsCombo->insertItem( name );
     if ( m_reference.contains( name ) )
       m_editorsCombo->setCurrentItem( i );
@@ -118,7 +118,7 @@ EditorSelection::readConfig()
 void EditorSelection::writeConfig()
 {
   m_reference =  m_services[ m_editorsCombo->currentText()]->
-                 property( "X-KDE-KomposerIdentifier" ).toString();
+                 property( "X-TDE-KomposerIdentifier" ).toString();
 }
 
 void
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.desktop b/libtdepim/komposer/plugins/default/defaulteditor.desktop
index 910f7d89c..fba95cff6 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.desktop
+++ b/libtdepim/komposer/plugins/default/defaulteditor.desktop
@@ -3,19 +3,19 @@ Type=Service
 Icon=editor
 ServiceTypes=Komposer/Editor
 
-X-KDE-Library=libkomposer_defaulteditor
+X-TDE-Library=libkomposer_defaulteditor
 X-Komposer-Version=1
 X-Komposer-Weight=10
 
-X-KDE-PluginInfo-Author=Zack Rusin
[email protected]
-X-KDE-PluginInfo-Name=komposer_defaulteditor
-X-KDE-PluginInfo-Version=0.0.1
-X-KDE-PluginInfo-Website=http://www.kde.org
-X-KDE-PluginInfo-Category=Editors
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-PluginInfo-Author=Zack Rusin
[email protected]
+X-TDE-PluginInfo-Name=komposer_defaulteditor
+X-TDE-PluginInfo-Version=0.0.1
+X-TDE-PluginInfo-Website=http://www.kde.org
+X-TDE-PluginInfo-Category=Editors
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=LGPL
+X-TDE-PluginInfo-EnabledByDefault=true
 Name=Komposer Editor
 Name[af]=Komposer Redigeerder
 Name[bg]=Редактор за Komposer
diff --git a/libtdepim/pluginloaderbase.cpp b/libtdepim/pluginloaderbase.cpp
index 60a925efa..7bf768fda 100644
--- a/libtdepim/pluginloaderbase.cpp
+++ b/libtdepim/pluginloaderbase.cpp
@@ -80,9 +80,9 @@ namespace KPIM {
 	  continue;
 	}
 
-	const TQString library = config.readEntry( "X-KDE-Library" );
+	const TQString library = config.readEntry( "X-TDE-Library" );
 	if ( library.isEmpty() ) {
-	  warning() << "missing or empty [Plugin]X-KDE-Library value in \""
+	  warning() << "missing or empty [Plugin]X-TDE-Library value in \""
 		    << *it << "\" - skipping" << endl;
 	  continue;
 	}
diff --git a/plugins/kmail/bodypartformatter/text_calendar.desktop b/plugins/kmail/bodypartformatter/text_calendar.desktop
index 1321d5835..2f9ab0a20 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.desktop
+++ b/plugins/kmail/bodypartformatter/text_calendar.desktop
@@ -81,4 +81,4 @@ Comment[zh_TW]=text/calendar 格式化外掛程式
 
 [Plugin]
 Type=text/calendar
-X-KDE-Library=libkmail_bodypartformatter_text_calendar
+X-TDE-Library=libkmail_bodypartformatter_text_calendar
diff --git a/plugins/kmail/bodypartformatter/text_vcard.desktop b/plugins/kmail/bodypartformatter/text_vcard.desktop
index 87cbf490e..ae697bd5e 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.desktop
+++ b/plugins/kmail/bodypartformatter/text_vcard.desktop
@@ -82,4 +82,4 @@ Comment[zh_TW]=text/vCard 格式化外掛程式
 
 [Plugin]
 Type=text/x-vcard
-X-KDE-Library=libkmail_bodypartformatter_text_vcard
+X-TDE-Library=libkmail_bodypartformatter_text_vcard
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.desktop b/plugins/kmail/bodypartformatter/text_xdiff.desktop
index e04220538..cadd1d27f 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.desktop
+++ b/plugins/kmail/bodypartformatter/text_xdiff.desktop
@@ -78,4 +78,4 @@ Comment[zh_CN]=text/x-diff 的格式化插件
 Comment[zh_TW]=text/x-diff 格式化外掛程式
 [Plugin]
 Type=text/x-diff
-X-KDE-Library=libkmail_bodypartformatter_text_xdiff
+X-TDE-Library=libkmail_bodypartformatter_text_xdiff
diff --git a/wizards/groupwarewizard.desktop b/wizards/groupwarewizard.desktop
index da879b0a2..8dc1ad434 100644
--- a/wizards/groupwarewizard.desktop
+++ b/wizards/groupwarewizard.desktop
@@ -48,5 +48,5 @@ Exec=groupwarewizard
 Type=Application
 Icon=kontact
 Terminal=false
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Office;