Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications

156 files changed, 168 insertions, 168 deletions

diff --git a/akregator/src/akregator.desktop b/akregator/src/akregator.desktop
index 0c8d051e9..5b292858a 100644
--- a/akregator/src/akregator.desktop
+++ b/akregator/src/akregator.desktop
@@ -4,7 +4,7 @@ Name[ne]=एक्रिगेटर
 Exec=akregator %i %m -caption "%c"
 Icon=akregator
 Type=Application
-DocPath=akregator/index.html
+X-DocPath=akregator/index.html
 GenericName=RSS Feed Reader
 GenericName[af]=RSS stroom leser
 GenericName[bg]=Четец на новости RSS
diff --git a/akregator/src/akregator_part.desktop b/akregator/src/akregator_part.desktop
index fa0da1c65..87189604e 100644
--- a/akregator/src/akregator_part.desktop
+++ b/akregator/src/akregator_part.desktop
@@ -7,7 +7,7 @@ Name[nds]=aKregator-Komponent
 Name[pt_BR]=Componente do aKregator
 Name[sv]=aKregator-delprogram
 Name[ta]=aKregatorபகுதி
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libakregatorpart
 Type=Service
 Icon=akregator
diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
index 61323a87f..4d932dcfb 100644
--- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
+++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
@@ -94,7 +94,7 @@ Comment[uk]=Втулок для Akregator
 Comment[uz]=Akregator учун плагин
 Comment[zh_CN]=Akregator 插件
 Comment[zh_TW]=Akregator 外掛程式
-ServiceTypes=Akregator/Plugin
+X-TDE-ServiceTypes=Akregator/Plugin
 
 X-TDE-akregator-plugintype=storage
 X-TDE-akregator-name=metakit
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index c43304fbc..fe10f6622 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration-appearance.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration-appearance.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index fed41a746..9232d2d7f 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration.html#configuration-directory-services
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration.html#configuration-directory-services
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index 9f0dc414d..12e00458c 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration-dn-order.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration-dn-order.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/kleopatra.desktop b/certmanager/kleopatra.desktop
index 710a1ada0..2fab4ee7a 100644
--- a/certmanager/kleopatra.desktop
+++ b/certmanager/kleopatra.desktop
@@ -122,4 +122,4 @@ GenericName[zh_CN]=证书管理器和统一的密钥操作界面
 GenericName[zh_TW]=憑證管理與統一加密介面
 Terminal=false
 X-TDE-StartupNotify=true
-DocPath=kleopatra/index.html
+X-DocPath=kleopatra/index.html
diff --git a/kaddressbook/editors/cryptosettings.desktop b/kaddressbook/editors/cryptosettings.desktop
index 063613f83..cb7270c23 100644
--- a/kaddressbook/editors/cryptosettings.desktop
+++ b/kaddressbook/editors/cryptosettings.desktop
@@ -51,5 +51,5 @@ Name[uk]=Параметри шифрування
 Name[zh_CN]=加密首选项
 Name[zh_TW]=加密設定
 Type=Service
-ServiceTypes=KAddressBook/ContactEditorWidget
+X-TDE-ServiceTypes=KAddressBook/ContactEditorWidget
 X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/imaddresseditor.desktop b/kaddressbook/editors/imaddresseditor.desktop
index 205e0f0d0..47f0f56d5 100644
--- a/kaddressbook/editors/imaddresseditor.desktop
+++ b/kaddressbook/editors/imaddresseditor.desktop
@@ -96,6 +96,6 @@ Comment[tr]=Hızlı Mesajlaşma Adres Düzenleyicisi
 Comment[uk]=Редактор адрес миттєвого зв'язку
 Comment[zh_CN]=即时通讯地址编辑器
 Comment[zh_TW]=即時通訊位址編輯器
-ServiceTypes=KAddressBook/ContactEditorWidget
+X-TDE-ServiceTypes=KAddressBook/ContactEditorWidget
 X-TDE-Library=libkaddrbk_instantmessaging
 X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/protocols/aimprotocol.desktop b/kaddressbook/editors/protocols/aimprotocol.desktop
index 05bdad5cf..ee594e27d 100644
--- a/kaddressbook/editors/protocols/aimprotocol.desktop
+++ b/kaddressbook/editors/protocols/aimprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=aim_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/aim
 Comment=AIM Protocol
 Comment[ar]=ميفاق AIM
diff --git a/kaddressbook/editors/protocols/gaduprotocol.desktop b/kaddressbook/editors/protocols/gaduprotocol.desktop
index 4b739297c..15d1a2796 100644
--- a/kaddressbook/editors/protocols/gaduprotocol.desktop
+++ b/kaddressbook/editors/protocols/gaduprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=gadu_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/gadu
 Comment=Gadu-Gadu Protocol
 Comment[af]=Gadu-Gadu protokol
diff --git a/kaddressbook/editors/protocols/groupwiseprotocol.desktop b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
index d60c62898..fc6ccbd2a 100644
--- a/kaddressbook/editors/protocols/groupwiseprotocol.desktop
+++ b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=groupwise_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/groupwise
 Comment=Novell GroupWise Messenger
 Comment[af]=Novell GroupWise boodskappe
diff --git a/kaddressbook/editors/protocols/icqprotocol.desktop b/kaddressbook/editors/protocols/icqprotocol.desktop
index 1c578aea3..5506acae7 100644
--- a/kaddressbook/editors/protocols/icqprotocol.desktop
+++ b/kaddressbook/editors/protocols/icqprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=icq_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/icq
 Comment=ICQ Protocol
 Comment[af]=ICQ protokol
diff --git a/kaddressbook/editors/protocols/ircprotocol.desktop b/kaddressbook/editors/protocols/ircprotocol.desktop
index a0380f2c1..315834428 100644
--- a/kaddressbook/editors/protocols/ircprotocol.desktop
+++ b/kaddressbook/editors/protocols/ircprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=irc_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/irc
 Comment=Internet Relay Chat
 Comment[bg]=Протокол IRC
diff --git a/kaddressbook/editors/protocols/jabberprotocol.desktop b/kaddressbook/editors/protocols/jabberprotocol.desktop
index f70ffc51d..ff47a0277 100644
--- a/kaddressbook/editors/protocols/jabberprotocol.desktop
+++ b/kaddressbook/editors/protocols/jabberprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=jabber_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/xmpp
 Comment=Jabber Protocol
 Comment[af]=Jabber protokol
diff --git a/kaddressbook/editors/protocols/meanwhileprotocol.desktop b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
index e011e778b..1379762b0 100644
--- a/kaddressbook/editors/protocols/meanwhileprotocol.desktop
+++ b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=meanwhile_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/meanwhile
 Comment=Meanwhile Protocol
 Comment[af]=Meanwhile protokol
diff --git a/kaddressbook/editors/protocols/msnprotocol.desktop b/kaddressbook/editors/protocols/msnprotocol.desktop
index 148137159..2f3f533f7 100644
--- a/kaddressbook/editors/protocols/msnprotocol.desktop
+++ b/kaddressbook/editors/protocols/msnprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=msn_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/msn
 Comment=MSN Messenger
 Comment[af]=MSN boodskapper
diff --git a/kaddressbook/editors/protocols/skypeprotocol.desktop b/kaddressbook/editors/protocols/skypeprotocol.desktop
index 79ad339a8..aea8e75a3 100644
--- a/kaddressbook/editors/protocols/skypeprotocol.desktop
+++ b/kaddressbook/editors/protocols/skypeprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=skype_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/skype
 Comment=Skype Internet Telephony
 Comment[af]=Skype Internet Telefoon
diff --git a/kaddressbook/editors/protocols/smsprotocol.desktop b/kaddressbook/editors/protocols/smsprotocol.desktop
index 975082eac..94c31f8b5 100644
--- a/kaddressbook/editors/protocols/smsprotocol.desktop
+++ b/kaddressbook/editors/protocols/smsprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=sms_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/sms
 Comment=SMS Protocol
 Comment[af]=SMS protokol
diff --git a/kaddressbook/editors/protocols/yahooprotocol.desktop b/kaddressbook/editors/protocols/yahooprotocol.desktop
index 9849e1461..79091727b 100644
--- a/kaddressbook/editors/protocols/yahooprotocol.desktop
+++ b/kaddressbook/editors/protocols/yahooprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=yahoo_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/yahoo
 Comment=Yahoo Protocol
 Comment[af]=Yahoo protokol
