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

64 files changed, 81 insertions, 81 deletions

diff --git a/kamera/kcontrol/kamera.desktop b/kamera/kcontrol/kamera.desktop
index 6feba93c..8d47e91d 100644
--- a/kamera/kcontrol/kamera.desktop
+++ b/kamera/kcontrol/kamera.desktop
@@ -189,6 +189,6 @@ X-TDE-Library=kamera
 X-TDE-ModuleType=Library
 Icon=camera
 Exec=tdecmshell kamera
-DocPath=kamera/index.html
+X-DocPath=kamera/index.html
 Categories=Qt;TDE;Settings;X-TDE-settings-hardware;
 OnlyShowIn=TDE;
diff --git a/kcoloredit/kcolorchooser.desktop b/kcoloredit/kcolorchooser.desktop
index 22c8d21e..1cb1f5da 100644
--- a/kcoloredit/kcolorchooser.desktop
+++ b/kcoloredit/kcolorchooser.desktop
@@ -4,7 +4,7 @@ Exec=kcolorchooser %i %m
 Icon=kcolorchooser
 Path=
 Terminal=false
-DocPath=kcoloredit/index.html
+X-DocPath=kcoloredit/index.html
 GenericName=Color Chooser
 GenericName[af]=Kleur Kieser
 GenericName[ar]=برنامج اختيار الألوان
diff --git a/kcoloredit/kcoloredit.desktop b/kcoloredit/kcoloredit.desktop
index 36c013b3..26663c32 100644
--- a/kcoloredit/kcoloredit.desktop
+++ b/kcoloredit/kcoloredit.desktop
@@ -4,7 +4,7 @@ Exec=kcoloredit %i %m %U
 Icon=kcoloredit
 Path=
 Terminal=false
-DocPath=kcoloredit/index.html
+X-DocPath=kcoloredit/index.html
 GenericName=Color Palette Editor
 GenericName[af]=Kleur Palet Redigeerder
 GenericName[ar]=محرر لوحة الألوان
diff --git a/kdvi/kdvi.desktop b/kdvi/kdvi.desktop
index 5f040baa..3eb980c3 100644
--- a/kdvi/kdvi.desktop
+++ b/kdvi/kdvi.desktop
@@ -76,15 +76,15 @@ Name[eo]=DVI-rigardilo
 Name[hi]=के-डीवीआई
 Name[zh_TW]=KDVI 檢視器
 MimeType=application/x-dvi;application/x-gzdvi;application/x-bz2dvi;
-InitialPreference=6
+X-TDE-InitialPreference=6
 Exec=kdvi %f -caption "%c" %i %m
 Icon=kdvi
 Path=
 Type=Application
 Terminal=false
-ServiceTypes=Browser/View
+X-TDE-ServiceTypes=Browser/View
 X-TDE-Library=kviewerpart
 X-TDE-BrowserView-Args=dvi
-DocPath=kdvi/index.html
+X-DocPath=kdvi/index.html
 X-TDE-StartupNotify=true
 Categories=Qt;TDE;Graphics;
diff --git a/kdvi/kdvimultipage.desktop b/kdvi/kdvimultipage.desktop
index 4565ac1e..9d3f6915 100644
--- a/kdvi/kdvimultipage.desktop
+++ b/kdvi/kdvimultipage.desktop
@@ -12,7 +12,7 @@ Name[nn]=KDVI-fleirside
 Name[pt]=KDVIMultiPágina
 Name[ro]=KDVI Pagini Multiple
 Name[sv]=KDVI flera sidor
-ServiceTypes=KViewShell/MultiPage
+X-TDE-ServiceTypes=KViewShell/MultiPage
 X-TDE-Library=kdvipart
 X-TDE-MimeTypes=application/x-dvi
 X-TDE-MultiPageVersion=2
diff --git a/kfax/kfax.desktop b/kfax/kfax.desktop
index ca409914..9d6c674a 100644
--- a/kfax/kfax.desktop
+++ b/kfax/kfax.desktop
@@ -84,4 +84,4 @@ Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Graphics;
-DocPath=kfax/index.html
+X-DocPath=kfax/index.html
diff --git a/kfaxview/kfaxmultipage.desktop b/kfaxview/kfaxmultipage.desktop
index b25a1654..dcbad7b5 100644
--- a/kfaxview/kfaxmultipage.desktop
+++ b/kfaxview/kfaxmultipage.desktop
@@ -54,7 +54,7 @@ Comment[uk]=Втулок перегляду файлів факсів для KVi
 Comment[zh_CN]=传真文件的 KViewShell 插件
 Comment[zh_HK]=傳真檔的 KViewShell 插件
 Comment[zh_TW]=KViewShell 傳真檔外掛程式
-ServiceTypes=KViewShell/MultiPage
+X-TDE-ServiceTypes=KViewShell/MultiPage
 X-TDE-MimeTypes=image/fax-g3
 X-TDE-Library=kfaxviewpart
 X-TDE-MultiPageVersion=2
diff --git a/kfaxview/kfaxmultipage_tiff.desktop b/kfaxview/kfaxmultipage_tiff.desktop
index 68ebc0d6..467380a5 100644
--- a/kfaxview/kfaxmultipage_tiff.desktop
+++ b/kfaxview/kfaxmultipage_tiff.desktop
@@ -51,7 +51,7 @@ Comment[uk]=Втулок перегляду файлів факсів для KVi
 Comment[zh_CN]=传真文件的 KViewShell 插件
 Comment[zh_HK]=傳真檔的 KViewShell 插件
 Comment[zh_TW]=KViewShell 傳真檔外掛程式
