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

68 files changed, 71 insertions, 71 deletions

diff --git a/atlantikdesigner/atlantikdesigner.desktop b/atlantikdesigner/atlantikdesigner.desktop
index ad110e2..7596c04 100644
--- a/atlantikdesigner/atlantikdesigner.desktop
+++ b/atlantikdesigner/atlantikdesigner.desktop
@@ -168,4 +168,4 @@ GenericName[uz@cyrillic]=Monopoly® ўйинга ўхшаган ўйин май�
 GenericName[vi]=Bộ thiết kế bảng kiểu Monopoly®
 GenericName[zh_CN]=类似 Monopoly(R) 的棋盘设计器
 GenericName[zh_TW]=類似 Monopoly® 棋盤設計師
-DocPath=atlantikdesigner/index.html
+X-DocPath=atlantikdesigner/index.html
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop b/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
index 10db1d4..1d16dfc 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.desktop
@@ -104,6 +104,6 @@ Comment[vi]=Bổ sung nhập/xuất khẩu liên lạc định dạng sổ đị
 Comment[zh_CN]=以 GMX 的地址簿格式导入和导出联系人
 Comment[zh_TW]=匯入/匯出 GMX 通訊錄格式的外掛程式
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
 
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
index d1652fc..c4d215d 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.desktop
@@ -107,6 +107,6 @@ Comment[vi]=Bổ sung xuất khẩu dữ liệu địa lý của liên lạc d�
 Comment[zh_CN]=将联系人的地理数据导出为 KWorldClock 中旗帜的插件
 Comment[zh_TW]=匯出 GEO 聯絡人資料為 KWorldClock 旗標
 Type=Service
-ServiceTypes=KAddressBook/XXPort
+X-TDE-ServiceTypes=KAddressBook/XXPort
 X-TDE-KAddressBook-XXPortPluginVersion=1
 
diff --git a/kate/cppsymbolviewer/katecppsymbolviewer.desktop b/kate/cppsymbolviewer/katecppsymbolviewer.desktop
index 937285e..2c2d885 100644
--- a/kate/cppsymbolviewer/katecppsymbolviewer.desktop
+++ b/kate/cppsymbolviewer/katecppsymbolviewer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katecppsymbolviewerplugin
 X-Kate-Version=2.5
 Name=Kate C/C++ Symbol Viewer
diff --git a/kate/filelistloader/katefll.desktop b/kate/filelistloader/katefll.desktop
index 0a5e58b..5987a50 100644
--- a/kate/filelistloader/katefll.desktop
+++ b/kate/filelistloader/katefll.desktop
@@ -77,7 +77,7 @@ Exec=kate --initplugin katefll_initplugin %u
 NoDisplay=true
 Icon=kate
 Path=
-DocPath=kate/index.html
+X-DocPath=kate/index.html
 Type=Application
 Terminal=false
 X-DCOP-ServiceType=Multi
diff --git a/kate/filelistloader/katefll_initplugin.desktop b/kate/filelistloader/katefll_initplugin.desktop
index bca8f14..4011499 100644
--- a/kate/filelistloader/katefll_initplugin.desktop
+++ b/kate/filelistloader/katefll_initplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/InitPlugin
+X-TDE-ServiceTypes=Kate/InitPlugin
 X-TDE-Library=katefll_initplugin
 X-Kate-Version=2.5
 Name=Kate FLL Init Plugin
diff --git a/kate/filelistloader/katefll_plugin.desktop b/kate/filelistloader/katefll_plugin.desktop
index c25c5ca..7b2a419 100644
--- a/kate/filelistloader/katefll_plugin.desktop
+++ b/kate/filelistloader/katefll_plugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katefll_plugin
 X-Kate-Version=2.5
 Name=Kate File List Loader
diff --git a/kate/filetemplates/plugin/katefiletemplates.desktop b/kate/filetemplates/plugin/katefiletemplates.desktop
index 3d5ca65..65d56f8 100644
--- a/kate/filetemplates/plugin/katefiletemplates.desktop
+++ b/kate/filetemplates/plugin/katefiletemplates.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-Kate-Version=2.5
 X-TDE-Library=katefiletemplates
 Name=Kate File Templates
diff --git a/kate/helloworld/katehelloworld.desktop b/kate/helloworld/katehelloworld.desktop
index 6932e8d..2aada7c 100644
--- a/kate/helloworld/katehelloworld.desktop
+++ b/kate/helloworld/katehelloworld.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katehelloworldplugin
 X-Kate-Version=2.5
 Name=My First Kate Plugin