diff --git a/kaddressbook/features/distributionlist.desktop b/kaddressbook/features/distributionlist.desktop
index 0afd5d4bf..fcb294f82 100644
--- a/kaddressbook/features/distributionlist.desktop
+++ b/kaddressbook/features/distributionlist.desktop
@@ -108,5 +108,5 @@ Comment[uz]=Тарқатиш рўйхатларни бошқариш учу пл
 Comment[zh_CN]=管理分发列表的插件
 Comment[zh_TW]=管理分配清單外掛程式
 Type=Service
-ServiceTypes=KAddressBook/Extension
+X-TDE-ServiceTypes=KAddressBook/Extension
 X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/features/distributionlistng.desktop b/kaddressbook/features/distributionlistng.desktop
index cef774280..a92e1676f 100644
--- a/kaddressbook/features/distributionlistng.desktop
+++ b/kaddressbook/features/distributionlistng.desktop
@@ -74,5 +74,5 @@ Comment[uz]=Тарқатиш рўйхатларни бошқариш учу пл
 Comment[zh_CN]=管理分发列表的插件
 Comment[zh_TW]=管理分配清單外掛程式
 Type=Service
-ServiceTypes=KAddressBook/Extension
+X-TDE-ServiceTypes=KAddressBook/Extension
 X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/features/resourceselection.desktop b/kaddressbook/features/resourceselection.desktop
index 4fb70bed6..69675d0ce 100644
--- a/kaddressbook/features/resourceselection.desktop
+++ b/kaddressbook/features/resourceselection.desktop
@@ -104,5 +104,5 @@ Comment[uk]=Втулок для керування адресними книга
 Comment[zh_CN]=管理地址簿的插件
 Comment[zh_TW]=管理通訊錄外掛程式
 Type=Service
-ServiceTypes=KAddressBook/Extension
+X-TDE-ServiceTypes=KAddressBook/Extension
 X-TDE-KAddressBook-ExtensionPluginVersion=1
diff --git a/kaddressbook/kaddressbook.desktop b/kaddressbook/kaddressbook.desktop
index 73aa11d5e..3842037e1 100644
--- a/kaddressbook/kaddressbook.desktop
+++ b/kaddressbook/kaddressbook.desktop
@@ -70,12 +70,12 @@ GenericName[zh_CN]=地址管理器
 Exec=kaddressbook %u
 Icon=kaddressbook
 Type=Application
-DocPath=kaddressbook/index.html
+X-DocPath=kaddressbook/index.html
 Terminal=false
 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-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook
 X-TDE-Library=libkaddressbookpart
 Categories=Qt;TDE;Office;ContactManagement;X-TDE-Office-PIM;
diff --git a/kaddressbook/kcmconfigs/kabconfig.desktop b/kaddressbook/kcmconfigs/kabconfig.desktop
index 5db69694a..ef962bfd0 100644
--- a/kaddressbook/kcmconfigs/kabconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabconfig.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=kaddressbook
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kaddressbook/preferences.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kabconfig
diff --git a/kaddressbook/kcmconfigs/kabcustomfields.desktop b/kaddressbook/kcmconfigs/kabcustomfields.desktop
index 60641801f..bb03d8186 100644
--- a/kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ b/kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=dlgedit
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kaddressbook/preferences.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kaddressbook/preferences.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kabcustomfields
diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop
index 8a078bfb7..0af721a29 100644
--- a/kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=find
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kaddressbook/preferences.html#preferences-ldap-lookup
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kabldapconfig
diff --git a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
index 1c10ab8b4..ffa63a091 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
+++ b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
@@ -50,7 +50,7 @@ Name[tr]=Elektronik İş Kartı Dosyaları
 Name[uk]=файли електронних візитних карток
 Name[zh_CN]=电子名片文件
 Name[zh_TW]=電子名片檔
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=text/x-vcard,text/x-ldif
 X-TDE-Library=ldifvcardthumbnail
 CacheThumbnail=false
diff --git a/kaddressbook/views/cardview.desktop b/kaddressbook/views/cardview.desktop
index 30d81b86e..1b72a5b9b 100644
--- a/kaddressbook/views/cardview.desktop
+++ b/kaddressbook/views/cardview.desktop
@@ -57,5 +57,5 @@ Name[uk]=Вигляд картками
 Name[zh_CN]=卡片视图
 Name[zh_TW]=卡片檢視
 Type=Service
-ServiceTypes=KAddressBook/View
+X-TDE-ServiceTypes=KAddressBook/View
 X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/views/iconview.desktop b/kaddressbook/views/iconview.desktop
index 17a7b1be7..43c5d387a 100644
--- a/kaddressbook/views/iconview.desktop
+++ b/kaddressbook/views/iconview.desktop
@@ -70,5 +70,5 @@ Name[zh_CN]=图标视图
 Name[zh_TW]=圖示檢視
 Name[zu]=Umboniso we Icon
 Type=Service
-ServiceTypes=KAddressBook/View
+X-TDE-ServiceTypes=KAddressBook/View
 X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/views/tableview.desktop b/kaddressbook/views/tableview.desktop
index 501a9f890..dccf7566d 100644
--- a/kaddressbook/views/tableview.desktop
+++ b/kaddressbook/views/tableview.desktop
@@ -58,5 +58,5 @@ Name[uz]=Жадвал кўринишида
 Name[zh_CN]=表格视图
 Name[zh_TW]=表格檢視
 Type=Service
-ServiceTypes=KAddressBook/View
+X-TDE-ServiceTypes=KAddressBook/View
 X-TDE-KAddressBook-ViewPluginVersion=1
diff --git a/kaddressbook/xxport/bookmark_xxport.desktop b/kaddressbook/xxport/bookmark_xxport.desktop
index 47c9e4552..4beaa53a3 100644
--- a/kaddressbook/xxport/bookmark_xxport.desktop
+++ b/kaddressbook/xxport/bookmark_xxport.desktop
@@ -97,5 +97,5 @@ Comment[uk]=Втулок для експорту адрес контактів �
 Comment[zh_CN]=将联系人的网址导出为书签的插件
 Comment[zh_TW]=匯出聯絡人的網頁成書籤的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/csv_xxport.desktop b/kaddressbook/xxport/csv_xxport.desktop
index 15a9383bd..8f185580d 100644
--- a/kaddressbook/xxport/csv_xxport.desktop
+++ b/kaddressbook/xxport/csv_xxport.desktop
@@ -96,5 +96,5 @@ Comment[uk]=Втулок для імпорту та експорту конта�
 Comment[zh_CN]=导入和导出 CSV 格式联系人的插件
 Comment[zh_TW]=以 CSV 格式匯入與匯出聯絡人外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/eudora_xxport.desktop b/kaddressbook/xxport/eudora_xxport.desktop
index a34cab7e9..65484ae5c 100644
--- a/kaddressbook/xxport/eudora_xxport.desktop
+++ b/kaddressbook/xxport/eudora_xxport.desktop
@@ -98,5 +98,5 @@ Comment[uk]=Втулок для імпорту та експорту конта�
 Comment[zh_CN]=导入和导出 Eudora 联系人的插件
 Comment[zh_TW]=匯入與匯出 Eudora 聯絡人的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/gnokii_xxport.desktop b/kaddressbook/xxport/gnokii_xxport.desktop
index 4e6525728..43d066997 100644
--- a/kaddressbook/xxport/gnokii_xxport.desktop
+++ b/kaddressbook/xxport/gnokii_xxport.desktop
@@ -97,5 +97,5 @@ Comment[uk]=Втулок для імпорту та експорту запис�
 Comment[zh_CN]=导入和导出地址簿项的移动电话插件
 Comment[zh_TW]=匯入與匯出通訊錄的手機外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/kde2_xxport.desktop b/kaddressbook/xxport/kde2_xxport.desktop
index 43fad3152..e99621b1a 100644
--- a/kaddressbook/xxport/kde2_xxport.desktop
+++ b/kaddressbook/xxport/kde2_xxport.desktop
@@ -99,5 +99,5 @@ Comment[uz]=Эски KDE 2 манзиллар дафтарини импорт қ
 Comment[zh_CN]=导入旧的 KDE 2 地址簿的插件
 Comment[zh_TW]=匯入舊的 KDE2 通訊錄的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/ldif_xxport.desktop b/kaddressbook/xxport/ldif_xxport.desktop
index 2409974a7..d49329570 100644
--- a/kaddressbook/xxport/ldif_xxport.desktop
+++ b/kaddressbook/xxport/ldif_xxport.desktop
@@ -99,5 +99,5 @@ Comment[uk]=Втулок для імпорту та експорту конта�
 Comment[zh_CN]=导入和导出 Netscape 和 Mozilla LDIF 格式联系人的插件
 Comment[zh_TW]=匯入與匯出 Netscape 與 Mozilla LDIF 格式聯絡人的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/opera_xxport.desktop b/kaddressbook/xxport/opera_xxport.desktop