-ServiceTypes=KViewShell/MultiPage
+X-TDE-ServiceTypes=KViewShell/MultiPage
 X-TDE-MimeTypes=image/tiff
 X-TDE-Library=kfaxviewpart
 X-TDE-MultiPageVersion=2
diff --git a/kfaxview/kfaxview.desktop b/kfaxview/kfaxview.desktop
index 29f08842..380e5021 100644
--- a/kfaxview/kfaxview.desktop
+++ b/kfaxview/kfaxview.desktop
@@ -68,15 +68,15 @@ Name[ne]=केडीई फ्याक्स दृश्य
 Name[sv]=Kfaxview
 Name[zh_TW]=KFaxView 傳真檢視
 MimeType=image/fax-g3;
-InitialPreference=6
+X-TDE-InitialPreference=6
 Exec=kfaxview %f
 Icon=kfaxview
 Path=
 Type=Application
 Terminal=false
-ServiceTypes=Browser/View
+X-TDE-ServiceTypes=Browser/View
 X-TDE-Library=kviewerpart
 X-TDE-BrowserView-Args=fax
-DocPath=kfaxview/index.html
+X-DocPath=kfaxview/index.html
 X-TDE-StartupNotify=true
 Categories=Qt;TDE;Graphics;
diff --git a/kgamma/kcmkgamma/kgamma.desktop b/kgamma/kcmkgamma/kgamma.desktop
index 9ed7894e..7038ba56 100644
--- a/kgamma/kcmkgamma/kgamma.desktop
+++ b/kgamma/kcmkgamma/kgamma.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=tdecmshell kgamma
 Icon=kgamma
-DocPath=kgamma/index.html
+X-DocPath=kgamma/index.html
 Type=Application
 X-TDE-Library=kgamma
 X-TDE-Init=kgamma
diff --git a/kghostview/kghostview.desktop b/kghostview/kghostview.desktop
index d9afb4ba..6fbd167e 100644
--- a/kghostview/kghostview.desktop
+++ b/kghostview/kghostview.desktop
@@ -12,11 +12,11 @@ Name[tr]=GhostView
 Name[ven]=Mbonalelo ya tshipuku tsha K
 Name[xh]=Imboniselo yeKGhost
 MimeType=application/pdf;application/postscript;image/x-eps;application/x-gzpostscript;application/illustrator;
-InitialPreference=6
+X-TDE-InitialPreference=6
 Exec=kghostview %u -caption "%c" %i %m
 Icon=kghostview
 Type=Application
-DocPath=kghostview/index.html
+X-DocPath=kghostview/index.html
 GenericName=PS/PDF Viewer
 GenericName[af]=Ps/Pdf Aansig
 GenericName[ar]=عارض PS/PDF
diff --git a/kghostview/kghostview_part.desktop b/kghostview/kghostview_part.desktop
index d2eeebc7..23c6616f 100644
--- a/kghostview/kghostview_part.desktop
+++ b/kghostview/kghostview_part.desktop
@@ -12,8 +12,8 @@ Name[tr]=GhostView
 Name[ven]=Mbonalelo ya tshipuku tsha K
 Name[xh]=Imboniselo yeKGhost
 MimeType=application/pdf;application/postscript;image/x-eps;application/x-gzpostscript;application/illustrator
-InitialPreference=6
+X-TDE-InitialPreference=6
 Icon=kghostview
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libkghostviewpart
 Type=Service
diff --git a/kmrml/kmrml/mrml-servicemenu.desktop b/kmrml/kmrml/mrml-servicemenu.desktop
index 2d9a938c..0c3100da 100644
--- a/kmrml/kmrml/mrml-servicemenu.desktop
+++ b/kmrml/kmrml/mrml-servicemenu.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/png,image/jpeg,image/gif,image/tiff,image/bmp,image/x-xpm,image/x-xbm,image/x-png
+X-TDE-ServiceTypes=image/png,image/jpeg,image/gif,image/tiff,image/bmp,image/x-xpm,image/x-xbm,image/x-png
 Actions=search;
 
 [Desktop Action search]
diff --git a/kmrml/kmrml/mrml_part.desktop b/kmrml/kmrml/mrml_part.desktop
index 40bb83f3..3557a474 100644
--- a/kmrml/kmrml/mrml_part.desktop
+++ b/kmrml/kmrml/mrml_part.desktop
@@ -56,7 +56,7 @@ Name[zh_HK]=MRML 檢視
 Name[zh_TW]=MRML 檢視器
 Name[zu]=Umbukiso we-MRML
 MimeType=text/mrml
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkmrmlpart
 #X-TDE-BrowserView-AllowAsDefault=true
 #X-TDE-BrowserView-HideFromMenus=true