diff --git a/kate/htmltools/katehtmltools.desktop b/kate/htmltools/katehtmltools.desktop
index 6754c3f..6f361a6 100644
--- a/kate/htmltools/katehtmltools.desktop
+++ b/kate/htmltools/katehtmltools.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katehtmltoolsplugin
 X-Kate-Version=2.5
 Name=Kate HTML Tools
diff --git a/kate/insertcommand/kateinsertcommand.desktop b/kate/insertcommand/kateinsertcommand.desktop
index 606f21c..b762662 100644
--- a/kate/insertcommand/kateinsertcommand.desktop
+++ b/kate/insertcommand/kateinsertcommand.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=kateinsertcommandplugin
 X-Kate-Version=2.5
 Name=Kate InsertCommand
diff --git a/kate/kate-plugins.desktop b/kate/kate-plugins.desktop
index c35d9a5..67d8767 100644
--- a/kate/kate-plugins.desktop
+++ b/kate/kate-plugins.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Icon=kate
-DocPath=kate-plugins/index.html
+X-DocPath=kate-plugins/index.html
 Categories=Qt;TDE;TextEditor;
 NoDisplay=true
 Name=Kate Plugins
diff --git a/kate/katesort/katesort.desktop b/kate/katesort/katesort.desktop
index 30aa04f..7bc098e 100644
--- a/kate/katesort/katesort.desktop
+++ b/kate/katesort/katesort.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katesortplugin
 X-Kate-Version=2.5
 Name=Kate Sort
diff --git a/kate/kjswrapper/samples/katekjsconsolewindow.desktop b/kate/kjswrapper/samples/katekjsconsolewindow.desktop
index 7412384..a98a637 100644
--- a/kate/kjswrapper/samples/katekjsconsolewindow.desktop
+++ b/kate/kjswrapper/samples/katekjsconsolewindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjsconsolewindow
diff --git a/kate/kjswrapper/samples/katekjsselect.desktop b/kate/kjswrapper/samples/katekjsselect.desktop
index ce5472a..38b9701 100644
--- a/kate/kjswrapper/samples/katekjsselect.desktop
+++ b/kate/kjswrapper/samples/katekjsselect.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjsselect
diff --git a/kate/kjswrapper/samples/katekjstest1.desktop b/kate/kjswrapper/samples/katekjstest1.desktop
index 95fbeaf..6ce1fc0 100644
--- a/kate/kjswrapper/samples/katekjstest1.desktop
+++ b/kate/kjswrapper/samples/katekjstest1.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katekjswrapperplugin
 X-Kate-Version=2.2
 X-Kate-PluginName=katekjstest1
diff --git a/kate/kpybrowser/katepybrowse.desktop b/kate/kpybrowser/katepybrowse.desktop
index bd18aa2..bdfba0d 100644
--- a/kate/kpybrowser/katepybrowse.desktop
+++ b/kate/kpybrowser/katepybrowse.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katepybrowseplugin
 X-Kate-Version=2.5
 Name=Kate Python Browser Plugin
diff --git a/kate/make/katemake.desktop b/kate/make/katemake.desktop
index a85840d..1ba4c52 100644
--- a/kate/make/katemake.desktop
+++ b/kate/make/katemake.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katemakeplugin
 X-Kate-Version=2.5
 Name=Kate Make Plugin
diff --git a/kate/modeline/katemodeline.desktop b/kate/modeline/katemodeline.desktop
index d69b29f..2e91a81 100644
--- a/kate/modeline/katemodeline.desktop
+++ b/kate/modeline/katemodeline.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katemodelineplugin
 X-Kate-Version=2.5
 Name=Kate Modeline Plugin
diff --git a/kate/openheader/kateopenheader.desktop b/kate/openheader/kateopenheader.desktop
index 9fee65a..9d1f439 100644
--- a/kate/openheader/kateopenheader.desktop
+++ b/kate/openheader/kateopenheader.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=kateopenheaderplugin
 X-Kate-Version=2.5
 Name=Kate OpenHeader
diff --git a/kate/snippets/katesnippets.desktop b/kate/snippets/katesnippets.desktop
index 6fa1607..8da62f1 100644
--- a/kate/snippets/katesnippets.desktop
+++ b/kate/snippets/katesnippets.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katesnippetsplugin
 X-Kate-Version=2.5
 Name=Kate Snippets
