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

11 years ago · c31057da30
parent 096cbbcfca
commit c31057da30
77 changed files with 84 additions and 84 deletions
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
@ -2,7 +2,7 @@
 Exec=tdecmshell kcmsambaconf
 Icon=samba
 Type=Application
-DocPath=kcontrol/kcmsambaconf/index.html
+X-DocPath=kcontrol/kcmsambaconf/index.html
 Terminal=false
 X-TDE-FactoryName=KcmSambaConf
 X-TDE-Library=kcmsambaconf
--- a/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
+++ b/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
@ -99,4 +99,4 @@ Comment[zh_HK]=用於與本地網絡分享目錄的 Konqueror 屬性對話盒插
 Comment[zh_TW]=Konqueror 屬性對話框外掛程式，用於在本地端網路上分享目錄
 X-TDE-Library=fileshare_propsdlgplugin
 X-TDE-Protocol=file
-ServiceTypes=KPropsDlg/Plugin,inode/directory
+X-TDE-ServiceTypes=KPropsDlg/Plugin,inode/directory
--- a/filesharing/simple/fileshare.desktop
+++ b/filesharing/simple/fileshare.desktop
@ -2,7 +2,7 @@
 Exec=tdecmshell fileshare
 Icon=share
 Type=Application
-DocPath=kcontrol/fileshare/index.html
+X-DocPath=kcontrol/fileshare/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=fileshare
 X-TDE-ParentApp=kcontrol
--- a/kdict/kdict.desktop
+++ b/kdict/kdict.desktop
@ -149,5 +149,5 @@ GenericName[zh_TW]=線上字典
 GenericName[zu]=Isichaza magama esixhumekile
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-DocPath=kdict/index.html
+X-DocPath=kdict/index.html
 Categories=Qt;TDE;Office;Dictionary;
--- a/kget/kget.desktop
+++ b/kget/kget.desktop
@ -74,4 +74,4 @@ GenericName[zh_HK]=下載管理員
 GenericName[zh_TW]=下載管理員
 Categories=Qt;TDE;Network;FileTransfer;
 X-DCOP-ServiceType=Unique
-DocPath=kget/index.html
+X-DocPath=kget/index.html
--- a/kget/kget_download.desktop
+++ b/kget/kget_download.desktop
@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=KGetDownload;
 Icon=