@@ -64,4 +64,4 @@ X-TDE-Library=libkmrmlpart
 #X-TDE-BrowserView-ModeProperty=viewMode
 #X-TDE-BrowserView-ModePropertyValue=IconView
 Icon=view_icon
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/kmrml/kmrml/server/daemonwatcher.desktop b/kmrml/kmrml/server/daemonwatcher.desktop
index a262c14c..5d71f45a 100644
--- a/kmrml/kmrml/server/daemonwatcher.desktop
+++ b/kmrml/kmrml/server/daemonwatcher.desktop
@@ -96,7 +96,7 @@ Comment[uk]=Запускає демони при потребі та перез�
 Comment[zh_CN]=按需启动守护程序并在失败时重新启动
 Comment[zh_HK]=依要求啟動系統程式並在失敗時重新啟動它們。
 Comment[zh_TW]=需要時啟動守護程式，失敗的話重新啟動
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=daemonwatcher
 X-TDE-FactoryName=daemonwatcher
diff --git a/kolourpaint/kolourpaint.desktop b/kolourpaint/kolourpaint.desktop
index 2d85807e..4aa41a7e 100644
--- a/kolourpaint/kolourpaint.desktop
+++ b/kolourpaint/kolourpaint.desktop
@@ -78,7 +78,7 @@ Icon=kolourpaint
 
 Type=Application
 Exec=kolourpaint %u
-DocPath=kolourpaint/index.html
+X-DocPath=kolourpaint/index.html
 
 # SYNC: Run branches/kolourpaint/control/scripts/gen_mimetype_line.sh in
 #       the version of tdelibs/kimgio/ KolourPaint is shipped with.
diff --git a/kooka/kooka.desktop b/kooka/kooka.desktop
index 2c81dfb1..24552df2 100644
--- a/kooka/kooka.desktop
+++ b/kooka/kooka.desktop
@@ -4,7 +4,7 @@ Exec=kooka %i %m %U
 Icon=scanner
 Path=
 Terminal=false
-DocPath=kooka/index.html
+X-DocPath=kooka/index.html
 GenericName=Scan & OCR Program
 GenericName[af]=Skandeer & Optiese karakter herkenning Program
 GenericName[ar]=برنامج للمسح الضوئي
diff --git a/kpdf/kpdf_part.desktop b/kpdf/kpdf_part.desktop
index 736d09c8..a3620ada 100644
--- a/kpdf/kpdf_part.desktop
+++ b/kpdf/kpdf_part.desktop
@@ -5,7 +5,7 @@ Name[ar]=برنامج KPDF
 Name[hi]=के-पीडीएफ
 Name[zh_TW]=KPDF 檢視器
 MimeType=application/pdf
-InitialPreference=7
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-InitialPreference=7
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkpdfpart
 Type=Service
diff --git a/kpdf/shell/kpdf.desktop b/kpdf/shell/kpdf.desktop
index f7975410..dc4a96a9 100644
--- a/kpdf/shell/kpdf.desktop
+++ b/kpdf/shell/kpdf.desktop
@@ -76,7 +76,7 @@ GenericName[zu]=Umboniseli we PDF
 Exec=kpdf %U %i -caption "%c"
 Icon=kpdf
 Type=Application
-DocPath=kpdf/index.html
-InitialPreference=7
+X-DocPath=kpdf/index.html
+X-TDE-InitialPreference=7
 Categories=Qt;TDE;Office;Viewer;
 
diff --git a/kpovmodeler/kpovmodeler.desktop b/kpovmodeler/kpovmodeler.desktop
index aa106f29..d22ca795 100644
--- a/kpovmodeler/kpovmodeler.desktop
+++ b/kpovmodeler/kpovmodeler.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=kpovmodeler/index.html
+X-DocPath=kpovmodeler/index.html
 Exec=kpovmodeler -caption "%c" %i %m %f
 Icon=kpovmodeler
 MimeType=application/x-kpovmodeler;
@@ -52,7 +52,7 @@ GenericName[tr]=Povray Modelleyici
 GenericName[zh_CN]=Povray 建模器
 GenericName[zh_HK]=Povray 建模器
 Path=
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart,Browser/View,KPovModeler/Document
 Terminal=false
 Type=Application
 X-TDE-Library=libkpovmodelerpart
diff --git a/kruler/kruler.desktop b/kruler/kruler.desktop
index fe2908e1..74092644 100644
--- a/kruler/kruler.desktop
+++ b/kruler/kruler.desktop
@@ -78,7 +78,7 @@ Name[th]=ไม้บรรทัด - K
 Name[ven]=Muvhusi wa K
 Name[zh_TW]=KRuler 尺規
 Name[zu]=KUmlawuli
-DocPath=kruler/index.html
+X-DocPath=kruler/index.html
 MimeType=
 Exec=kruler %i %m
 Type=Application
diff --git a/ksnapshot/ksnapshot.desktop b/ksnapshot/ksnapshot.desktop
index d964b30f..ccb90035 100644
--- a/ksnapshot/ksnapshot.desktop
+++ b/ksnapshot/ksnapshot.desktop
@@ -86,7 +86,7 @@ Icon=ksnapshot
 Path=
 Type=Application
 Terminal=false