diff --git a/kate/tabbarextension/katetabbarextension.desktop b/kate/tabbarextension/katetabbarextension.desktop
index ef1e43e..75ef55e 100644
--- a/kate/tabbarextension/katetabbarextension.desktop
+++ b/kate/tabbarextension/katetabbarextension.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=libkatetabbarextensionplugin
 X-Kate-Version=2.5
 Name=Kate Tab Bar Extension
diff --git a/kate/textfilter/katetextfilter.desktop b/kate/textfilter/katetextfilter.desktop
index 4f1fef6..db79eee 100644
--- a/kate/textfilter/katetextfilter.desktop
+++ b/kate/textfilter/katetextfilter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katetextfilterplugin
 X-Kate-Version=2.5
 Name=Kate TextFilter
diff --git a/kate/xmlcheck/katexmlcheck.desktop b/kate/xmlcheck/katexmlcheck.desktop
index 0e378df..f24f557 100644
--- a/kate/xmlcheck/katexmlcheck.desktop
+++ b/kate/xmlcheck/katexmlcheck.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katexmlcheckplugin
 X-Kate-Version=2.5
 Name=Kate XML Validation
diff --git a/kate/xmltools/katexmltools.desktop b/kate/xmltools/katexmltools.desktop
index 9a95872..5c20173 100644
--- a/kate/xmltools/katexmltools.desktop
+++ b/kate/xmltools/katexmltools.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=katexmltoolsplugin
 X-Kate-Version=2.5
 Name=Kate XML Completion
diff --git a/kicker-applets/kolourpicker/kolourpicker.desktop b/kicker-applets/kolourpicker/kolourpicker.desktop
index 02a2785..a2bdf0b 100644
--- a/kicker-applets/kolourpicker/kolourpicker.desktop
+++ b/kicker-applets/kolourpicker/kolourpicker.desktop
@@ -141,5 +141,5 @@ Comment[zh_TW]=從點選的地方取得顏色值
 Comment[zu]=Cosha imibala kunoma ikephi kanye namabizo azo ufumane amaxabiso ayo
 X-TDE-Library=kolourpicker_panelapplet
 X-TDE-UniqueApplet=true
-DocPath=kicker-applets/kolourpicker.html
+X-DocPath=kicker-applets/kolourpicker.html
 X-TDE-ParentApp=applets
diff --git a/kicker-applets/ktimemon/ktimemon.desktop b/kicker-applets/ktimemon/ktimemon.desktop
index 4c2bf2d..98c08ad 100644
--- a/kicker-applets/ktimemon/ktimemon.desktop
+++ b/kicker-applets/ktimemon/ktimemon.desktop
@@ -124,6 +124,6 @@ Name[xh]=Indlela yokwenza yeCebo lokubonisa
 Name[zh_CN]=系统监视器
 Name[zh_TW]=系統監視器
 Name[zu]=Umphendli Wendlela esetshenziswayo
-DocPath=kicker-applets/ktimemon.html
+X-DocPath=kicker-applets/ktimemon.html
 X-TDE-StartupNotify=true
 X-TDE-ParentApp=applets
diff --git a/konq-plugins/akregator/akregator_konqplugin.desktop b/konq-plugins/akregator/akregator_konqplugin.desktop
index 6d7021e..594da75 100644
--- a/konq-plugins/akregator/akregator_konqplugin.desktop
+++ b/konq-plugins/akregator/akregator_konqplugin.desktop
@@ -51,4 +51,4 @@ Name[vi]=Thêm nguồn tin vào Akregator
 Name[zh_CN]=在 Akregator 中添加种子
 Name[zh_TW]=將 Feed 加入 Akregator
 X-TDE-Library=libakregatorkonqplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/arkplugin/ark_plugin.desktop b/konq-plugins/arkplugin/ark_plugin.desktop
index 89f6f4c..58d3699 100644
--- a/konq-plugins/arkplugin/ark_plugin.desktop
+++ b/konq-plugins/arkplugin/ark_plugin.desktop
@@ -56,4 +56,4 @@ Name[vi]=Nén/Giải nén tập tin
 Name[zh_CN]=压缩/解压文件
 Name[zh_TW]=壓縮/解壓縮檔案
 X-TDE-Library=libarkplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/arkplugin/arkplugin.desktop b/konq-plugins/arkplugin/arkplugin.desktop
