Update XDG information in support of bug report 892.

31 files changed, 205 insertions, 205 deletions

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