Update XDG information in support of bug report 892.

44 files changed, 86 insertions, 86 deletions

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" ) )