index 609cb35..2f6b044 100644
--- a/konq-plugins/arkplugin/arkplugin.desktop
+++ b/konq-plugins/arkplugin/arkplugin.desktop
@@ -56,4 +56,4 @@ Name[zh_CN]=用 Ark 压缩/解压文件
 Name[zh_TW]=以 Ark 壓縮/解壓縮檔案
 Icon=ark
 X-TDE-ParentApp=konqueror
-DocPath=ark/index.html
+X-DocPath=ark/index.html
diff --git a/konq-plugins/babelfish/plugin_babelfish.desktop b/konq-plugins/babelfish/plugin_babelfish.desktop
index 623a105..12f6695 100644
--- a/konq-plugins/babelfish/plugin_babelfish.desktop
+++ b/konq-plugins/babelfish/plugin_babelfish.desktop
@@ -123,4 +123,4 @@ Comment[zh_CN]=Babelfish 插件
 Comment[zh_TW]=Babelfish 外掛程式
 Icon=babelfish
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/babel/index.html
+X-DocPath=konq-plugins/babel/index.html
diff --git a/konq-plugins/crashes/crashesplugin.desktop b/konq-plugins/crashes/crashesplugin.desktop
index 96a49f6..1ef344f 100644
--- a/konq-plugins/crashes/crashesplugin.desktop
+++ b/konq-plugins/crashes/crashesplugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=崩溃监视器
 Comment[zh_TW]=當機監視器
 X-TDE-ParentApp=konqueror
 Icon=core
-DocPath=konq-plugins/crashes/index.html
+X-DocPath=konq-plugins/crashes/index.html
diff --git a/konq-plugins/dirfilter/dirfilter_plugin.desktop b/konq-plugins/dirfilter/dirfilter_plugin.desktop
index 35e5b9b..bd7da6a 100644
--- a/konq-plugins/dirfilter/dirfilter_plugin.desktop
+++ b/konq-plugins/dirfilter/dirfilter_plugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=目录过滤器插件
 Comment[zh_TW]=目錄過濾器外掛程式
 Icon=filter
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/dirfilter/index.html
+X-DocPath=konq-plugins/dirfilter/index.html
diff --git a/konq-plugins/dirfilter/dirfilterplugin.desktop b/konq-plugins/dirfilter/dirfilterplugin.desktop
index 4b2e814..77e8dc7 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.desktop
+++ b/konq-plugins/dirfilter/dirfilterplugin.desktop
@@ -121,4 +121,4 @@ Comment[zh_CN]=目录过滤器插件
 Comment[zh_TW]=目錄過濾器外掛程式
 Icon=filter
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/dirfilter/index.html
+X-DocPath=konq-plugins/dirfilter/index.html
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop b/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
index f86ecc1..bdb3df1 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
@@ -125,4 +125,4 @@ Comment[zh_CN]=DOM 树形视图查看器
 Comment[zh_TW]=DOM 樹檢視器
 Icon=domtreeviewer
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/domtreeviewer/index.html
+X-DocPath=konq-plugins/domtreeviewer/index.html
diff --git a/konq-plugins/fsview/fsview.desktop b/konq-plugins/fsview/fsview.desktop
index 1ca24ee..d7bd0f1 100644
--- a/konq-plugins/fsview/fsview.desktop
+++ b/konq-plugins/fsview/fsview.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=fsview -caption "%c" %i %m %u
 MimeType=inode/directory
 Icon=fsview
-DocPath=konq-plugins/fsview/index.html
+X-DocPath=konq-plugins/fsview/index.html
 Terminal=false
 Name=FSView
 GenericName=File Size Viewer
diff --git a/konq-plugins/fsview/fsview_part.desktop b/konq-plugins/fsview/fsview_part.desktop
index 74c6f70..4edc8ab 100644
--- a/konq-plugins/fsview/fsview_part.desktop
+++ b/konq-plugins/fsview/fsview_part.desktop
@@ -51,8 +51,8 @@ Name[vi]=Xem cỡ tập tin
 Name[zh_CN]=文件大小查看
 Name[zh_TW]=檔案大小檢視器
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libfsviewpart
 Type=Service
 Icon=fsview