-ServiceTypes=all/allfiles
-ExcludeServiceTypes=kdedevice/*
+X-TDE-ServiceTypes=all/allfiles
+X-TDE-ExcludeServiceTypes=kdedevice/*

 [Desktop Action KGetDownload]
 Exec=kget %U
--- a/knewsticker/knewsticker-standalone.desktop
+++ b/knewsticker/knewsticker-standalone.desktop
@ -22,7 +22,7 @@ Name[zu]=Umlungiseleli Wezindaba ze K
 Type=Application
 Exec=appletproxy knewsticker.desktop
 Icon=knewsticker
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
 GenericName=News Ticker
 GenericName[af]=Nuus Tikker
 GenericName[ar]=تجديد الأخبار
--- a/knewsticker/knewsticker.desktop
+++ b/knewsticker/knewsticker.desktop
@ -101,4 +101,4 @@ Comment[uk]=Стрічка новин RDF
 Comment[zh_CN]=滚动的 RDF 新闻播报器
 Comment[zh_HK]=捲軸式 RDF 新聞簡報器
 Comment[zh_TW]=捲軸的 RDF 新聞簡報
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
--- a/knewsticker/knewstickerstub/knewstickerstub.desktop
+++ b/knewsticker/knewstickerstub/knewstickerstub.desktop
@ -124,7 +124,7 @@ Icon=knode
 NoDisplay=true
 Type=Application
 Terminal=false
-InitialPreference=8
+X-TDE-InitialPreference=8
 Actions=Add;
 X-TDE-StartupNotify=false

--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
@ -66,4 +66,4 @@ Name[zh_HK]=KNewsticker 來源檔案屬性頁
 Name[zh_TW]=KNewsticker 來源檔案屬性頁
 Name[zu]=Umlekeleli wezindaba ze K wephepha lefayela Yemvelaphi Yempahla
 X-TDE-Library=libkntsrcfilepropsdlg
-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
+X-TDE-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
--- a/kopete/kopete/chatwindow/chatwindow.desktop
+++ b/kopete/kopete/chatwindow/chatwindow.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_chatwindow
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/kopete/chatwindow/emailwindow.desktop
+++ b/kopete/kopete/chatwindow/emailwindow.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_emailwindow
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/kopete/config/accounts/kopete_accountconfig.desktop
+++ b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_accountconfig
@ -126,6 +126,6 @@ Comment[uz@cyrillic]=Бу ерда ҳамма ҳисобларни мослаш
 Comment[zh_CN]=您可在此管理您全部的账户
 Comment[zh_HK]=在此您可管理您的帳號
 Comment[zh_TW]=您可以在此管理您的所有帳號
-DocPath=kopete/configure-dialog.html#configuring-accounts
+X-DocPath=kopete/configure-dialog.html#configuring-accounts


--- a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
+++ b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_appearanceconfig
@ -125,6 +125,6 @@ Comment[uz@cyrillic]=Бу ерда Kopete кўринишини мослаш му
 Comment[zh_CN]=您可在此更改 Kopete 的观感
 Comment[zh_HK]=在此您可改動 Kopete 的外觀
 Comment[zh_TW]=您可以在此改變 Kopete 的外觀與感覺
-DocPath=kopete/configure-dialog.html#configuring-appearance
+X-DocPath=kopete/configure-dialog.html#configuring-appearance


--- a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
+++ b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kopete_avdevice
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_avdeviceconfig
@ -115,4 +115,4 @@ Comment[uz@cyrillic]=Бу ерда видео ва аудио ускуналар
 Comment[zh_CN]=您可在此更改 Kopete 的影音设备设置
 Comment[zh_HK]=在此您可改動 Kopete 視像和音訊裝置的設定
 Comment[zh_TW]=您可以在此改變 Kopete 的影像與聲音裝置設定
-DocPath=kopete/configure-dialog.html#configuring-avdevice
+X-DocPath=kopete/configure-dialog.html#configuring-avdevice
--- a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
+++ b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=configure
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_behaviorconfig
@ -129,7 +129,7 @@ Comment[wa]=Chal vos ploz apontyî Kopete a vosse mode
 Comment[zh_CN]=您可在此个性化 Kopete
 Comment[zh_HK]=在此您可設定 Kopete 的個人化資料
 Comment[zh_TW]=您已經在此將 Kopete 個人化
-DocPath=kopete/configure-dialog.html#configuring-behavior
+X-DocPath=kopete/configure-dialog.html#configuring-behavior



--- a/kopete/kopete/config/identity/kopete_identityconfig.desktop
+++ b/kopete/kopete/config/identity/kopete_identityconfig.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_identityconfig
@ -109,4 +109,4 @@ Comment[zh_CN]=您可在此管理您的全局身份
 Comment[zh_HK]=在此您可管理 Kopete 的全域識別名稱
 Comment[zh_TW]=您可以在此管理您的全域身份

-DocPath=kopete/configure-dialog.html#configuring-identity
+X-DocPath=kopete/configure-dialog.html#configuring-identity
--- a/kopete/kopete/kopete.desktop
+++ b/kopete/kopete/kopete.desktop
@ -117,10 +117,10 @@ Comment[zh_HK]=即時通訊程式
 Comment[zh_TW]=即時訊息客戶端程式
 Exec=kopete -caption "%c" %i %m %u
 Type=Application
-DocPath=kopete/index.html
+X-DocPath=kopete/index.html
 Terminal=false
 Icon=kopete
 Categories=Qt;TDE;Network;InstantMessaging;
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kopete
-ServiceTypes=DCOP/InstantMessenger
+X-TDE-ServiceTypes=DCOP/InstantMessenger
--- a/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
+++ b/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
 Comment[zh_TW]=自動將接收訊息中的連結加入書籤
 Icon=konqueror
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_addbookmarks
 X-TDE-PluginInfo-Author=Roie Kerstein
--- a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
+++ b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
 Comment[zh_TW]=自動將接收訊息中的連結加入書籤
 Icon=konqueror
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_addbookmarks
--- a/kopete/plugins/alias/kopete_alias.desktop
+++ b/kopete/plugins/alias/kopete_alias.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=alias
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_alias
 X-TDE-PluginInfo-Author=Jason Keirstead
 X-TDE-PluginInfo-Email=jason@keirstead.org
--- a/kopete/plugins/alias/kopete_alias_config.desktop
+++ b/kopete/plugins/alias/kopete_alias_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_alias
--- a/kopete/plugins/autoreplace/kopete_autoreplace.desktop
+++ b/kopete/plugins/autoreplace/kopete_autoreplace.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=autoreplace
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_autoreplace
 X-TDE-PluginInfo-Author=Roberto Pariset
 X-TDE-PluginInfo-Email=victorheremita@fastwebnet.it
--- a/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
+++ b/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_autoreplace
--- a/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
+++ b/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_connectionstatus
 X-TDE-PluginInfo-Author=Chris Howells
 X-TDE-PluginInfo-Email=howells@kde.org
--- a/kopete/plugins/contactnotes/kopete_contactnotes.desktop
+++ b/kopete/plugins/contactnotes/kopete_contactnotes.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=identity
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_contactnotes
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
--- a/kopete/plugins/cryptography/kopete_cryptography.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=encrypted
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_cryptography
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
--- a/kopete/plugins/cryptography/kopete_cryptography_config.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_cryptography
--- a/kopete/plugins/highlight/kopete_highlight.desktop
+++ b/kopete/plugins/highlight/kopete_highlight.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=highlight
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_highlight
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
--- a/kopete/plugins/highlight/kopete_highlight_config.desktop
+++ b/kopete/plugins/highlight/kopete_highlight_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=highlight
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_highlight
--- a/kopete/plugins/history/kopete_history.desktop
+++ b/kopete/plugins/history/kopete_history.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=history
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_history
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
--- a/kopete/plugins/history/kopete_history_config.desktop
+++ b/kopete/plugins/history/kopete_history_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=history
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_history
--- a/kopete/plugins/latex/kopete_latex.desktop
+++ b/kopete/plugins/latex/kopete_latex.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=latex
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_latex
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar
 X-TDE-PluginInfo-Email=duncan@kde.org
--- a/kopete/plugins/latex/kopete_latex_config.desktop
+++ b/kopete/plugins/latex/kopete_latex_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=latex
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_latex
--- a/kopete/plugins/motionautoaway/kopete_motionaway.desktop
+++ b/kopete/plugins/motionautoaway/kopete_motionaway.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_motionaway
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar Prett
 X-TDE-PluginInfo-Email=duncan@kde.org
--- a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
+++ b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_motionaway
--- a/kopete/plugins/nowlistening/kopete_nowlistening.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=kaboodle
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_nowlistening
 X-TDE-PluginInfo-Author=Will Stephenson
 X-TDE-PluginInfo-Email=will@stevello.free-online.co.uk
--- a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaboodle
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_nowlistening
--- a/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
+++ b/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
@ -2,7 +2,7 @@
 Type=Service
 Icon=smpppdcs
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_smpppdcs
 X-TDE-PluginInfo-Author=Heiko Schäfer
 X-TDE-PluginInfo-Email=heiko@rangun.de
--- a/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
+++ b/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=smpppdcs
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_smpppdcs
--- a/kopete/plugins/statistics/kopete_statistics.desktop
+++ b/kopete/plugins/statistics/kopete_statistics.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=statistics
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_statistics
 X-TDE-PluginInfo-Author=Marc Cramdal
 X-TDE-PluginInfo-Email=marc.cramdal@yahoo.fr
--- a/kopete/plugins/texteffect/kopete_texteffect.desktop
+++ b/kopete/plugins/texteffect/kopete_texteffect.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=texteffect
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_texteffect
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
--- a/kopete/plugins/texteffect/kopete_texteffect_config.desktop
+++ b/kopete/plugins/texteffect/kopete_texteffect_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=texteffect
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_texteffect
--- a/kopete/plugins/translator/kopete_translator.desktop
+++ b/kopete/plugins/translator/kopete_translator.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=locale
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_translator
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar Prett
 X-TDE-PluginInfo-Email=duncan@kde.org
--- a/kopete/plugins/translator/kopete_translator_config.desktop
+++ b/kopete/plugins/translator/kopete_translator_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=locale
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_translator
--- a/kopete/plugins/webpresence/kopete_webpresence.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=html
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_webpresence
 X-TDE-PluginInfo-Author=Will Stephenson
 X-TDE-PluginInfo-Email=will@stevello.free-online.co.uk
--- a/kopete/plugins/webpresence/kopete_webpresence_config.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=html
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule

 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_webpresence
--- a/kopete/protocols/gadu/kopete_gadu.desktop
+++ b/kopete/protocols/gadu/kopete_gadu.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=gadu_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-Kopete-Messaging-Protocol=messaging/gadu
 X-TDE-Library=kopete_gadu
 X-TDE-PluginInfo-Author=Grzegorz Jaskiewicz
--- a/kopete/protocols/groupwise/kopete_groupwise.desktop
+++ b/kopete/protocols/groupwise/kopete_groupwise.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=groupwise_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_groupwise
 X-Kopete-Messaging-Protocol=messaging/groupwise
 X-TDE-PluginInfo-Author=Will Stephenson
--- a/kopete/protocols/irc/kopete_irc.desktop
+++ b/kopete/protocols/irc/kopete_irc.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=irc_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_irc
 X-Kopete-Messaging-Protocol=messaging/irc
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/protocols/jabber/kopete_jabber.desktop
+++ b/kopete/protocols/jabber/kopete_jabber.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=jabber_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_jabber
 X-Kopete-Messaging-Protocol=messaging/xmpp
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/protocols/meanwhile/kopete_meanwhile.desktop
+++ b/kopete/protocols/meanwhile/kopete_meanwhile.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=meanwhile_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_meanwhile
 X-Kopete-Messaging-Protocol=messaging/meanwhile
 X-TDE-PluginInfo-Author=Jeremy Kerr
--- a/kopete/protocols/oscar/aim/kopete_aim.desktop
+++ b/kopete/protocols/oscar/aim/kopete_aim.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=aim_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_aim
 X-Kopete-Messaging-Protocol=messaging/aim
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/protocols/oscar/icq/kopete_icq.desktop
+++ b/kopete/protocols/oscar/icq/kopete_icq.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=icq_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_icq
 X-Kopete-Messaging-Protocol=messaging/icq
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kopete/protocols/sms/kopete_sms.desktop
+++ b/kopete/protocols/sms/kopete_sms.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=sms_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-Kopete-Messaging-Protocol=messaging/sms
 X-TDE-Library=kopete_sms
 X-TDE-PluginInfo-Author=Richard Lärkäng
--- a/kopete/protocols/testbed/kopete_testbed.desktop
+++ b/kopete/protocols/testbed/kopete_testbed.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=testbed_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_testbed
 X-Kopete-Messaging-Protocol=messaging/testbed
 X-TDE-PluginInfo-Author=Will Stephenson
--- a/kopete/protocols/winpopup/kopete_wp.desktop
+++ b/kopete/protocols/winpopup/kopete_wp.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=wp_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_wp
 X-Kopete-Messaging-Protocol=messaging/winpopup
 X-TDE-PluginInfo-Author=Gav Wood
--- a/kopete/protocols/yahoo/kopete_yahoo.desktop
+++ b/kopete/protocols/yahoo/kopete_yahoo.desktop
@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=yahoo_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_yahoo
 X-Kopete-Messaging-Protocol=messaging/yahoo
 X-TDE-PluginInfo-Author=Kopete Developers
--- a/kpf/kpfapplet.desktop
+++ b/kpf/kpfapplet.desktop
@ -117,5 +117,5 @@ Comment[zh_TW]=能輕易在網路上分享檔案的小型網頁伺服器
 Icon=kpf
 X-TDE-Library=kpf_panelapplet
 X-TDE-UniqueApplet=true
-DocPath=kpf/index.html
+X-DocPath=kpf/index.html
 X-TDE-Parent-App=Kicker
--- a/kpf/kpfpropertiesdialogplugin.desktop
+++ b/kpf/kpfpropertiesdialogplugin.desktop
@ -53,4 +53,4 @@ Name[zh_HK]=KPF 目錄屬性頁
 Name[zh_TW]=KPF 目錄屬性頁
 X-TDE-Library=kpfpropertiesdialog
 X-TDE-Protocol=file
-ServiceTypes=KPropsDlg/Plugin,inode/directory
+X-TDE-ServiceTypes=KPropsDlg/Plugin,inode/directory
--- a/kppp/Kppp.desktop
+++ b/kppp/Kppp.desktop
@ -59,7 +59,7 @@ Name[ne]=के पी पी पी
 Name[sv]=Kppp
 Name[zh_TW]=KPPP 撥號工具
 MimeType=
-DocPath=kppp/index.html
+X-DocPath=kppp/index.html
 Exec=kppp %i %m
 Icon=kppp
 Path=
--- a/krdc/krdc.desktop
+++ b/krdc/krdc.desktop
@ -58,5 +58,5 @@ GenericName[uz@cyrillic]=Масофадаги иш столига уланиш
 GenericName[zh_CN]=远程桌面连接
 GenericName[zh_HK]=遠端桌面連線
 GenericName[zh_TW]=連接遠端桌面
-DocPath=krdc/index.html
+X-DocPath=krdc/index.html
 Categories=Qt;TDE;Network;RemoteAccess;
--- a/krdc/smb2rdc.desktop
+++ b/krdc/smb2rdc.desktop
@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-smb-server
+X-TDE-ServiceTypes=application/x-smb-server
 Actions=smb2rdc

 [Desktop Action smb2rdc]
--- a/krfb/kcm_krfb/kcmkrfb.desktop
+++ b/krfb/kcm_krfb/kcmkrfb.desktop
@ -2,7 +2,7 @@
 Icon=krfb
 Type=Application
 Exec=tdecmshell kcmkrfb
-DocPath=krfb/krfb-configuration.html
+X-DocPath=krfb/krfb-configuration.html

 X-TDE-ModuleType=Library
 X-TDE-Library=krfb
--- a/krfb/kinetd/kinetd.desktop
+++ b/krfb/kinetd/kinetd.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service

-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kinetd
 X-TDE-FactoryName=kinetd
--- a/krfb/krfb/kinetd_krfb.desktop
+++ b/krfb/krfb/kinetd_krfb.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service

-ServiceTypes=KInetDModule
+X-TDE-ServiceTypes=KInetDModule
 Exec=krfb
 X-TDE-FactoryName=kinetd
 X-TDE-KINETD-id=krfb
--- a/krfb/krfb/krfb.desktop
+++ b/krfb/krfb/krfb.desktop
@ -2,7 +2,7 @@
 Type=Application
 Exec=krfb -caption "%c" %i %m
 Icon=krfb
-DocPath=krfb/index.html
+X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
 Name[bn]=কে-আর-এফ-বি
--- a/krfb/krfb_httpd/kinetd_krfb_httpd.desktop
+++ b/krfb/krfb_httpd/kinetd_krfb_httpd.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service

-ServiceTypes=KInetDModule
+X-TDE-ServiceTypes=KInetDModule
 Exec=krfb_httpd
 X-TDE-FactoryName=kinetd
 X-TDE-KINETD-id=krfb_httpd
--- a/ksirc/ksirc.desktop
+++ b/ksirc/ksirc.desktop
@ -85,4 +85,4 @@ Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Network;IRCClient;
-DocPath=ksirc/index.html
+X-DocPath=ksirc/index.html
--- a/ktalkd/kcmktalkd/kcmktalkd.desktop
+++ b/ktalkd/kcmktalkd/kcmktalkd.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=ktalkd
 Type=Application
-DocPath=kcontrol/kcmtalkd/index.html
+X-DocPath=kcontrol/kcmtalkd/index.html
 Exec=tdecmshell kcmktalkd

 X-TDE-ModuleType=Library
--- a/lanbrowsing/kcmlisa/kcmreslisa.desktop
+++ b/lanbrowsing/kcmlisa/kcmreslisa.desktop
@ -2,7 +2,7 @@
 Type=Application
 Icon=samba
 Exec=tdecmshell kcmreslisa
-DocPath=lisa/index.html
+X-DocPath=lisa/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
 X-TDE-FactoryName=reslisa
--- a/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
@ -2,7 +2,7 @@
 Type=Application
 Icon=samba
 Exec=tdecmshell kcmtdeiolan
-DocPath=kcontrol/lanbrowser/index.html
+X-DocPath=kcontrol/lanbrowser/index.html

 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
--- a/lanbrowsing/tdeio_lan/lan.desktop
+++ b/lanbrowsing/tdeio_lan/lan.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Link
-DocPath=lisa/index.html
+X-DocPath=lisa/index.html
 URL=lan:/
 Icon=network_local
 Name=Local Network
--- a/tdednssd/kdedmodule/dnssdwatcher.desktop
+++ b/tdednssd/kdedmodule/dnssdwatcher.desktop
@ -87,7 +87,7 @@ Comment[uk]=Спостерігає за службами DNS-SD та оновл
 Comment[zh_CN]=跟踪 DNS-SD 服务并更新目录列表
 Comment[zh_HK]=監察 DNS-SD 服務並更新目錄清單
 Comment[zh_TW]=追蹤 DNS-SD 服務並更新目錄清單
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=dnssdwatcher
 X-TDE-FactoryName=dnssdwatcher
--- a/tdefile-plugins/torrent/tdefile_torrent.desktop
+++ b/tdefile-plugins/torrent/tdefile_torrent.desktop
@ -48,7 +48,7 @@ Name[uk]=Інформація про Bit Torrent
 Name[zh_CN]=BitTorrent 信息
 Name[zh_HK]=Bit Torrent 資訊
 Name[zh_TW]=Bit Torrent 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_torrent
 # change MimeType here! (example: inode/directory)
 MimeType=application/x-bittorrent
--- a/wifi/kcmwifi/kcmwifi.desktop
+++ b/wifi/kcmwifi/kcmwifi.desktop
@ -2,7 +2,7 @@
 Icon=kwifimanager
 Type=Application
 Exec=tdecmshell kcmwifi
-DocPath=kcontrol/kcmwifi/index.html
+X-DocPath=kcontrol/kcmwifi/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=wifi
 X-TDE-RootOnly=true
--- a/wifi/kwifimanager.desktop
+++ b/wifi/kwifimanager.desktop
@ -2,7 +2,7 @@
 Type=Application
 Exec=kwifimanager -caption "%c" %i %m
 Icon=kwifimanager
-DocPath=kwifimanager/index.html
+X-DocPath=kwifimanager/index.html
 Comment=A wireless LAN connection monitor
 Comment[ar]=مراقب أداء وصلة الشبكة المحلية اللاسلكبة
 Comment[bg]=Мониторинг на безжичната локална мрежа