-DocPath=ksnapshot/index.html
+X-DocPath=ksnapshot/index.html
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Graphics;
diff --git a/ksvg/plugin/backends/agg/ksvgaggcanvas.desktop b/ksvg/plugin/backends/agg/ksvgaggcanvas.desktop
index b1f56422..1efb8cff 100644
--- a/ksvg/plugin/backends/agg/ksvgaggcanvas.desktop
+++ b/ksvg/plugin/backends/agg/ksvgaggcanvas.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KSVG/Renderer
+X-TDE-ServiceTypes=KSVG/Renderer
 X-TDE-Library=libksvgrendereragg
 X-KSVG-InternalName=agg
 Name=KSVG Rendering Backend - Anti Grain Geometry
diff --git a/ksvg/plugin/backends/libart/ksvglibartcanvas.desktop b/ksvg/plugin/backends/libart/ksvglibartcanvas.desktop
index a52928f6..e61f6375 100644
--- a/ksvg/plugin/backends/libart/ksvglibartcanvas.desktop
+++ b/ksvg/plugin/backends/libart/ksvglibartcanvas.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KSVG/Renderer
+X-TDE-ServiceTypes=KSVG/Renderer
 X-TDE-Library=libksvgrendererlibart
 X-KSVG-InternalName=libart
 Name=KSVG Rendering Backend - Libart
diff --git a/ksvg/plugin/ksvgplugin.desktop b/ksvg/plugin/ksvgplugin.desktop
index ee85cdfe..5a59f16c 100644
--- a/ksvg/plugin/ksvgplugin.desktop
+++ b/ksvg/plugin/ksvgplugin.desktop
@@ -80,6 +80,6 @@ Comment[zh_HK]=可縮放向量圖形（SVG）檢視器
 Comment[zh_TW]=可調整的向量圖形檢視器
 Comment[zu]=Umbonisi wemidwebo Onenani Elibalekayo
 Type=Service
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libksvgplugin
-InitialPreference=11
+X-TDE-InitialPreference=11
diff --git a/ksvg/plugin/svgthumbnail.desktop b/ksvg/plugin/svgthumbnail.desktop
index 8f285a15..e50f19d9 100644
--- a/ksvg/plugin/svgthumbnail.desktop
+++ b/ksvg/plugin/svgthumbnail.desktop
@@ -47,6 +47,6 @@ Name[zu]=Imidwebo Enenani Elibalekayo
 Icon=thumbnail
 MimeTypes=image/svg+xml
 X-TDE-Library=svgthumbnail
-ServiceTypes=ThumbCreator
-InitialPreference=5
+X-TDE-ServiceTypes=ThumbCreator
+X-TDE-InitialPreference=5
 CacheThumbnail=true
diff --git a/kuickshow/src/kuickshow.desktop b/kuickshow/src/kuickshow.desktop
index a111a40b..802e3212 100644
--- a/kuickshow/src/kuickshow.desktop
+++ b/kuickshow/src/kuickshow.desktop
@@ -18,9 +18,9 @@ Exec=kuickshow %i %m -caption "%c" %U
 Icon=kuickshow
 Type=Application
 MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/png;image/tiff;image/x-bmp;image/x-psd;image/x-eim;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;
-DocPath=kuickshow/index.html
+X-DocPath=kuickshow/index.html
 Terminal=false
-InitialPreference=6
+X-TDE-InitialPreference=6
 
 GenericName=Image Viewer
 GenericName[af]=Beeld Aansig
diff --git a/kview/config/kviewgeneralconfig.desktop b/kview/config/kviewgeneralconfig.desktop
index ec6a3912..d9c47429 100644
--- a/kview/config/kviewgeneralconfig.desktop
+++ b/kview/config/kviewgeneralconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kview
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewgeneralconfig
diff --git a/kview/config/plugins/kviewpluginsconfig.desktop b/kview/config/plugins/kviewpluginsconfig.desktop
index c4f1d0e3..c90781ad 100644
--- a/kview/config/plugins/kviewpluginsconfig.desktop
+++ b/kview/config/plugins/kviewpluginsconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=plugin
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewpluginsconfig
diff --git a/kview/kview.desktop b/kview/kview.desktop
index bf26e1fc..3c0fd8f2 100644
--- a/kview/kview.desktop
+++ b/kview/kview.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=kview -caption "%c" %i %m %U
 Icon=kview
 Path=
-DocPath=kview/index.html
+X-DocPath=kview/index.html
 Terminal=false
 GenericName=Image Viewer
 GenericName[af]=Beeld Aansig
@@ -89,7 +89,7 @@ Name[ta]=கேகாட்சி
 Name[th]=ดูภาพ - K
 Name[ven]=U vhona ha K
 Name[zh_TW]=KView 檢視器
-InitialPreference=3
+X-TDE-InitialPreference=3
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Graphics;
diff --git a/kview/kviewcanvas/config/kviewcanvasconfig.desktop b/kview/kviewcanvas/config/kviewcanvasconfig.desktop
index 692d3ad7..03afec2a 100644
--- a/kview/kviewcanvas/config/kviewcanvasconfig.desktop
+++ b/kview/kviewcanvas/config/kviewcanvasconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kview
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewcanvasconfig
diff --git a/kview/kviewcanvas/kviewcanvas.desktop b/kview/kviewcanvas/kviewcanvas.desktop
index 79d3814e..84c65d71 100644
--- a/kview/kviewcanvas/kviewcanvas.desktop
+++ b/kview/kviewcanvas/kviewcanvas.desktop
@@ -59,5 +59,5 @@ Name[zh_HK]=KView 圖像檢視器器件
 Name[zh_TW]=KView 影像檢視器界面工具
 Name[zu]=I-widget Yombukisi Wesithombe se-KView
 X-TDE-Library=libkviewcanvas