-DocPath=konq-plugins/fsview/index.html
+X-DocPath=konq-plugins/fsview/index.html
diff --git a/konq-plugins/imagerotation/imageconverter.desktop b/konq-plugins/imagerotation/imageconverter.desktop
index a54279e..1876a07 100644
--- a/konq-plugins/imagerotation/imageconverter.desktop
+++ b/konq-plugins/imagerotation/imageconverter.desktop
@@ -3,7 +3,7 @@
 # Released under the same license as the KDE core distribution (GPL 2.0).
 #
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-TDE-Submenu=Convert To
 X-TDE-Submenu[bg]=Конвертиране в
diff --git a/konq-plugins/imagerotation/jpegorient.desktop b/konq-plugins/imagerotation/jpegorient.desktop
index d9a9677..bed67a9 100644
--- a/konq-plugins/imagerotation/jpegorient.desktop
+++ b/konq-plugins/imagerotation/jpegorient.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/jpeg
+X-TDE-ServiceTypes=image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;
 X-TDE-Submenu=Transform Image
 X-TDE-Submenu[bg]=Конвертиране на изображението
diff --git a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
index 0e03feb..c804b65 100644
--- a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
+++ b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
@@ -126,4 +126,4 @@ Comment[zh_CN]=生成 HTML 图像集的简捷方式
 Comment[zh_TW]=簡單建立 HTML 相簿的方法
 Icon=imagegallery
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/imgallery/index.html
+X-DocPath=konq-plugins/imgallery/index.html
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
index 7da07bc..d0dc040 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
@@ -199,4 +199,4 @@ Keywords[xh]=kuick;khuphela;hambisa
 Keywords[zh_CN]=kuick;copy;move;复制;移动
 Keywords[zu]=kuick;khiphela;susa
 X-TDE-ParentApp=kcontrol
-DocPath=konq-plugins/kuick/index.html
+X-DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/kuick/kuick_plugin.desktop b/konq-plugins/kuick/kuick_plugin.desktop
index ffab27f..dba182c 100644
--- a/konq-plugins/kuick/kuick_plugin.desktop
+++ b/konq-plugins/kuick/kuick_plugin.desktop
@@ -64,4 +64,4 @@ Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
 Icon=tdemultiple
 X-TDE-Library=libkuickplugin
-ServiceTypes=KonqPopupMenu/Plugin,all/all
+X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/kuick/kuickplugin.desktop b/konq-plugins/kuick/kuickplugin.desktop
index f015481..7af2c7d 100644
--- a/konq-plugins/kuick/kuickplugin.desktop
+++ b/konq-plugins/kuick/kuickplugin.desktop
@@ -63,4 +63,4 @@ Name[zh_TW]=Kuick 複製與移動
 Name[zu]=Kuick Khiphela futhi Ususe
 Icon=tdemultiple
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/kuick/index.html
+X-DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/mediarealfolder/media_realfolder.desktop b/konq-plugins/mediarealfolder/media_realfolder.desktop
index d276884..830c5f9 100644
--- a/konq-plugins/mediarealfolder/media_realfolder.desktop
+++ b/konq-plugins/mediarealfolder/media_realfolder.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
 Actions=MediaRealFolder
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/konq-plugins/minitools/minitoolsplugin.desktop b/konq-plugins/minitools/minitoolsplugin.desktop
index 0de8a33..0f602e1 100644
--- a/konq-plugins/minitools/minitoolsplugin.desktop
+++ b/konq-plugins/minitools/minitoolsplugin.desktop
@@ -118,4 +118,4 @@ Comment[uk]=Міні-засоби
 Comment[vi]=Công cụ nhỏ
 Comment[zh_CN]=小工具
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/minitools/index.html
+X-DocPath=konq-plugins/minitools/index.html
diff --git a/konq-plugins/rsync/rsync_plugin.desktop b/konq-plugins/rsync/rsync_plugin.desktop
index 74b09d3..448fa36 100644
--- a/konq-plugins/rsync/rsync_plugin.desktop
+++ b/konq-plugins/rsync/rsync_plugin.desktop
@@ -14,4 +14,4 @@ Name=Remote Folder Synchronization Plugin
 Comment=Remote folder synchronization plugin
 Icon=remotesync
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/rsync/index.html
+X-DocPath=konq-plugins/rsync/index.html
diff --git a/konq-plugins/rsync/rsyncplugin.desktop b/konq-plugins/rsync/rsyncplugin.desktop
index 0251090..6da2b55 100644
--- a/konq-plugins/rsync/rsyncplugin.desktop
+++ b/konq-plugins/rsync/rsyncplugin.desktop
@@ -12,4 +12,4 @@ Name=Remote Folder Synchronization Plugin
 Comment=Remote folder synchronization plugin
 Icon=remotesync
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/rsync/index.html
+X-DocPath=konq-plugins/rsync/index.html
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop b/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
index 8fb14ef..36670fe 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayerplugin.desktop
@@ -112,4 +112,4 @@ Comment[zh_TW]=在 Konqueror 導覽面板上的媒體播放器外掛程式
 Icon=konqsidebar_mediaplayer
 X-TDE-ParentApp=konqueror
 X-TDE-KonqSidebarUniversal=true