index 7a2833b62..c405a5066 100644
--- a/kaddressbook/xxport/opera_xxport.desktop
+++ b/kaddressbook/xxport/opera_xxport.desktop
@@ -97,5 +97,5 @@ Comment[uk]=Втулок для імпорту контактів Opera
 Comment[zh_CN]=导入 Opera 联系人的插件
 Comment[zh_TW]=匯入 Opera 聯絡人的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/pab_xxport.desktop b/kaddressbook/xxport/pab_xxport.desktop
index 84a144b55..6f8157801 100644
--- a/kaddressbook/xxport/pab_xxport.desktop
+++ b/kaddressbook/xxport/pab_xxport.desktop
@@ -97,5 +97,5 @@ Comment[uk]=Втулок для імпорту персональних адре
 Comment[zh_CN]=导入 MS Exchange 个人地址簿的插件
 Comment[zh_TW]=匯入 MS Exchange Personal 通訊錄的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kaddressbook/xxport/vcard_xxport.desktop b/kaddressbook/xxport/vcard_xxport.desktop
index 63e75796d..a5f5c77e7 100644
--- a/kaddressbook/xxport/vcard_xxport.desktop
+++ b/kaddressbook/xxport/vcard_xxport.desktop
@@ -99,5 +99,5 @@ Comment[uk]=Втулок для імпорту та експорту конта�
 Comment[zh_CN]=导入和导出 vCard 格式联系人的插件
 Comment[zh_TW]=匯入與匯出 vCard 格式聯絡人的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
diff --git a/kalarm/kalarm.desktop b/kalarm/kalarm.desktop
index 4055a777d..65557336a 100644
--- a/kalarm/kalarm.desktop
+++ b/kalarm/kalarm.desktop
@@ -17,7 +17,7 @@ Name[zh_TW]=KAlarm 鬧鐘
 Type=Application
 Exec=kalarm -caption "%c" %i
 Icon=kalarm
-DocPath=kalarm/index.html
+X-DocPath=kalarm/index.html
 GenericName=Personal Alarm Scheduler
 GenericName[af]=Persoonlike alarm skeduleerder
 GenericName[bg]=Аларма
diff --git a/kalarm/kalarm.tray.desktop b/kalarm/kalarm.tray.desktop
index bd332a41c..19bf5a815 100644
--- a/kalarm/kalarm.tray.desktop
+++ b/kalarm/kalarm.tray.desktop
@@ -17,7 +17,7 @@ Name[zh_TW]=KAlarm 鬧鐘
 Exec=kalarm --tray
 Icon=kalarm
 Type=Application
-DocPath=kalarm/index.html
+X-DocPath=kalarm/index.html
 Comment=Personal Alarm Scheduler: start as system tray icon
 Comment[af]=Persoonlike alarm skeduleerder: begin as stelsel laai ikoon
 Comment[bg]=Аларма: стартиране като икона в системния панел
diff --git a/kandy/src/kandy.desktop b/kandy/src/kandy.desktop
index c0fc49e2a..ab1347000 100644
--- a/kandy/src/kandy.desktop
+++ b/kandy/src/kandy.desktop
@@ -116,4 +116,4 @@ GenericName[zu]=Ithuluzi Lamakhala ekhukhwini
 Terminal=false
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Utility;Telephony;X-TDE-Utilities-Peripherals;
-DocPath=kandy/index.html
+X-DocPath=kandy/index.html
diff --git a/karm/karm_part.desktop b/karm/karm_part.desktop
index 10d4efc0b..03a13afd9 100644
--- a/karm/karm_part.desktop
+++ b/karm/karm_part.desktop
@@ -11,6 +11,6 @@ Name[pt_BR]=Componente do KArm
 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-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libkarmpart
 Type=Service
diff --git a/karm/support/karm.desktop b/karm/support/karm.desktop
index 301d1f4ea..c7f664944 100644
--- a/karm/support/karm.desktop
+++ b/karm/support/karm.desktop
@@ -70,7 +70,7 @@ GenericName[zu]=Umgcini Wesikhathi Esemfihlo
 Exec=karm  -caption "%c" %i %m
 Icon=karm
 Path=
-DocPath=karm/index.html
+X-DocPath=karm/index.html
 Type=Application
 Terminal=false
 X-TDE-StartupNotify=true
diff --git a/kitchensync/src/kitchensync.desktop b/kitchensync/src/kitchensync.desktop
index 1d5d6746d..4a325334d 100644
--- a/kitchensync/src/kitchensync.desktop
+++ b/kitchensync/src/kitchensync.desktop
@@ -50,11 +50,11 @@ GenericName[zh_CN]=同步
 Exec=kitchensync
 Icon=kitchensync
 Type=Application
-DocPath=kitchensync/index.html
+X-DocPath=kitchensync/index.html
 Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kitchensync
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkitchensyncpart
 Categories=Qt;TDE;Utility;Telephony;X-TDE-Utilities-Peripherals;
diff --git a/kmail/KMail.desktop b/kmail/KMail.desktop
index fe97955a7..cfc82626e 100644
--- a/kmail/KMail.desktop
+++ b/kmail/KMail.desktop
@@ -13,7 +13,7 @@ Name[zh_TW]=KMail 郵件軟體
 Type=Application
 Exec=kmail -caption "%c" %i %m
 Icon=kmail
-DocPath=kmail/index.html
+X-DocPath=kmail/index.html
 GenericName=Mail Client
 GenericName[af]=E-pos kliënt
 GenericName[ar]=زبون البريد
@@ -87,5 +87,5 @@ Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kmail
-ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
+X-TDE-ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
 Categories=Qt;TDE;Network;Email;X-TDE-Office-PIM;
diff --git a/kmail/kmail_config_accounts.desktop b/kmail/kmail_config_accounts.desktop
index e25306de5..e3c3031a5 100644
--- a/kmail/kmail_config_accounts.desktop
+++ b/kmail/kmail_config_accounts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_appearance.desktop b/kmail/kmail_config_appearance.desktop
index 499c293e5..0c377b6ca 100644
--- a/kmail/kmail_config_appearance.desktop
+++ b/kmail/kmail_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_composer.desktop b/kmail/kmail_config_composer.desktop
index 5d49b4160..9c1caf70d 100644
--- a/kmail/kmail_config_composer.desktop
+++ b/kmail/kmail_config_composer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=edit
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_identity.desktop b/kmail/kmail_config_identity.desktop
index a660f2f92..e5dc960d0 100644
--- a/kmail/kmail_config_identity.desktop
+++ b/kmail/kmail_config_identity.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_misc.desktop b/kmail/kmail_config_misc.desktop
index d08f8e595..142dcd9f6 100644
--- a/kmail/kmail_config_misc.desktop
+++ b/kmail/kmail_config_misc.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=misc
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_config_security.desktop b/kmail/kmail_config_security.desktop
index b056394d2..43ef3ca3a 100644
--- a/kmail/kmail_config_security.desktop
+++ b/kmail/kmail_config_security.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmail
diff --git a/kmail/kmail_view.desktop b/kmail/kmail_view.desktop
index 1cf8225c7..a1f110cae 100644
--- a/kmail/kmail_view.desktop
+++ b/kmail/kmail_view.desktop
@@ -13,7 +13,7 @@ Name[zh_TW]=KMail 郵件軟體
 Type=Application
 Exec=kmail --view %u
 Icon=kmail
-DocPath=kmail/index.html
+X-DocPath=kmail/index.html
 NoDisplay=true
 MimeType=message/rfc822;application/mbox;application/x-mimearchive;
 
diff --git a/kmail/konqueror/servicemenus/email.desktop b/kmail/konqueror/servicemenus/email.desktop
index 4cb6de28a..4ee1501d8 100644
--- a/kmail/konqueror/servicemenus/email.desktop
+++ b/kmail/konqueror/servicemenus/email.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=Email
 Encoding=UTF-8
-ServiceTypes=allfiles
+X-TDE-ServiceTypes=allfiles
 
 [Desktop Action Email]
 Name=Email File
diff --git a/kmobile/devices/digicam/libkmobile_digicam.desktop b/kmobile/devices/digicam/libkmobile_digicam.desktop
index 794b0ccb7..fbd66a322 100644
--- a/kmobile/devices/digicam/libkmobile_digicam.desktop
+++ b/kmobile/devices/digicam/libkmobile_digicam.desktop
@@ -107,6 +107,6 @@ Comment[uk]=Цей драйвер підтримує багато цифрови
 Comment[zh_CN]=此驱动程序支持许多数码相机
 Comment[zh_TW]=此驅動程式支援許多數位相機
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+X-TDE-ServiceTypes=kdedevice/mobiledevice
 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 a953b15d1..82d888805 100644