-InitialPreference=2
-ServiceTypes=KImageViewer/Canvas
+X-TDE-InitialPreference=2
+X-TDE-ServiceTypes=KImageViewer/Canvas
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
index 9942f106..b53d17ec 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=plugin
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewviewerpluginsconfig
diff --git a/kview/kviewviewer/kviewviewer.desktop b/kview/kviewviewer/kviewviewer.desktop
index 5c7ebda6..c78edc08 100644
--- a/kview/kviewviewer/kviewviewer.desktop
+++ b/kview/kviewviewer/kviewviewer.desktop
@@ -113,6 +113,6 @@ Name[wa]=KView Håyneu d' imådjes
 Name[zh_CN]=KView 图像查看器
 Name[zh_HK]=KView 圖像檢視器
 Name[zh_TW]=KView 影像檢視器
-ServiceTypes=KImageViewer/Viewer,KParts/ReadWritePart,Browser/View
-InitialPreference=3
+X-TDE-ServiceTypes=KImageViewer/Viewer,KParts/ReadWritePart,Browser/View
+X-TDE-InitialPreference=3
 X-TDE-Library=libkviewviewer
diff --git a/kview/modules/browser/kviewbrowser.desktop b/kview/modules/browser/kviewbrowser.desktop
index c97fa747..04248614 100644
--- a/kview/modules/browser/kviewbrowser.desktop
+++ b/kview/modules/browser/kviewbrowser.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=browser
 Type=Service
-ServiceTypes=KPluginInfo
+X-TDE-ServiceTypes=KPluginInfo
 
 X-TDE-PluginInfo-Author=Matthias Kretz
 X-TDE-PluginInfo-Email=kretz@kde.org
diff --git a/kview/modules/effects/kvieweffects.desktop b/kview/modules/effects/kvieweffects.desktop
index 4206ed46..ddc42e08 100644
--- a/kview/modules/effects/kvieweffects.desktop
+++ b/kview/modules/effects/kvieweffects.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=effects
 Type=Service
-ServiceTypes=KPluginInfo
+X-TDE-ServiceTypes=KPluginInfo
 
 X-TDE-PluginInfo-Author=Matthias Kretz
 X-TDE-PluginInfo-Email=kretz@kde.org
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.desktop b/kview/modules/presenter/config/kviewpresenterconfig.desktop
index f71b6bdd..e6f4ca32 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.desktop
+++ b/kview/modules/presenter/config/kviewpresenterconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kpresenter
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewpresenterconfig
diff --git a/kview/modules/presenter/kviewpresenter.desktop b/kview/modules/presenter/kviewpresenter.desktop
index 934939df..672ff605 100644
--- a/kview/modules/presenter/kviewpresenter.desktop
+++ b/kview/modules/presenter/kviewpresenter.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=presenter
 Type=Service
-ServiceTypes=KPluginInfo
+X-TDE-ServiceTypes=KPluginInfo
 
 X-TDE-PluginInfo-Author=Matthias Kretz
 X-TDE-PluginInfo-Email=kretz@kde.org
diff --git a/kview/modules/scanner/kviewscanner.desktop b/kview/modules/scanner/kviewscanner.desktop
index bf810013..eea30a1f 100644
--- a/kview/modules/scanner/kviewscanner.desktop
+++ b/kview/modules/scanner/kviewscanner.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=scanner
 Type=Service
-ServiceTypes=KPluginInfo
+X-TDE-ServiceTypes=KPluginInfo
 
 X-TDE-PluginInfo-Author=Matthias Kretz
 X-TDE-PluginInfo-Email=kretz@kde.org
diff --git a/kview/modules/template/kviewtemplate.desktop b/kview/modules/template/kviewtemplate.desktop
index 77d03f2c..64098ded 100644
--- a/kview/modules/template/kviewtemplate.desktop
+++ b/kview/modules/template/kviewtemplate.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=mypluginicon
 Type=Service
-ServiceTypes=KPluginInfo
+X-TDE-ServiceTypes=KPluginInfo
 
 X-TDE-PluginInfo-Author=Your Name
 X-TDE-PluginInfo-Email=Your@address
diff --git a/kview/photobook/photobook.desktop b/kview/photobook/photobook.desktop
index f53bed35..31c62a48 100644
--- a/kview/photobook/photobook.desktop
+++ b/kview/photobook/photobook.desktop
@@ -124,7 +124,7 @@ Comment[uk]=Простий перегляд тек з фотографіями
 Comment[zh_CN]=轻松浏览照片文件夹
 Comment[zh_HK]=容易地瀏覽資料夾的照片
 Comment[zh_TW]=輕易地瀏覽相片的資料夾
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libphotobook
 X-TDE-BrowserView-Args=DetailedList
 X-DCOP-ServiceType=Multi
diff --git a/kviewshell/emptymultipage.desktop b/kviewshell/emptymultipage.desktop
index b31a512e..3b8a90bc 100644
--- a/kviewshell/emptymultipage.desktop
+++ b/kviewshell/emptymultipage.desktop
@@ -23,7 +23,7 @@ Name[sv]=Tom flera sidor
 Name[ta]=காலியான பலபக்கம்
 Name[tr]=BoşÇokluSayfa
 Name[zh_HK]=空的多頁