-DocPath=konq-plugins/mediaplayer/index.html
+X-DocPath=konq-plugins/mediaplayer/index.html
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 167009e..3ff2e88 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -101,9 +101,9 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
         }
       }
 
-      if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "ServiceTypes" ) ){
-          const TQStringList types = cfg.readListEntry( "ServiceTypes" );
-          const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
+      if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "X-TDE-ServiceTypes" ) ){
+          const TQStringList types = cfg.readListEntry( "X-TDE-ServiceTypes" );
+          const TQStringList excludeTypes = cfg.readListEntry( "X-TDE-ExcludeServiceTypes" );
           bool ok = false;
 
           for (TQStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){
diff --git a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
index 417f0b9..fd28d4e 100644
--- a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
+++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop
@@ -133,4 +133,4 @@ Comment[zh_CN]=改变 TDEHTML 设置的快速方式
 Comment[zh_TW]=快速變更 TDEHTML 設定的方法
 X-TDE-ParentApp=konqueror
 Icon=configure
-DocPath=konq-plugins/tdehtmlsettings/index.html
+X-DocPath=konq-plugins/tdehtmlsettings/index.html
diff --git a/konq-plugins/uachanger/uachangerplugin.desktop b/konq-plugins/uachanger/uachangerplugin.desktop
index 962b2f1..7999d77 100644
--- a/konq-plugins/uachanger/uachangerplugin.desktop
+++ b/konq-plugins/uachanger/uachangerplugin.desktop
@@ -118,4 +118,4 @@ Comment[zh_CN]=用来更换用户代理的插件
 Comment[zh_TW]=改變使用者代理人的外掛程式
 X-TDE-ParentApp=konqueror
 Icon=agent
-DocPath=konq-plugins/uachanger/index.html
+X-DocPath=konq-plugins/uachanger/index.html
diff --git a/konq-plugins/validators/plugin_validators.desktop b/konq-plugins/validators/plugin_validators.desktop
index bf9874d..5a56a8d 100644
--- a/konq-plugins/validators/plugin_validators.desktop
+++ b/konq-plugins/validators/plugin_validators.desktop
@@ -125,4 +125,4 @@ Comment[zh_CN]=CSS 和 HTML 校验插件
 Comment[zh_TW]=CSS 與 HTML 驗證外掛程式
 Icon=validators
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/validators/index.html
+X-DocPath=konq-plugins/validators/index.html
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.desktop b/konq-plugins/webarchiver/plugin_webarchiver.desktop
index 0ed2c26..0134d95 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.desktop
+++ b/konq-plugins/webarchiver/plugin_webarchiver.desktop
@@ -127,4 +127,4 @@ Comment[zh_CN]=创建网站存档
 Comment[zh_TW]=建立網站的檔案
 Icon=webarchiver
 X-TDE-ParentApp=konqueror
-DocPath=konq-plugins/webarchiver/index.html
+X-DocPath=konq-plugins/webarchiver/index.html
diff --git a/konq-plugins/webarchiver/webarchivethumbnail.desktop b/konq-plugins/webarchiver/webarchivethumbnail.desktop
index 6759e62..9f8d0a7 100644
--- a/konq-plugins/webarchiver/webarchivethumbnail.desktop
+++ b/konq-plugins/webarchiver/webarchivethumbnail.desktop
@@ -70,7 +70,7 @@ Name[xh]=Iindawo zokugcina ze web
 Name[zh_CN]=Web 存档
 Name[zh_TW]=Web 檔案館
 Name[zu]=Ushicilelo lukawonke umuntu kanye nemiqulu emidala yeWeb
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-webarchive
 X-TDE-Library=webarchivethumbnail
 CacheThumbnail=true
diff --git a/ksig/ksig.desktop b/ksig/ksig.desktop
index 4386ac5..8ccafd1 100644
--- a/ksig/ksig.desktop
+++ b/ksig/ksig.desktop
@@ -68,4 +68,4 @@ GenericName[vi]=Bộ soạn thảo chữ ký
 GenericName[zh_CN]=签名编辑器
 GenericName[zh_TW]=簽名編輯器
 Categories=Qt;TDE;Office;X-TDE-Office-PIM;
-DocPath=ksig/index.html
+X-DocPath=ksig/index.html
diff --git a/renamedlgplugins/audio/renaudiodlg.desktop b/renamedlgplugins/audio/renaudiodlg.desktop
index c595f10..0cc6018 100644
--- a/renamedlgplugins/audio/renaudiodlg.desktop
+++ b/renamedlgplugins/audio/renaudiodlg.desktop
@@ -60,4 +60,4 @@ Name[vi]=Xem thử âm thanh
 Name[zh_CN]=音频预览
 Name[zh_TW]=音效預覽
 X-TDE-Library=librenaudioplugin
-ServiceTypes=RenameDlg/Plugin,audio/x-mp3,audio/x-wav,application/ogg
+X-TDE-ServiceTypes=RenameDlg/Plugin,audio/x-mp3,audio/x-wav,application/ogg
diff --git a/renamedlgplugins/images/renimagedlg.desktop b/renamedlgplugins/images/renimagedlg.desktop
index 2e13c6e..88040bd 100644
--- a/renamedlgplugins/images/renimagedlg.desktop
+++ b/renamedlgplugins/images/renimagedlg.desktop
@@ -63,4 +63,4 @@ Name[xh]=Umbonisi wo Mfanekiso
 Name[zh_CN]=图像显示器
 Name[zh_TW]=影像顯示器
 X-TDE-Library=librenimageplugin
-ServiceTypes=RenameDlg/Plugin,image/jpeg,image/png
+X-TDE-ServiceTypes=RenameDlg/Plugin,image/jpeg,image/png
diff --git a/tdefile-plugins/cert/tdefile_cert.desktop b/tdefile-plugins/cert/tdefile_cert.desktop
index 3e589b8..7e4bce5 100644
--- a/tdefile-plugins/cert/tdefile_cert.desktop
+++ b/tdefile-plugins/cert/tdefile_cert.desktop
@@ -53,7 +53,7 @@ Name[uz@cyrillic]=Сертификат ҳақида маълумот
 Name[vi]=Thông tin chứng nhận
 Name[zh_CN]=证书信息
 Name[zh_TW]=憑證資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_cert
 MimeType=application/x-x509-ca-cert
 PreferredGroups=certInfo,certSubjectInfo
diff --git a/tdefile-plugins/desktop/tdefile_desktop.cpp b/tdefile-plugins/desktop/tdefile_desktop.cpp
index 1804ade..e3d432d 100644
--- a/tdefile-plugins/desktop/tdefile_desktop.cpp
+++ b/tdefile-plugins/desktop/tdefile_desktop.cpp
@@ -108,7 +108,7 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint )
             appendItem(group, "File Type", mt->comment());
         }
         