--- a/kmobile/devices/gammu/libkmobile_gammu.desktop
+++ b/kmobile/devices/gammu/libkmobile_gammu.desktop
@@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн
 Comment[zh_CN]=此驱动程序通过 gammu 库支持许多诺基亚和其它移动电话
 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gammu 函式庫
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+X-TDE-ServiceTypes=kdedevice/mobiledevice
 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 31db31706..6ae1a303a 100644
--- a/kmobile/devices/gnokii/libkmobile_gnokii.desktop
+++ b/kmobile/devices/gnokii/libkmobile_gnokii.desktop
@@ -101,6 +101,6 @@ Comment[uk]=Цей драйвер підтримує багато мобільн
 Comment[zh_CN]=此驱动程序通过 gnokii 库支持许多诺基亚和其它移动电话
 Comment[zh_TW]=此驅動程式支援許多 NOKIA 及其他手機，使用 gnokii 函式庫
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+X-TDE-ServiceTypes=kdedevice/mobiledevice
 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 998fcbae3..822216d44 100644
--- a/kmobile/devices/skeleton/libkmobile_skeleton.desktop
+++ b/kmobile/devices/skeleton/libkmobile_skeleton.desktop
@@ -102,6 +102,6 @@ Comment[uk]=Прототип мобільного пристрою
 Comment[zh_CN]=移动万能设备
 Comment[zh_TW]=行動通訊空殼裝置
 Type=Service
-ServiceTypes=kdedevice/mobiledevice
+X-TDE-ServiceTypes=kdedevice/mobiledevice
 X-TDE-Library=libkmobile_skeleton
 Icon=mobile_unknown
diff --git a/kmobile/kmobile.desktop b/kmobile/kmobile.desktop
index d16d7b96b..ed66e6146 100644
--- a/kmobile/kmobile.desktop
+++ b/kmobile/kmobile.desktop
@@ -2,7 +2,7 @@
 Exec=kmobile
 Icon=kmobile
 Type=Application
-DocPath=kmobile/index.html
+X-DocPath=kmobile/index.html
 Terminal=false
 
 Name=KMobile
diff --git a/knode/KNode.desktop b/knode/KNode.desktop
index 437212c34..129d03bd6 100644
--- a/knode/KNode.desktop
+++ b/knode/KNode.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=knode -caption "%c" %i %m
 Icon=knode
 Terminal=false
-DocPath=knode/index.html
+X-DocPath=knode/index.html
 Name=KNode
 Name[eo]=Diskutrondoj
 Name[hi]=के-नोड
diff --git a/knode/knode_config_accounts.desktop b/knode/knode_config_accounts.desktop
index 53b0dcc71..56db3506c 100644
--- a/knode/knode_config_accounts.desktop
+++ b/knode/knode_config_accounts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_appearance.desktop b/knode/knode_config_appearance.desktop
index 727edb973..4e8341c28 100644
--- a/knode/knode_config_appearance.desktop
+++ b/knode/knode_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_cleanup.desktop b/knode/knode_config_cleanup.desktop
index bbbdb37f2..896c8e51c 100644
--- a/knode/knode_config_cleanup.desktop
+++ b/knode/knode_config_cleanup.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=wizard
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_identity.desktop b/knode/knode_config_identity.desktop
index b91a75552..7a630b595 100644
--- a/knode/knode_config_identity.desktop
+++ b/knode/knode_config_identity.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_post_news.desktop b/knode/knode_config_post_news.desktop
index 41a53cf9a..0f69e2f46 100644
--- a/knode/knode_config_post_news.desktop
+++ b/knode/knode_config_post_news.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=mail_forward
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop
index 05b2c5f0d..250ae2621 100644
--- a/knode/knode_config_privacy.desktop
+++ b/knode/knode_config_privacy.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=password
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knode/knode_config_read_news.desktop b/knode/knode_config_read_news.desktop
index b6bfb83ee..a8c34e316 100644
--- a/knode/knode_config_read_news.desktop
+++ b/knode/knode_config_read_news.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=mail_get
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=knode
diff --git a/knotes/knotes.desktop b/knotes/knotes.desktop
index cb64c4481..22787783a 100644
--- a/knotes/knotes.desktop
+++ b/knotes/knotes.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=knotes/index.html
+X-DocPath=knotes/index.html
 Exec=knotes
 Icon=knotes
 Terminal=false
diff --git a/knotes/knotes_manager.desktop b/knotes/knotes_manager.desktop
index 0e7f069d5..bf962a937 100644
--- a/knotes/knotes_manager.desktop
+++ b/knotes/knotes_manager.desktop
@@ -55,6 +55,6 @@ Name[uz]=Ёзма хотира
 Name[zh_CN]=便笺
 Name[zh_TW]=備忘錄
 Type=Service
-ServiceTypes=TDEResources/Manager
+X-TDE-ServiceTypes=TDEResources/Manager
 
 X-TDE-ResourceFamily=notes
diff --git a/knotes/local.desktop b/knotes/local.desktop
index 7100033be..d0512ca06 100644
--- a/knotes/local.desktop
+++ b/knotes/local.desktop
@@ -53,6 +53,6 @@ Name[zh_CN]=本地文件中的便笺
 Name[zh_TW]=本地檔備忘錄
 X-TDE-Library=knotes_local
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=notes
 X-TDE-ResourceType=file
diff --git a/konsolekalendar/konsolekalendar.desktop b/konsolekalendar/konsolekalendar.desktop
index 11d2ad803..179fd81bb 100644
--- a/konsolekalendar/konsolekalendar.desktop
+++ b/konsolekalendar/konsolekalendar.desktop
@@ -23,7 +23,7 @@ Name[uk]=Календар для консолі
 Exec=kdialog --sorry "konsolekalendar is a command-line only program.  Please read the handbook at help:/konsolekalendar for more info."
 Icon=konsolekalendar
 Type=Application
-DocPath=konsolekalendar/index.html
+X-DocPath=konsolekalendar/index.html
 Terminal=false
 NoDisplay=true
 Categories=Qt;TDE;Utility;
diff --git a/kontact/plugins/akregator/akregatorplugin.desktop b/kontact/plugins/akregator/akregatorplugin.desktop
index 88c8436bb..48a690acc 100644
--- a/kontact/plugins/akregator/akregatorplugin.desktop
+++ b/kontact/plugins/akregator/akregatorplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=akregator
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_akregator
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/akregator/akregatorplugin3.2.desktop b/kontact/plugins/akregator/akregatorplugin3.2.desktop
index ae5eca99e..13a49ffa7 100644
--- a/kontact/plugins/akregator/akregatorplugin3.2.desktop
+++ b/kontact/plugins/akregator/akregatorplugin3.2.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=akregator
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_akregator
 X-TDE-KontactPluginVersion=3