-ServiceTypes=KViewShell/MultiPage
+X-TDE-ServiceTypes=KViewShell/MultiPage
 X-TDE-Library=emptymultipagepart
 X-TDE-EmptyMultiPage=1
 X-TDE-MultiPageVersion=2
diff --git a/kviewshell/plugins/djvu/djvumultipage.desktop b/kviewshell/plugins/djvu/djvumultipage.desktop
index c97e32a3..6da86c47 100644
--- a/kviewshell/plugins/djvu/djvumultipage.desktop
+++ b/kviewshell/plugins/djvu/djvumultipage.desktop
@@ -51,7 +51,7 @@ Comment[uk]=Втулок перегляду файлів DjVu для KViewShell
 Comment[zh_CN]=DjVu 文件的 KViewShell 插件
 Comment[zh_HK]=用於 DjVu 檔案的 KViewShell 插件
 Comment[zh_TW]=DjVu 檔的 KViewShell 外掛程式
-ServiceTypes=KViewShell/MultiPage
+X-TDE-ServiceTypes=KViewShell/MultiPage
 X-TDE-MimeTypes=image/x-djvu
 X-TDE-Library=djvuviewpart
 X-TDE-MultiPageVersion=2
diff --git a/libkscan/scanservice.desktop b/libkscan/scanservice.desktop
index a2f399fc..1a28f532 100644
--- a/libkscan/scanservice.desktop
+++ b/libkscan/scanservice.desktop
@@ -66,5 +66,5 @@ Name[zh_HK]=TDE 掃描服務
 Name[zh_TW]=TDE 掃描服務
 Name[zu]=Umsebenzi Lokuhlola lwe-TDE
 X-TDE-Library=libkscan
-InitialPreference=2
-ServiceTypes=KScan/KScanDialog
+X-TDE-InitialPreference=2
+X-TDE-ServiceTypes=KScan/KScanDialog
diff --git a/tdefile-plugins/bmp/tdefile_bmp.desktop b/tdefile-plugins/bmp/tdefile_bmp.desktop
index 6331c397..c6d25ee3 100644
--- a/tdefile-plugins/bmp/tdefile_bmp.desktop
+++ b/tdefile-plugins/bmp/tdefile_bmp.desktop
@@ -59,7 +59,7 @@ Name[zh_CN]=BMP 信息
 Name[zh_HK]=BMP 資訊
 Name[zh_TW]=BMP 資訊
 Name[zu]=Ulwazi lwe-BMP
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_bmp
 MimeType=image/x-bmp
 PreferredGroups=Technical
diff --git a/tdefile-plugins/dds/tdefile_dds.desktop b/tdefile-plugins/dds/tdefile_dds.desktop
index c98f0181..7886ffac 100644
--- a/tdefile-plugins/dds/tdefile_dds.desktop
+++ b/tdefile-plugins/dds/tdefile_dds.desktop
@@ -46,7 +46,7 @@ Name[uk]=Інформація про поверхню DirectDraw
 Name[zh_CN]=DirectDraw 表面信息
 Name[zh_HK]=DirectDraw 表面資訊
 Name[zh_TW]=DirectDraw Surface 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_dds
 MimeType=image/x-dds
 PreferredGroups=Technical
diff --git a/tdefile-plugins/dvi/tdefile_dvi.desktop b/tdefile-plugins/dvi/tdefile_dvi.desktop
index e3bade83..10122e8f 100644
--- a/tdefile-plugins/dvi/tdefile_dvi.desktop
+++ b/tdefile-plugins/dvi/tdefile_dvi.desktop
@@ -54,7 +54,7 @@ Name[wa]=Informåcion sol documint DVI
 Name[zh_CN]=DVI 信息
 Name[zh_HK]=DVI 資訊
 Name[zh_TW]=DVI 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 Type=Service
 X-TDE-Library=tdefile_dvi
 PreferredItems=Title,Author,Subject,Creator,Producer,CreationDate,ModDate,Keywords
diff --git a/tdefile-plugins/exr/tdefile_exr.desktop b/tdefile-plugins/exr/tdefile_exr.desktop
index e9736d67..76a6f250 100644
--- a/tdefile-plugins/exr/tdefile_exr.desktop
+++ b/tdefile-plugins/exr/tdefile_exr.desktop
@@ -50,7 +50,7 @@ Name[uz@cyrillic]=EXR ҳақида маълумот
 Name[zh_CN]=EXR 信息
 Name[zh_HK]=EXR 資訊
 Name[zh_TW]=EXR 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_exr
 MimeType=image/x-exr
 PreferredGroups=Info,Standard,Channels,Technical,3dsMax
diff --git a/tdefile-plugins/gif/tdefile_gif.desktop b/tdefile-plugins/gif/tdefile_gif.desktop
index d6e3bfb3..53ca313e 100644
--- a/tdefile-plugins/gif/tdefile_gif.desktop
+++ b/tdefile-plugins/gif/tdefile_gif.desktop
@@ -59,7 +59,7 @@ Name[zh_CN]=GIF 信息
 Name[zh_HK]=GIF 資訊
 Name[zh_TW]=GIF 資訊
 Name[zu]=Ulwazi lwe-GIF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_gif
 MimeType=image/gif
 PreferredItems=Comment,Resolution