-        TQString sType = file.readEntry("ServiceTypes");
+        TQString sType = file.readEntry("X-TDE-ServiceTypes");
         appendItem(group, "Service Type", sType);
 
         if (sType == "KFilePlugin")
diff --git a/tdefile-plugins/desktop/tdefile_desktop.desktop b/tdefile-plugins/desktop/tdefile_desktop.desktop
index ad9a851..bab49c3 100644
--- a/tdefile-plugins/desktop/tdefile_desktop.desktop
+++ b/tdefile-plugins/desktop/tdefile_desktop.desktop
@@ -62,7 +62,7 @@ Name[vi]=Thông tin mục nhập môi trường
 Name[xh]=Ungeniso Lolwazi lwe Desktop
 Name[zh_CN]=桌面项目信息
 Name[zh_TW]=桌面項目資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_desktop
 MimeType=application/x-desktop
 PreferredItems=Name,Comment,Type,Service Type
diff --git a/tdefile-plugins/folder/tdefile_folder.desktop b/tdefile-plugins/folder/tdefile_folder.desktop
index 8f14b20..372b401 100644
--- a/tdefile-plugins/folder/tdefile_folder.desktop
+++ b/tdefile-plugins/folder/tdefile_folder.desktop
@@ -63,7 +63,7 @@ Name[vi]=Thông tin thư mục
 Name[xh]=Ulwazi lwencwadi enencukhacha
 Name[zh_CN]=文件夹信息
 Name[zh_TW]=資料夾資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_folder
 MimeType=inode/directory
 PreferredGroups=FolderInfo