diff --git a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
index ca83dcc6c..2f8d7ac29 100644
--- a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+++ b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_contacts
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_kaddressbookplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/karm/karmplugin.desktop b/kontact/plugins/karm/karmplugin.desktop
index 40ce11bbb..ead8d27dd 100644
--- a/kontact/plugins/karm/karmplugin.desktop
+++ b/kontact/plugins/karm/karmplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=karm
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_karm
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop
index 126b5ee7c..dddec4359 100644
--- a/kontact/plugins/kitchensync/kitchensync.desktop
+++ b/kontact/plugins/kitchensync/kitchensync.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kitchensync
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_kitchensync
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index 470844f9c..eb3a88674 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_mail
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kmailsummary
diff --git a/kontact/plugins/kmail/kmailplugin.desktop b/kontact/plugins/kmail/kmailplugin.desktop
index 601263ef6..748cdc8a3 100644
--- a/kontact/plugins/kmail/kmailplugin.desktop
+++ b/kontact/plugins/kmail/kmailplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_mail
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_kmailplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/knode/knodeplugin.desktop b/kontact/plugins/knode/knodeplugin.desktop
index c9562ec34..2dd4cfb7e 100644
--- a/kontact/plugins/knode/knodeplugin.desktop
+++ b/kontact/plugins/knode/knodeplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_news
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_knodeplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/knotes/knotesplugin.desktop b/kontact/plugins/knotes/knotesplugin.desktop
index 0f30f6b28..e1af4cdc3 100644
--- a/kontact/plugins/knotes/knotesplugin.desktop
+++ b/kontact/plugins/knotes/knotesplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_notes
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_knotesplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/korganizer/journalplugin.desktop b/kontact/plugins/korganizer/journalplugin.desktop
index 3e09a48c8..2a6bda5bd 100644
--- a/kontact/plugins/korganizer/journalplugin.desktop
+++ b/kontact/plugins/korganizer/journalplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_journal
-ServiceTypes=Kontact/Plugin
+X-TDE-ServiceTypes=Kontact/Plugin
 
 X-TDE-Library=libkontact_journalplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index 166c2f99c..e920dbdc1 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_date
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korgsummary
diff --git a/kontact/plugins/korganizer/korganizerplugin.desktop b/kontact/plugins/korganizer/korganizerplugin.desktop
index 6cbed4b99..69391f0cd 100644
--- a/kontact/plugins/korganizer/korganizerplugin.desktop
+++ b/kontact/plugins/korganizer/korganizerplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_date
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_korganizerplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/korganizer/todoplugin.desktop b/kontact/plugins/korganizer/todoplugin.desktop
index fdb5872ac..c93e5537b 100644
--- a/kontact/plugins/korganizer/todoplugin.desktop
+++ b/kontact/plugins/korganizer/todoplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_todo
-ServiceTypes=Kontact/Plugin
+X-TDE-ServiceTypes=Kontact/Plugin
 
 X-TDE-Library=libkontact_todoplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/kpilot/kpilotplugin.desktop b/kontact/plugins/kpilot/kpilotplugin.desktop
index d6a9a384c..20b1d5757 100644
--- a/kontact/plugins/kpilot/kpilotplugin.desktop
+++ b/kontact/plugins/kpilot/kpilotplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kpilot
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_kpilotplugin
 X-TDE-KontactIdentifier=kpilot
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index 7c7379aa8..75b4de144 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=knode
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactknt
diff --git a/kontact/plugins/newsticker/newstickerplugin.desktop b/kontact/plugins/newsticker/newstickerplugin.desktop
index a15f787f0..e2fbab6ae 100644
--- a/kontact/plugins/newsticker/newstickerplugin.desktop
+++ b/kontact/plugins/newsticker/newstickerplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=knewsticker
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 TryExec=rssservice
 
 X-TDE-Library=libkontact_newstickerplugin
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index fdf9e7363..f1ea21c85 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=cookie
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=sdsummary
diff --git a/kontact/plugins/specialdates/specialdatesplugin.desktop b/kontact/plugins/specialdates/specialdatesplugin.desktop
index ebb8c21fc..f71ccbd4f 100644
--- a/kontact/plugins/specialdates/specialdatesplugin.desktop
+++ b/kontact/plugins/specialdates/specialdatesplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=cookie
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_specialdatesplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index 34787c32d..0e957ebeb 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kontact_summary
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontactsummary
diff --git a/kontact/plugins/summary/summaryplugin.desktop b/kontact/plugins/summary/summaryplugin.desktop
index d8cb9bb98..59a7d31ec 100644
--- a/kontact/plugins/summary/summaryplugin.desktop
+++ b/kontact/plugins/summary/summaryplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kontact_summary
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_summaryplugin
 X-TDE-KontactPluginVersion=6
@@ -86,4 +86,4 @@ Name[uz]=Ҳисобот
 Name[zh_CN]=概览
 Name[zh_TW]=摘要
 #Always last
-InitialPreference=0
+X-TDE-InitialPreference=0
diff --git a/kontact/plugins/test/kptestplugin.desktop b/kontact/plugins/test/kptestplugin.desktop
index 703a0d7e9..a41e1fc15 100644
--- a/kontact/plugins/test/kptestplugin.desktop
+++ b/kontact/plugins/test/kptestplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=konsole
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkptestplugin
 X-TDE-KontactPluginVersion=6
diff --git a/kontact/plugins/weather/weatherplugin.desktop b/kontact/plugins/weather/weatherplugin.desktop
index 92b765ed8..04ae285ac 100644
--- a/kontact/plugins/weather/weatherplugin.desktop
+++ b/kontact/plugins/weather/weatherplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=kweather
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 TryExec=kweatherservice
 
 X-TDE-Library=libkontact_weatherplugin
diff --git a/kontact/src/Kontact.desktop b/kontact/src/Kontact.desktop
index aafc807fb..020bac0b2 100644
--- a/kontact/src/Kontact.desktop
+++ b/kontact/src/Kontact.desktop
@@ -66,4 +66,4 @@ GenericName[zh_TW]=個人資訊管理者
 Terminal=false
 X-TDE-StartupNotify=true
 Categories=Qt;TDE;Office;Email;X-TDE-Office-PIM;
-DocPath=kontact/index.html
+X-DocPath=kontact/index.html
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index cf8af1322..d35e3d7f0 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kontactconfig
 Icon=kontact
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kontact
diff --git a/kontact/src/kontactdcop.desktop b/kontact/src/kontactdcop.desktop
index 805eeeadf..63a9cee73 100644
--- a/kontact/src/kontactdcop.desktop
+++ b/kontact/src/kontactdcop.desktop
@@ -13,6 +13,6 @@ Icon=kontact
 NoDisplay=true
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kontact
-ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
+X-TDE-ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer
 X-TDE-StartupNotify=false
 Categories=Qt;TDE;Office
diff --git a/korganizer/korganizer.desktop b/korganizer/korganizer.desktop
index f941752c9..43cb02307 100644
--- a/korganizer/korganizer.desktop
+++ b/korganizer/korganizer.desktop
@@ -66,7 +66,7 @@ Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
 Exec=korganizer %U
 Icon=korganizer
 Path=
-DocPath=korganizer/index.html
+X-DocPath=korganizer/index.html
 Type=Application
 Terminal=false
 Name=KOrganizer
@@ -138,7 +138,7 @@ GenericName[uk]=Персональний тижневик
 GenericName[uz]=Шахсий органайзер
 GenericName[zh_CN]=个人日程安排
 GenericName[zh_TW]=個人行程組織軟體
-ServiceTypes=Browser/View,DCOP/Organizer
+X-TDE-ServiceTypes=Browser/View,DCOP/Organizer
 X-TDE-Library=libkorganizerpart
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
diff --git a/korganizer/korganizer_configcolors.desktop b/korganizer/korganizer_configcolors.desktop
index c4cd2e17b..d0343637b 100644
--- a/korganizer/korganizer_configcolors.desktop
+++ b/korganizer/korganizer_configcolors.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=colors
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configdesignerfields.desktop b/korganizer/korganizer_configdesignerfields.desktop
index c10489589..f89e08ad8 100644
--- a/korganizer/korganizer_configdesignerfields.desktop
+++ b/korganizer/korganizer_configdesignerfields.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=dlgedit
 Type=Service
-ServiceTypes=TDECModule
-DocPath=korganizer/preferences.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=korganizer/preferences.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configfonts.desktop b/korganizer/korganizer_configfonts.desktop
index a6337c651..d2cc03b9e 100644
--- a/korganizer/korganizer_configfonts.desktop
+++ b/korganizer/korganizer_configfonts.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=fonts
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configfreebusy.desktop b/korganizer/korganizer_configfreebusy.desktop
index bd9a19cd3..25b9b579a 100644
--- a/korganizer/korganizer_configfreebusy.desktop
+++ b/korganizer/korganizer_configfreebusy.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configgroupautomation.desktop b/korganizer/korganizer_configgroupautomation.desktop
index e60a93d63..33732f062 100644
--- a/korganizer/korganizer_configgroupautomation.desktop
+++ b/korganizer/korganizer_configgroupautomation.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configgroupscheduling.desktop b/korganizer/korganizer_configgroupscheduling.desktop
index 5086a05b9..3455250eb 100644
--- a/korganizer/korganizer_configgroupscheduling.desktop
+++ b/korganizer/korganizer_configgroupscheduling.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configmain.desktop b/korganizer/korganizer_configmain.desktop
index 8804fdee0..a1ca721d1 100644
--- a/korganizer/korganizer_configmain.desktop
+++ b/korganizer/korganizer_configmain.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configplugins.desktop b/korganizer/korganizer_configplugins.desktop
index ff9b95969..6257de921 100644
--- a/korganizer/korganizer_configplugins.desktop
+++ b/korganizer/korganizer_configplugins.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configtime.desktop b/korganizer/korganizer_configtime.desktop
index a6a27d28e..020276c34 100644
--- a/korganizer/korganizer_configtime.desktop
+++ b/korganizer/korganizer_configtime.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=clock
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/korganizer_configviews.desktop b/korganizer/korganizer_configviews.desktop
index dcdaf2acf..9310130ce 100644
--- a/korganizer/korganizer_configviews.desktop
+++ b/korganizer/korganizer_configviews.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=viewmag
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=korganizer
diff --git a/korganizer/plugins/datenums/datenums.desktop b/korganizer/plugins/datenums/datenums.desktop
index d35a0925f..32f155785 100644
--- a/korganizer/plugins/datenums/datenums.desktop
+++ b/korganizer/plugins/datenums/datenums.desktop
@@ -92,6 +92,6 @@ Comment[uk]=Цей втулок показує зверху перегляду �
 Comment[zh_CN]=此插件可对每天在议事日程视图中上方显示该日在一年中的序号。例如，2月1日是一年的第32天。
 Comment[zh_TW]=對每一天，此外掛程式會顯示這是一年中的第幾天。
 Type=Service