diff --git a/tdefile-plugins/ico/tdefile_ico.desktop b/tdefile-plugins/ico/tdefile_ico.desktop
index 66cadb95..19dae923 100644
--- a/tdefile-plugins/ico/tdefile_ico.desktop
+++ b/tdefile-plugins/ico/tdefile_ico.desktop
@@ -58,7 +58,7 @@ Name[zh_CN]=ICO 信息
 Name[zh_HK]=ICO 資訊
 Name[zh_TW]=ICO 資訊
 Name[zu]=Ulwazi lwe-ICO
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_ico
 MimeType=image/x-ico
 PreferredGroups=Technical
diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.desktop b/tdefile-plugins/jpeg/tdefile_jpeg.desktop
index d2cfa0ff..d7eb1abd 100644
--- a/tdefile-plugins/jpeg/tdefile_jpeg.desktop
+++ b/tdefile-plugins/jpeg/tdefile_jpeg.desktop
@@ -57,7 +57,7 @@ Name[zh_CN]=JPEG EXIF 信息
 Name[zh_HK]=JPEG EXIF 資訊
 Name[zh_TW]=JPEG EXIF 資訊
 Name[zu]=Ulwazi lwe-JPEG EXIF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_jpeg
 MimeType=image/jpeg
 PreferredItems=User comment,CreationDate,CreationTime,Dimensions,Exposure time,JPEG quality,Comment
diff --git a/tdefile-plugins/pcx/tdefile_pcx.desktop b/tdefile-plugins/pcx/tdefile_pcx.desktop
index bcf54b6a..b555c7b3 100644
--- a/tdefile-plugins/pcx/tdefile_pcx.desktop
+++ b/tdefile-plugins/pcx/tdefile_pcx.desktop
@@ -55,7 +55,7 @@ Name[wa]=Informåcion sol imådje PCX
 Name[zh_CN]=PCX 文件元信息
 Name[zh_HK]=PCX 檔案 Meta 資訊
 Name[zh_TW]=PCX 檔案 Meta 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_pcx
 MimeType=image/x-pcx
 PreferredGroups=General
diff --git a/tdefile-plugins/pdf/tdefile_pdf.desktop b/tdefile-plugins/pdf/tdefile_pdf.desktop
index 41f4d21f..24ac872a 100644
--- a/tdefile-plugins/pdf/tdefile_pdf.desktop
+++ b/tdefile-plugins/pdf/tdefile_pdf.desktop
@@ -58,7 +58,7 @@ Name[zh_CN]=PDF 信息
 Name[zh_HK]=PDF 資訊
 Name[zh_TW]=PDF 資訊
 Name[zu]=Ulwazi lwe-PDF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_pdf
 MimeType=application/pdf
 PreferredItems=Title,Subject,Author,Keywords,Creator,Producer,CreationDate,ModificationDate,Pages,Protected,Linearized,Version
diff --git a/tdefile-plugins/png/tdefile_png.desktop b/tdefile-plugins/png/tdefile_png.desktop
index ad2b98e0..94afa880 100644
--- a/tdefile-plugins/png/tdefile_png.desktop
+++ b/tdefile-plugins/png/tdefile_png.desktop
@@ -58,7 +58,7 @@ Name[zh_CN]=PNG 信息
 Name[zh_HK]=PNG 資訊
 Name[zh_TW]=PNG 資訊
 Name[zu]=Ulwazi lwe-PNG
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_png
 MimeType=image/png
 PreferredGroups=Comment,Technical
diff --git a/tdefile-plugins/pnm/tdefile_pnm.desktop b/tdefile-plugins/pnm/tdefile_pnm.desktop
index 1cf4d310..dec0c4ba 100644
--- a/tdefile-plugins/pnm/tdefile_pnm.desktop
+++ b/tdefile-plugins/pnm/tdefile_pnm.desktop
@@ -53,7 +53,7 @@ Name[wa]=Informåcion sol imådje PNM
 Name[zh_CN]=PNM 信息
 Name[zh_HK]=PNM 資訊
 Name[zh_TW]=PNM 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_pnm
 MimeType=image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap
 PreferredGroups=General
diff --git a/tdefile-plugins/ps/gsthumbnail.desktop b/tdefile-plugins/ps/gsthumbnail.desktop
index 903f3447..7ef9ba44 100644
--- a/tdefile-plugins/ps/gsthumbnail.desktop
+++ b/tdefile-plugins/ps/gsthumbnail.desktop
@@ -54,7 +54,7 @@ Name[uz@cyrillic]=PostScript, PDF ва DVI файллари
 Name[zh_CN]=PostScript、PDF 和 DVI 文件
 Name[zh_HK]=PostScript 、PDF 及 DVI 檔案
 Name[zh_TW]=PostScript，PDF 與 DVI 檔 
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-dvi,application/postscript,application/pdf,image/x-eps
 X-TDE-Library=gsthumbnail
 CacheThumbnail=true