diff --git a/tdefile-plugins/html/tdefile_html.desktop b/tdefile-plugins/html/tdefile_html.desktop
index 4dfd89c..fb5c5a8 100644
--- a/tdefile-plugins/html/tdefile_html.desktop
+++ b/tdefile-plugins/html/tdefile_html.desktop
@@ -60,7 +60,7 @@ Name[vi]=Thông tin danh mục nhạc HTML
 Name[xh]=Ulwazi loluhlu lodweliso lomdlali we HTML
 Name[zh_CN]=HTML 播放列表信息
 Name[zh_TW]=HTML 播放清單資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_html
 MimeType=text/html
 PreferredItems=Title,Javascript,Doctype,Keywords
diff --git a/tdefile-plugins/lnk/tdefile_lnk.desktop b/tdefile-plugins/lnk/tdefile_lnk.desktop
index b7d28c7..54771f8 100644
--- a/tdefile-plugins/lnk/tdefile_lnk.desktop
+++ b/tdefile-plugins/lnk/tdefile_lnk.desktop
@@ -56,7 +56,7 @@ Name[uz@cyrillic]=Windows lnk файли ҳақида маълумот
 Name[vi]=Thông tin tập tin Ink Windows
 Name[zh_CN]=Windows lnk 文件信息
 Name[zh_TW]=Windows lnk 檔資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_lnk
 MimeType=application/x-win-lnk
 PreferredItems=PointsTo,Where,TargetSize,Description
diff --git a/tdefile-plugins/mhtml/tdefile_mhtml.desktop b/tdefile-plugins/mhtml/tdefile_mhtml.desktop
index bbcac48..f0d00b5 100644
--- a/tdefile-plugins/mhtml/tdefile_mhtml.desktop
+++ b/tdefile-plugins/mhtml/tdefile_mhtml.desktop
@@ -53,7 +53,7 @@ Name[uz@cyrillic]=mhtml файллари ҳақида маълумот
 Name[vi]=Thông tin mhtml
 Name[zh_CN]=mhtml 信息
 Name[zh_TW]=mhtml 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_mhtml
 MimeType=application/x-mimearchive
 PreferredGroups=mhtmlInfo
diff --git a/tdefile-plugins/txt/tdefile_txt.desktop b/tdefile-plugins/txt/tdefile_txt.desktop
index ab06d5f..3d8a9f1 100644
--- a/tdefile-plugins/txt/tdefile_txt.desktop
+++ b/tdefile-plugins/txt/tdefile_txt.desktop
@@ -63,7 +63,7 @@ Name[vi]=Thông tin tập tin văn bản
 Name[xh]=Ulwazi Lombhalo Wefayile
 Name[zh_CN]=文本文件信息
 Name[zh_TW]=文字檔案資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_txt
 MimeType=text/plain
 PreferredGroups=General
diff --git a/tutorials/docprimer.desktop b/tutorials/docprimer.desktop
index b2d2a21..8813d00 100644
--- a/tutorials/docprimer.desktop
+++ b/tutorials/docprimer.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=The TDE Documentation Primer
-DocPath=help:/khelpcenter/docprimer/index.html
+X-DocPath=help:/khelpcenter/docprimer/index.html
 Icon=khelpcenter
diff --git a/tutorials/markup.desktop b/tutorials/markup.desktop
index 3ac4ebb..f34ff91 100644
--- a/tutorials/markup.desktop
+++ b/tutorials/markup.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=The TDE DocBook Markup Guide
-DocPath=help:/khelpcenter/markup/index.html
+X-DocPath=help:/khelpcenter/markup/index.html
 Icon=khelpcenter
diff --git a/tutorials/styleguide.desktop b/tutorials/styleguide.desktop
index 17235ba..ba8fa54 100644
--- a/tutorials/styleguide.desktop
+++ b/tutorials/styleguide.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=The TDE Help Handbook Style Guide
-DocPath=help:/khelpcenter/styleguide/index.html
+X-DocPath=help:/khelpcenter/styleguide/index.html
 Icon=khelpcenter