-ServiceTypes=Calendar/Plugin,Calendar/Decoration
+X-TDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
 X-TDE-KOrganizer-HasSettings=true
 X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/exchange/exchange.desktop b/korganizer/plugins/exchange/exchange.desktop
index 7d80fa1de..a866c336b 100644
--- a/korganizer/plugins/exchange/exchange.desktop
+++ b/korganizer/plugins/exchange/exchange.desktop
@@ -94,6 +94,6 @@ Comment[uk]=Цей втулок дозволяє користувачам korgan
 Comment[zh_CN]=此插件允许 KOrganizer 用户与 Microsoft Exchange 2000 群件服务器协同工作。
 Comment[zh_TW]=這個外掛程式允許 KOrganizer 使用者與 Microsoft Exchange 2000 群組伺服器一起工作。
 Type=Service
-ServiceTypes=KOrganizer/Part
+X-TDE-ServiceTypes=KOrganizer/Part
 X-TDE-KOrganizer-HasSettings=false
 X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/hebrew/hebrew.desktop b/korganizer/plugins/hebrew/hebrew.desktop
index 3329228fe..123956535 100644
--- a/korganizer/plugins/hebrew/hebrew.desktop
+++ b/korganizer/plugins/hebrew/hebrew.desktop
@@ -94,6 +94,6 @@ Comment[uk]=Показує всі дати в korganizer також і в сис
 Comment[zh_CN]=在 KOrganizer 中显示犹太教日历系统的全部日期。
 Comment[zh_TW]=顯示所有猶太行事曆的日期
 Type=Service
-ServiceTypes=Calendar/Plugin,Calendar/Decoration
+X-TDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
 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 63a4aaad1..61b3dac06 100644
--- a/korganizer/plugins/printing/journal/journalprint.desktop
+++ b/korganizer/plugins/printing/journal/journalprint.desktop
@@ -88,6 +88,6 @@ Comment[uk]=Цей журнал надає можливість друкуват
 Comment[zh_CN]=此插件允许您打印日记项目。
 Comment[zh_TW]=此外掛程式讓您印出日誌項目。
 Type=Service
-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
+X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
 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 77c8781da..e7ef3d7ba 100644
--- a/korganizer/plugins/printing/list/listprint.desktop
+++ b/korganizer/plugins/printing/list/listprint.desktop
@@ -88,6 +88,6 @@ Comment[uk]=Цей втулок дозволяє друкувати події �
 Comment[zh_CN]=此插件允许您以列表格式打印事件和待办事宜。
 Comment[zh_TW]=此外掛程式允許您以清單格式印出事件與待辦事項。
 Type=Service
-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
+X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
 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 f90ecdbd6..79dde69a7 100644
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
@@ -88,6 +88,6 @@ Comment[uk]=Цей втулок дозволяє друкувати список
 Comment[zh_CN]=此插件允许您打印所有即将到达的事件和代办事宜。
 Comment[zh_TW]=此外掛程式允許您印出即將發生的事件與待辦事項清單。
 Type=Service
-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
+X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
 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 c08bdd453..ad0f518da 100644
--- a/korganizer/plugins/printing/year/yearprint.desktop
+++ b/korganizer/plugins/printing/year/yearprint.desktop
@@ -77,6 +77,6 @@ Comment[uk]=Цей журнал надає можливість друкуват
 Comment[zh_CN]=此插件允许您打印年历。
 Comment[zh_TW]=此外掛程式讓您印出年曆。
 Type=Service
-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
+X-TDE-ServiceTypes=Calendar/Plugin,KOrganizer/PrintPlugin
 X-TDE-KOrganizer-HasSettings=false
 X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/projectview/projectview.desktop b/korganizer/plugins/projectview/projectview.desktop
index 7a67c4dda..f687fe0d2 100644
--- a/korganizer/plugins/projectview/projectview.desktop
+++ b/korganizer/plugins/projectview/projectview.desktop
@@ -105,6 +105,6 @@ Comment[uk]=Цей втулок показує вигляд планування
 Comment[zh_CN]=此插件为 KOrganizer 提供了项目规划视图(类似于待办或月视图)。如果您启用了此插件，您可以像项目规划程序那样切换到项目视图并查看您的待办清单。
 Comment[zh_TW]=此外掛程式提供 KOrganizer 專案計畫檢視。如果您開啟此外掛程式，您可以切換專案檢視與待辦事項清單。
 Type=Service
-ServiceTypes=KOrganizer/Part
+X-TDE-ServiceTypes=KOrganizer/Part
 X-TDE-KOrganizer-HasSettings=false
 X-TDE-PluginInterfaceVersion=2
diff --git a/korganizer/plugins/timespanview/timespanview.desktop b/korganizer/plugins/timespanview/timespanview.desktop
index 40abc1b8a..509e1a792 100644
--- a/korganizer/plugins/timespanview/timespanview.desktop
+++ b/korganizer/plugins/timespanview/timespanview.desktop
@@ -87,6 +87,6 @@ Comment[uk]=Цей втулок показує вигляд діаграми Г�
 Comment[zh_CN]=此插件为 KOrganizer 提供了时间跨度视图(类似于待办或月视图)。如果您启用了此插件，您可以像甘特图程序那样切换到时间跨度视图并查看您的事件。
 Comment[zh_TW]=此外掛程式提供時間檢視模式。如果您開啟此外掛程式，您可以切換時間檢視，讓您使用類似甘特圖的圖形來檢視事件。
 Type=Service
-ServiceTypes=KOrganizer/Part
+X-TDE-ServiceTypes=KOrganizer/Part
 X-TDE-KOrganizer-HasSettings=false
 X-TDE-PluginInterfaceVersion=2
diff --git a/korn/KOrn.desktop b/korn/KOrn.desktop
index 3c331743b..5f2221c5a 100644
--- a/korn/KOrn.desktop
+++ b/korn/KOrn.desktop
@@ -63,7 +63,7 @@ GenericName[zu]=Umposi Ohlomile
 Exec=korn  -caption "%c" %i %m %f
 Icon=korn
 Path=
-DocPath=korn/index.html
+X-DocPath=korn/index.html
 Type=Application
 Terminal=false
 Name=Korn
diff --git a/ktnef/gui/ktnef.desktop b/ktnef/gui/ktnef.desktop
index 61dd3f228..0d533f809 100644
--- a/ktnef/gui/ktnef.desktop
+++ b/ktnef/gui/ktnef.desktop
@@ -52,7 +52,7 @@ GenericName[zh_TW]=TNEF 檔案檢視器
 Exec=ktnef %i %m -caption "%c"
 Icon=ktnef
 Type=Application
-DocPath=ktnef/index.html
+X-DocPath=ktnef/index.html
 Comment=A viewer/extractor for TNEF files
 Comment[af]='n Leeser en data onttrekker vir TNEF lêers
 Comment[bg]=Програма за преглед и извличане на файлове TNEF
diff --git a/libkcal/kcal_manager.desktop b/libkcal/kcal_manager.desktop
index a43fa3524..40429a46f 100644
--- a/libkcal/kcal_manager.desktop
+++ b/libkcal/kcal_manager.desktop
@@ -58,6 +58,6 @@ Name[uz]=Календар
 Name[zh_CN]=日历
 Name[zh_TW]=行事曆
 Type=Service
-ServiceTypes=TDEResources/Manager
+X-TDE-ServiceTypes=TDEResources/Manager
 
 X-TDE-ResourceFamily=calendar