diff --git a/tdefile-plugins/ps/tdefile_ps.desktop b/tdefile-plugins/ps/tdefile_ps.desktop
index ec863b8a..f3284a21 100644
--- a/tdefile-plugins/ps/tdefile_ps.desktop
+++ b/tdefile-plugins/ps/tdefile_ps.desktop
@@ -60,7 +60,7 @@ Name[zh_CN]=PostScript 信息
 Name[zh_HK]=PostScript 資訊
 Name[zh_TW]=PostScript 資訊
 Name[zu]=Ulwazi Lwesi-PostScript
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_ps
 MimeType=application/postscript;image/x-eps
 PreferredItems=Title,Creator,CreationDate,For,Pages
diff --git a/tdefile-plugins/raw/tdefile_raw.desktop b/tdefile-plugins/raw/tdefile_raw.desktop
index cb9b2a14..0393194b 100644
--- a/tdefile-plugins/raw/tdefile_raw.desktop
+++ b/tdefile-plugins/raw/tdefile_raw.desktop
@@ -46,7 +46,7 @@ Name[uk]=Файли цифрової камери RAW
 Name[zh_CN]=RAW 相机文件
 Name[zh_HK]=RAW 相機檔案
 Name[zh_TW]=原始相機檔
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 MimeType=image/x-raw
 X-TDE-Library=tdefile_raw
 CacheThumbnail=false
diff --git a/tdefile-plugins/rgb/tdefile_rgb.desktop b/tdefile-plugins/rgb/tdefile_rgb.desktop
index 9edecac8..20f993fc 100644
--- a/tdefile-plugins/rgb/tdefile_rgb.desktop
+++ b/tdefile-plugins/rgb/tdefile_rgb.desktop
@@ -54,7 +54,7 @@ Name[uz@cyrillic]=SGI-расм (RGB)
 Name[zh_CN]=SGI 图像(RGB)
 Name[zh_HK]=SGI 圖像 (RGB)
 Name[zh_TW]=SGI 影像（RGB）
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_rgb
 MimeType=image/x-rgb
 PreferredGroups=Comment,Technical
diff --git a/tdefile-plugins/tga/tdefile_tga.desktop b/tdefile-plugins/tga/tdefile_tga.desktop
index 30a45faf..eb6b6f8f 100644
--- a/tdefile-plugins/tga/tdefile_tga.desktop
+++ b/tdefile-plugins/tga/tdefile_tga.desktop
@@ -57,7 +57,7 @@ Name[zh_CN]=Truevision Targa 信息
 Name[zh_HK]=Truevision Targa 資訊
 Name[zh_TW]=Truevision Targa 資訊
 Name[zu]=Ulwazi lwe-Truevision Targa
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_tga
 MimeType=image/x-targa
 PreferredGroups=Technical
diff --git a/tdefile-plugins/tiff/tdefile_tiff.desktop b/tdefile-plugins/tiff/tdefile_tiff.desktop
index 1309e3a3..c1140de0 100644
--- a/tdefile-plugins/tiff/tdefile_tiff.desktop
+++ b/tdefile-plugins/tiff/tdefile_tiff.desktop
@@ -60,7 +60,7 @@ Name[zh_CN]=TIFF 文件元信息
 Name[zh_HK]=TIFF 檔案 Meta 資訊
 Name[zh_TW]=TIFF 檔案 Meta 資訊
 Name[zu]=Ulwazi Lwefayela yemeta ye-TIFF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_tiff
 MimeType=image/tiff
 PreferredGroups=General,Scanner
diff --git a/tdefile-plugins/xbm/tdefile_xbm.desktop b/tdefile-plugins/xbm/tdefile_xbm.desktop
index 76102cea..04775b03 100644
--- a/tdefile-plugins/xbm/tdefile_xbm.desktop
+++ b/tdefile-plugins/xbm/tdefile_xbm.desktop
@@ -58,7 +58,7 @@ Name[zh_CN]=XBM 信息
 Name[zh_HK]=XBM 資訊
 Name[zh_TW]=XBM 資訊
 Name[zu]=Ulwazi lwe-XBM
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_xbm
 MimeType=image/x-xbm
 PreferredGroups=Technical
diff --git a/tdefile-plugins/xpm/tdefile_xpm.desktop b/tdefile-plugins/xpm/tdefile_xpm.desktop
index 43c18514..d42c22b6 100644
--- a/tdefile-plugins/xpm/tdefile_xpm.desktop
+++ b/tdefile-plugins/xpm/tdefile_xpm.desktop
@@ -46,7 +46,7 @@ Name[uz@cyrillic]=XPM ҳақида маълумот
 Name[zh_CN]=XPM 信息
 Name[zh_HK]=XPM 資訊
 Name[zh_TW]=XPM 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_xpm
 MimeType=image/x-xpm
 PreferredGroups=xpmInfo
diff --git a/tdeiconedit/tdeiconedit.desktop b/tdeiconedit/tdeiconedit.desktop
index 44e23ba2..cf79d3cc 100644
--- a/tdeiconedit/tdeiconedit.desktop
+++ b/tdeiconedit/tdeiconedit.desktop
@@ -87,7 +87,7 @@ MimeType=image/x-xpm;image/x-ico;image/png;image/jpeg;
 Exec=tdeiconedit -caption "%c" %i %m %u
 Icon=tdeiconedit
 Path=
-DocPath=tdeiconedit/index.html
+X-DocPath=tdeiconedit/index.html
 Type=Application
 Terminal=false
 X-DCOP-ServiceType=Multi