diff --git a/libkcal/local.desktop b/libkcal/local.desktop
index 8102e76b7..d52ecd5d1 100644
--- a/libkcal/local.desktop
+++ b/libkcal/local.desktop
@@ -54,6 +54,6 @@ Name[zh_CN]=本地文件中的日历
 Name[zh_TW]=本地檔案中的行事曆
 X-TDE-Library=kcal_local
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=file
diff --git a/libkcal/localdir.desktop b/libkcal/localdir.desktop
index 59a6b7b4b..37e890533 100644
--- a/libkcal/localdir.desktop
+++ b/libkcal/localdir.desktop
@@ -54,6 +54,6 @@ Name[zh_CN]=本地目录中的日历
 Name[zh_TW]=本地目錄中的行事曆
 X-TDE-Library=kcal_localdir
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=localdir
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.desktop b/libtdepim/komposer/plugins/default/defaulteditor.desktop
index fba95cff6..a5afd8152 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.desktop
+++ b/libtdepim/komposer/plugins/default/defaulteditor.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=editor
-ServiceTypes=Komposer/Editor
+X-TDE-ServiceTypes=Komposer/Editor
 
 X-TDE-Library=libkomposer_defaulteditor
 X-Komposer-Version=1
diff --git a/tdefile-plugins/ics/tdefile_ics.desktop b/tdefile-plugins/ics/tdefile_ics.desktop
index 41d745aa4..ef4c1763d 100644
--- a/tdefile-plugins/ics/tdefile_ics.desktop
+++ b/tdefile-plugins/ics/tdefile_ics.desktop
@@ -49,7 +49,7 @@ Name[tr]=ICS bilgisi
 Name[uk]=Інформація про ICS
 Name[zh_CN]=ICS 信息
 Name[zh_TW]=ICS 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_ics
 MimeType=text/calendar
 PreferredGroups=ICSInfo
diff --git a/tdefile-plugins/palm-databases/tdefile_palm.desktop b/tdefile-plugins/palm-databases/tdefile_palm.desktop
index 716944e1e..d9adb981e 100644
--- a/tdefile-plugins/palm-databases/tdefile_palm.desktop
+++ b/tdefile-plugins/palm-databases/tdefile_palm.desktop
@@ -52,7 +52,7 @@ Name[tr]=PalmOS Veritabanı Bilgisi
 Name[uk]=Інформація про базу даних PalmOS
 Name[zh_CN]=PalmOS 数据库信息
 Name[zh_TW]=PalmOS 資料庫資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_palm
 MimeType=application/vnd.palm
 PreferredGroups=General
diff --git a/tdefile-plugins/rfc822/tdefile_rfc822.desktop b/tdefile-plugins/rfc822/tdefile_rfc822.desktop
index d030e1e57..448a73572 100644
--- a/tdefile-plugins/rfc822/tdefile_rfc822.desktop
+++ b/tdefile-plugins/rfc822/tdefile_rfc822.desktop
@@ -55,7 +55,7 @@ Name[tr]=E-Posta Bilgisi
 Name[uk]=Інформація про повідомлення ел. пошти
 Name[zh_CN]=电子邮件信息
 Name[zh_TW]=電子郵件資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_rfc822
 MimeType=message/rfc822
 PreferredGroups=Technical
diff --git a/tdefile-plugins/vcf/tdefile_vcf.desktop b/tdefile-plugins/vcf/tdefile_vcf.desktop
index 730d731ab..036a6c0d2 100644
--- a/tdefile-plugins/vcf/tdefile_vcf.desktop
+++ b/tdefile-plugins/vcf/tdefile_vcf.desktop
@@ -58,7 +58,7 @@ Name[xh]=Inkcukacha ye vCard
 Name[zh_CN]=vCard 信息
 Name[zh_TW]=vCard 資訊
 Name[zu]=Ulwazi lwe-vCard
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_vcf
 MimeType=text/x-vcard
 PreferredGroups=Technical
diff --git a/tderesources/birthdays/tdeabc.desktop b/tderesources/birthdays/tdeabc.desktop
index d0138a20c..aafbce9c5 100644
--- a/tderesources/birthdays/tdeabc.desktop
+++ b/tderesources/birthdays/tdeabc.desktop
@@ -56,6 +56,6 @@ Name[zh_CN]=KAddressBook 中的生日
 Name[zh_TW]=自 KaddressBook 匯入生日
 X-TDE-Library=kcal_tdeabc
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=birthdays
diff --git a/tderesources/blogging/blogging.desktop b/tderesources/blogging/blogging.desktop
index 3adb1c726..e21927331 100644
--- a/tderesources/blogging/blogging.desktop
+++ b/tderesources/blogging/blogging.desktop
@@ -44,6 +44,6 @@ Name[zh_CN]=日记作为服务器上的博客日志
 Name[zh_TW]=日誌做為伺服器上的部落格
 X-TDE-Library=kcal_blogging
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=blogging
diff --git a/tderesources/caldav/kcal_caldav.desktop b/tderesources/caldav/kcal_caldav.desktop
index d7c9e04ed..ffdbd4d45 100644
--- a/tderesources/caldav/kcal_caldav.desktop
+++ b/tderesources/caldav/kcal_caldav.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=CalDAV 服务器(如 Google Calendar)
 Name[zh_TW]=CalDAV 伺服器 (如: Google Calendar)
 X-TDE-Library=kcal_caldav
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=caldav
diff --git a/tderesources/carddav/tdeabc_carddav.desktop b/tderesources/carddav/tdeabc_carddav.desktop
index 89b77272f..a1efd4ab8 100644
--- a/tderesources/carddav/tdeabc_carddav.desktop
+++ b/tderesources/carddav/tdeabc_carddav.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=CardDAV 服务器(如 Zimbra Contacts)
 Name[zh_TW]=CardDAV 伺服器 (如: Zimbra Contacts)
 X-TDE-Library=tdeabc_carddav
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=carddav
diff --git a/tderesources/egroupware/kcal_xmlrpc.desktop b/tderesources/egroupware/kcal_xmlrpc.desktop
index 6b5e383ff..99aa303e7 100644
--- a/tderesources/egroupware/kcal_xmlrpc.desktop
+++ b/tderesources/egroupware/kcal_xmlrpc.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
 X-TDE-Library=kcal_xmlrpc
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=xmlrpc
diff --git a/tderesources/egroupware/knotes_xmlrpc.desktop b/tderesources/egroupware/knotes_xmlrpc.desktop
index 124b18b7f..b2dc070b5 100644
--- a/tderesources/egroupware/knotes_xmlrpc.desktop
+++ b/tderesources/egroupware/knotes_xmlrpc.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
 X-TDE-Library=knotes_xmlrpc
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=notes
 X-TDE-ResourceType=xmlrpc
diff --git a/tderesources/egroupware/tdeabc_xmlrpc.desktop b/tderesources/egroupware/tdeabc_xmlrpc.desktop
index c33737c66..cfd5bbcbf 100644
--- a/tderesources/egroupware/tdeabc_xmlrpc.desktop
+++ b/tderesources/egroupware/tdeabc_xmlrpc.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=eGroupware 服务器(通过 XML-RPC)
 Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC)
 X-TDE-Library=tdeabc_xmlrpc
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=xmlrpc
diff --git a/tderesources/exchange/exchange.desktop b/tderesources/exchange/exchange.desktop
index a17f7dc40..96f57cda1 100644
--- a/tderesources/exchange/exchange.desktop
+++ b/tderesources/exchange/exchange.desktop
@@ -3,7 +3,7 @@ Type=Service
 X-TDE-Library=resourcecalendarexchange
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=exchange
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 Name=Exchange 2000 Server
 Name[af]=Exchange 2000 Bediener
 Name[be]=Сэрвэр Exchange 2000
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.desktop b/tderesources/featureplan/kcal_resourcefeatureplan.desktop
index 0bafdd17d..c43a0c6b8 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.desktop
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.desktop
@@ -36,6 +36,6 @@ Name[zh_CN]=XML 特性计划
 Name[zh_TW]=XML 功能計畫
 X-TDE-Library=kcal_resourcefeatureplan
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=featureplan
diff --git a/tderesources/groupdav/kcal_groupdav.desktop b/tderesources/groupdav/kcal_groupdav.desktop
index 8319d8b56..99d2c4ff4 100644
--- a/tderesources/groupdav/kcal_groupdav.desktop
+++ b/tderesources/groupdav/kcal_groupdav.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware)
 Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware)
 X-TDE-Library=kcal_groupdav
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=groupdav
diff --git a/tderesources/groupdav/tdeabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop
index d64a5a2ad..c7db0ac64 100644
--- a/tderesources/groupdav/tdeabc_groupdav.desktop
+++ b/tderesources/groupdav/tdeabc_groupdav.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware)
 Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware)
 X-TDE-Library=tdeabc_groupdav
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=groupdav
diff --git a/tderesources/groupware/kcal_groupware.desktop b/tderesources/groupware/kcal_groupware.desktop
index 11620990c..551450351 100644
--- a/tderesources/groupware/kcal_groupware.desktop
+++ b/tderesources/groupware/kcal_groupware.desktop
@@ -44,6 +44,6 @@ Name[zh_CN]=群件服务器
 Name[zh_TW]=群組伺服器
 X-TDE-Library=kcal_groupware
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=groupware
diff --git a/tderesources/groupware/tdeabc_groupware.desktop b/tderesources/groupware/tdeabc_groupware.desktop
index 950c35ce1..30721fa02 100644
--- a/tderesources/groupware/tdeabc_groupware.desktop
+++ b/tderesources/groupware/tdeabc_groupware.desktop
@@ -44,6 +44,6 @@ Name[zh_CN]=群件服务器
 Name[zh_TW]=群組伺服器
 X-TDE-Library=tdeabc_groupware
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=groupware
diff --git a/tderesources/groupwise/kcal_groupwise.desktop b/tderesources/groupwise/kcal_groupwise.desktop
index fb72b4d32..4e006e2f4 100644
--- a/tderesources/groupwise/kcal_groupwise.desktop
+++ b/tderesources/groupwise/kcal_groupwise.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=Novell GroupWise 服务器
 Name[zh_TW]=Novell 群組伺服器
 X-TDE-Library=kcal_groupwise
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=groupwise
diff --git a/tderesources/groupwise/tdeabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop
index 0fd6c3f87..2f982324f 100644
--- a/tderesources/groupwise/tdeabc_groupwise.desktop
+++ b/tderesources/groupwise/tdeabc_groupwise.desktop
@@ -45,6 +45,6 @@ Name[zh_CN]=Novell GroupWise 服务器
 Name[zh_TW]=Novell 群組伺服器
 X-TDE-Library=tdeabc_groupwise
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=groupwise
diff --git a/tderesources/kolab/kcal/kolab.desktop b/tderesources/kolab/kcal/kolab.desktop
index 861013899..a2355a394 100644
--- a/tderesources/kolab/kcal/kolab.desktop
+++ b/tderesources/kolab/kcal/kolab.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的行事曆
 X-TDE-Library=kcal_kolab
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=imap
diff --git a/tderesources/kolab/knotes/kolabresource.desktop b/tderesources/kolab/knotes/kolabresource.desktop
index c376e6590..8cdf00afa 100644
--- a/tderesources/kolab/knotes/kolabresource.desktop
+++ b/tderesources/kolab/knotes/kolabresource.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=通过 KMail 访问 IMAP 服务器
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器
 X-TDE-Library=knotes_kolab
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=notes
 X-TDE-ResourceType=imap
diff --git a/tderesources/kolab/tdeabc/kolab.desktop b/tderesources/kolab/tdeabc/kolab.desktop
index e58a91d3d..ca9713dc7 100644
--- a/tderesources/kolab/tdeabc/kolab.desktop
+++ b/tderesources/kolab/tdeabc/kolab.desktop
@@ -47,6 +47,6 @@ Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的地址簿
 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的通訊錄
 X-TDE-Library=tdeabc_kolab
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=imap
diff --git a/tderesources/newexchange/kcal_newexchange.desktop b/tderesources/newexchange/kcal_newexchange.desktop
index a31298407..a08b7eaa1 100644
--- a/tderesources/newexchange/kcal_newexchange.desktop
+++ b/tderesources/newexchange/kcal_newexchange.desktop
@@ -46,6 +46,6 @@ Name[zh_CN]=Exchange 服务器上的日历(试验性)
 Name[zh_TW]=Exchanger 伺服器上的行事曆(實驗中)
 X-TDE-Library=kcal_newexchange
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=newexchange
diff --git a/tderesources/newexchange/tdeabc_newexchange.desktop b/tderesources/newexchange/tdeabc_newexchange.desktop
index b5606b949..a21d3e90e 100644
--- a/tderesources/newexchange/tdeabc_newexchange.desktop
+++ b/tderesources/newexchange/tdeabc_newexchange.desktop
@@ -46,6 +46,6 @@ Name[zh_CN]=Exchange 服务器上的地址簿(试验性)
 Name[zh_TW]=Exchanger 伺服器的通訊錄(實驗中)
 X-TDE-Library=tdeabc_newexchange
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=newexchange
diff --git a/tderesources/remote/remote.desktop b/tderesources/remote/remote.desktop
index be04d8d52..4c9eb0934 100644
--- a/tderesources/remote/remote.desktop
+++ b/tderesources/remote/remote.desktop
@@ -52,6 +52,6 @@ Name[zh_CN]=远程文件中的日历
 Name[zh_TW]=遠端檔案的行事曆
 X-TDE-Library=kcal_remote
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=remote
diff --git a/tderesources/scalix/kcal/scalix.desktop b/tderesources/scalix/kcal/scalix.desktop
index b93bf317b..8ba56ef06 100644
--- a/tderesources/scalix/kcal/scalix.desktop
+++ b/tderesources/scalix/kcal/scalix.desktop
@@ -26,6 +26,6 @@ Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的行事曆
 X-TDE-Library=kcal_scalix
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=scalix
diff --git a/tderesources/scalix/knotes/scalix.desktop b/tderesources/scalix/knotes/scalix.desktop
index 05ae6d774..4852f8d2e 100644
--- a/tderesources/scalix/knotes/scalix.desktop
+++ b/tderesources/scalix/knotes/scalix.desktop
@@ -25,6 +25,6 @@ Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的便條
 X-TDE-Library=knotes_scalix
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=notes
 X-TDE-ResourceType=scalix
diff --git a/tderesources/scalix/tdeabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop
index 556811ac1..673082db9 100644
--- a/tderesources/scalix/tdeabc/scalix.desktop
+++ b/tderesources/scalix/tdeabc/scalix.desktop
@@ -25,6 +25,6 @@ Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿
 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄
 X-TDE-Library=tdeabc_scalix
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=scalix
diff --git a/tderesources/slox/kcal_ox.desktop b/tderesources/slox/kcal_ox.desktop
index c00c3eae2..1a70f2fc9 100644
--- a/tderesources/slox/kcal_ox.desktop
+++ b/tderesources/slox/kcal_ox.desktop
@@ -41,6 +41,6 @@ Name[zh_CN]=OpenXchange 服务器
 Name[zh_TW]=OpenXchange 伺服器
 X-TDE-Library=kcal_slox
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=ox
diff --git a/tderesources/slox/kcal_slox.desktop b/tderesources/slox/kcal_slox.desktop
index ec6d66dd5..dec7e48f8 100644
--- a/tderesources/slox/kcal_slox.desktop
+++ b/tderesources/slox/kcal_slox.desktop
@@ -46,6 +46,6 @@ Name[zh_CN]=SUSE LINUX Openexchange 服务器
 Name[zh_TW]=SUSE LINUX Openexchange 伺服器
 X-TDE-Library=kcal_slox
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=slox
diff --git a/tderesources/slox/tdeabc_ox.desktop b/tderesources/slox/tdeabc_ox.desktop
index bd3da014b..cf3407d9a 100644
--- a/tderesources/slox/tdeabc_ox.desktop
+++ b/tderesources/slox/tdeabc_ox.desktop
@@ -41,6 +41,6 @@ Name[zh_CN]=OpenXchange 服务器
 Name[zh_TW]=OpenXchange 伺服器
 X-TDE-Library=tdeabc_slox
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=ox
diff --git a/tderesources/slox/tdeabc_slox.desktop b/tderesources/slox/tdeabc_slox.desktop
index 8dddaf017..6e9a6075e 100644
--- a/tderesources/slox/tdeabc_slox.desktop
+++ b/tderesources/slox/tdeabc_slox.desktop
@@ -46,6 +46,6 @@ Name[zh_CN]=SUSE LINUX Openexchange 服务器
 Name[zh_TW]=SUSE LINUX Openexchange 伺服器
 X-TDE-Library=tdeabc_slox
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=slox
diff --git a/tderesources/tvanytime/kcal_tvanytime.desktop b/tderesources/tvanytime/kcal_tvanytime.desktop
index e148f9831..3e06ca4d1 100644
--- a/tderesources/tvanytime/kcal_tvanytime.desktop
+++ b/tderesources/tvanytime/kcal_tvanytime.desktop
@@ -46,6 +46,6 @@ Name[zh_CN]=电视日程安排
 Name[zh_TW]=電視時刻表
 X-TDE-Library=kcal_tvanytime
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=tvschedule