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

42 files changed, 52 insertions, 52 deletions

diff --git a/arts/kde/mcop-dcop/kmcop.desktop b/arts/kde/mcop-dcop/kmcop.desktop
index 2243be98d..972e6fe93 100644
--- a/arts/kde/mcop-dcop/kmcop.desktop
+++ b/arts/kde/mcop-dcop/kmcop.desktop
@@ -85,6 +85,6 @@ Comment[zh_HK]=TDE MCOP-DCOP 橋樑
 Comment[zh_TW]=TDE MCOP-DCOP 橋樑
 Comment[zu]=Ibhulogo le-TDE MCOP-DCOP
 Icon=kmcop
-ServiceTypes=KMCOP
+X-TDE-ServiceTypes=KMCOP
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/arts/knotify/knotify.desktop b/arts/knotify/knotify.desktop
index 2041cdeb1..7718c98f5 100644
--- a/arts/knotify/knotify.desktop
+++ b/arts/knotify/knotify.desktop
@@ -114,6 +114,6 @@ Comment[zh_HK]=TDE 通知伺服程式
 Comment[zh_TW]=TDE 通知服務程式
 Comment[zu]=Isaziso se-Daemon ye-TDE
 Icon=knotify
-ServiceTypes=KNotify
+X-TDE-ServiceTypes=KNotify
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/interfaces/tdescript/sample/shellscript.desktop b/interfaces/tdescript/sample/shellscript.desktop
index e65713a3b..e748a4dd6 100644
--- a/interfaces/tdescript/sample/shellscript.desktop
+++ b/interfaces/tdescript/sample/shellscript.desktop
@@ -73,7 +73,7 @@ Name[zh_TW]=Bash Shell Script 執行器
 Type=Service
 X-TDE-Library=libshellscript
 X-TDE-Script-Runner=ShellScript/bash
-ServiceTypes=KScriptRunner/KScriptRunner
+X-TDE-ServiceTypes=KScriptRunner/KScriptRunner
 Comment=Runs bash shell scripts from inside the application.
 Comment[af]=Laai bash tolk skripte vanuit die program.
 Comment[ar]=يشغَل bash shell scripts من داخل التطبيق
diff --git a/kate/data/katepart.desktop b/kate/data/katepart.desktop
index 3fa547929..95834df61 100644
--- a/kate/data/katepart.desktop
+++ b/kate/data/katepart.desktop
@@ -84,7 +84,7 @@ Name[zh_TW]=嵌入式進階文字編輯器
 Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
 X-TDE-Library=libkatepart
 Icon=kate
-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=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-shellscript;text/x-diff;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-diff;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;text/x-perl;application/x-perl-module;application/x-php;text/vnd.wap.wml;application/x-python;text/x-python;application/x-ruby;text/sgml;text/xml;model/vrml
diff --git a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
index ea5b08247..59aa06026 100644
--- a/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
+++ b/kate/plugins/autobookmarker/tdetexteditor_autobookmarker.desktop
@@ -129,7 +129,7 @@ Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó kh
 Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
 Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。
 X-TDE-Library=tdetexteditor_autobookmarker
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
index 493369e29..5c1303529 100644
--- a/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
+++ b/kate/plugins/insertfile/tdetexteditor_insertfile.desktop
@@ -150,7 +150,7 @@ Comment[zh_CN]=在光标位置插入任何可读文件
 Comment[zh_HK]=在游標處插入任意的檔案
 Comment[zh_TW]=在游標處插入任意的可讀檔案
 X-TDE-Library=tdetexteditor_insertfile
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/isearch/tdetexteditor_isearch.desktop b/kate/plugins/isearch/tdetexteditor_isearch.desktop
index 6fb7894c5..d4aca1084 100644
--- a/kate/plugins/isearch/tdetexteditor_isearch.desktop
+++ b/kate/plugins/isearch/tdetexteditor_isearch.desktop
@@ -147,7 +147,7 @@ Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
 Comment[zh_CN]=也称为“即输即搜”
 Comment[zh_TW]=也稱做「即時搜尋」
 X-TDE-Library=tdetexteditor_isearch
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
index d8019c570..6f708d640 100644
--- a/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
+++ b/kate/plugins/kdatatool/tdetexteditor_kdatatool.desktop
@@ -163,7 +163,7 @@ Comment[zh_HK]=如果有安裝的話，啟用像同義字字典和拼字檢查�
 Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
 Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
 X-TDE-Library=tdetexteditor_kdatatool
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
index b18e1bf84..934a0a7ba 100644
--- a/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
+++ b/kate/plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop
@@ -133,7 +133,7 @@ Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều
 Comment[zh_CN]=在文档中基于方向或弹出补全单词
 Comment[zh_TW]=在編輯文件時的單字補完功能
 X-TDE-Library=tdetexteditor_docwordcompletion
-ServiceTypes=KTextEditor/Plugin
+X-TDE-ServiceTypes=KTextEditor/Plugin
 Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
 MimeType=text/plain
diff --git a/kded/test/test.desktop b/kded/test/test.desktop
index 51792b0c7..6503e1c32 100644
--- a/kded/test/test.desktop
+++ b/kded/test/test.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=test
 X-TDE-Factory=test
diff --git a/networkstatus/networkstatus.desktop b/networkstatus/networkstatus.desktop
index 4d785b874..77a61253c 100644
--- a/networkstatus/networkstatus.desktop
+++ b/networkstatus/networkstatus.desktop
@@ -91,7 +91,7 @@ Comment[uk]=Слідкує за станом інтерфейсів мережі
 Comment[zh_CN]=跟踪网卡的状态并为应用程序提供使用网络的通知。
 Comment[zh_TW]=追蹤網路介面的狀態，並提供使用網路的應用程式的通知。
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=networkstatus
 X-TDE-FactoryName=networkstatus
diff --git a/tdeabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop
index d78a2ed92..e2c3581f3 100644
--- a/tdeabc/plugins/dir/dir.desktop
+++ b/tdeabc/plugins/dir/dir.desktop
@@ -87,6 +87,6 @@ Name[zh_TW]=目錄
 Name[zu]=Uhlu lwamafayela
 X-TDE-Library=tdeabc_dir
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=dir
diff --git a/tdeabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop
index 24407dd9f..4b47837d2 100644
--- a/tdeabc/plugins/evolution/evolution.desktop
+++ b/tdeabc/plugins/evolution/evolution.desktop
@@ -21,6 +21,6 @@ Name[xh]=Utshintsho lwendawo ngokwenqanawa
 Name[zu]=Evolushini
 X-TDE-Library=tdeabc_evo
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=evolution
diff --git a/tdeabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop
index 92afbb482..3625cc21c 100644
--- a/tdeabc/plugins/file/file.desktop
+++ b/tdeabc/plugins/file/file.desktop
@@ -77,6 +77,6 @@ Name[zh_HK]=檔案
 Name[zh_TW]=檔案
 X-TDE-Library=tdeabc_file
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=file
diff --git a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
index 953070226..55b26ca12 100644
--- a/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
+++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
@@ -5,6 +5,6 @@ Name[hi]=एलडीएपी (LDAP)
 Name[te]=ఎల్డిఏపి
 X-TDE-Library=tdeabc_ldaptdeio
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=ldaptdeio
diff --git a/tdeabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
index 7daa9ce72..42f265e74 100644
--- a/tdeabc/plugins/net/net.desktop
+++ b/tdeabc/plugins/net/net.desktop
@@ -85,6 +85,6 @@ Name[zh_TW]=網路
 Name[zu]=Umsebenzi wokuxhumana okusakazekile
 X-TDE-Library=tdeabc_net
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=contact
 X-TDE-ResourceType=net
diff --git a/tdeabc/tdeabc_manager.desktop b/tdeabc/tdeabc_manager.desktop
index 533ccfb7d..52ea31d68 100644
--- a/tdeabc/tdeabc_manager.desktop
+++ b/tdeabc/tdeabc_manager.desktop
@@ -71,6 +71,6 @@ Name[zh_CN]=联系人
 Name[zh_HK]=聯絡人
 Name[zh_TW]=聯絡人
 Type=Service
-ServiceTypes=TDEResources/Manager
+X-TDE-ServiceTypes=TDEResources/Manager
 
 X-TDE-ResourceFamily=contact
diff --git a/tdecert/tdecertpart.desktop b/tdecert/tdecertpart.desktop
index e4478480d..756d44cf3 100644
--- a/tdecert/tdecertpart.desktop
+++ b/tdecert/tdecertpart.desktop
@@ -94,6 +94,6 @@ Name[sv]=Kcertpart
 Name[ta]=கேசான்றிதழ்பகுதி
 Name[te]=కెసెర్ట్ పార్ట్
 Name[ven]=Tshipida tsha cert ya K
-ServiceTypes=KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadWritePart
 X-TDE-Library=libtdecertpart
-InitialPreference=15
+X-TDE-InitialPreference=15
diff --git a/tdefile-plugins/elf/tdefile_elf.desktop b/tdefile-plugins/elf/tdefile_elf.desktop
index 715ee923c..b7cfe9ab6 100644
--- a/tdefile-plugins/elf/tdefile_elf.desktop
+++ b/tdefile-plugins/elf/tdefile_elf.desktop
@@ -59,7 +59,7 @@ Name[zh_CN]=ELF 信息
 Name[zh_HK]=ELF 資訊
 Name[zh_TW]=ELF 資訊
 Name[zu]=Ulwazi lwe-ELF
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_elf
 MimeType=application/x-executable;application/x-sharedlib
 PreferredItems=Name,Description,License,Copyright,Authors,Product,Organization,Version,DateTime,Notes"
diff --git a/tdehtml/java/kjavaappletviewer.desktop b/tdehtml/java/kjavaappletviewer.desktop
index 9a2d16355..ea2bb6be4 100644
--- a/tdehtml/java/kjavaappletviewer.desktop
+++ b/tdehtml/java/kjavaappletviewer.desktop
@@ -76,7 +76,7 @@ Name[zh_TW]=Embedded Java Applet 檢視器
 X-TDE-Library=kjavaappletviewer
 Icon=java
 MimeType=application/x-java-applet;application/x-java;
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 Type=Service
-InitialPreference=2
+X-TDE-InitialPreference=2
 X-TDE-BrowserView-PluginsInfo=kjava/pluginsinfo
diff --git a/tdehtml/tdehtml.desktop b/tdehtml/tdehtml.desktop
index 9bc4ef9ac..0da9dca5b 100644
--- a/tdehtml/tdehtml.desktop
+++ b/tdehtml/tdehtml.desktop
@@ -88,6 +88,6 @@ Icon=konqueror
 Name=TDEHTML
 Name[hi]=केएचटीएमएल (TDEHTML)
 Name[te]=కెహెచ్ టి ఎమ్ ఎల్
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libtdehtmlpart
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/tdehtml/tdehtmlimage.desktop b/tdehtml/tdehtmlimage.desktop
index 4703bbabb..2befa648c 100644
--- a/tdehtml/tdehtmlimage.desktop
+++ b/tdehtml/tdehtmlimage.desktop
@@ -165,6 +165,6 @@ Name[zh_CN]=可嵌入的图像查看器
 Name[zh_HK]=可嵌入的圖檔檢視器
 Name[zh_TW]=可嵌入的影像檢視器
 Name[zu]=Isithombe Sombukisi Oshuthisekayo
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
-InitialPreference=4
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-InitialPreference=4
 X-TDE-Library=tdehtmlimagepart
diff --git a/tdehtml/tdemultipart/tdemultipart.desktop b/tdehtml/tdemultipart/tdemultipart.desktop
index d5808d928..f66071e50 100644
--- a/tdehtml/tdemultipart/tdemultipart.desktop
+++ b/tdehtml/tdemultipart/tdemultipart.desktop
@@ -69,5 +69,5 @@ Name[vi]=Thành phần có khả năng nhúng cho dạng thức thư đa phần/
 Name[zh_CN]=可嵌入的 multipart/mixed 组件
 Name[zh_HK]=multipart/mixed 的可嵌入元件
 Name[zh_TW]=multipart/mixed 的可嵌入元件
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libtdemultipart
diff --git a/tdeio/kpasswdserver.desktop b/tdeio/kpasswdserver.desktop
index db43d621c..e3882d110 100644
--- a/tdeio/kpasswdserver.desktop
+++ b/tdeio/kpasswdserver.desktop
@@ -149,7 +149,7 @@ Comment[vi]=Cách hỗ trợ khả năng lưu tạm mật khẩu.
 Comment[zh_CN]=密码缓存支持
 Comment[zh_HK]=密碼暫存支援
 Comment[zh_TW]=密碼暫存(cache)支援
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kpasswdserver
 X-TDE-FactoryName=kpasswdserver
diff --git a/tdeio/misc/kpac/proxyscout.desktop b/tdeio/misc/kpac/proxyscout.desktop
index 02e402b50..8dfa62c14 100644
--- a/tdeio/misc/kpac/proxyscout.desktop
+++ b/tdeio/misc/kpac/proxyscout.desktop
@@ -123,7 +123,7 @@ Comment[vi]=Cấu hình ủy nhiệm tự động.
 Comment[zh_CN]=自动代理配置
 Comment[zh_HK]=自動代理伺服器組態
 Comment[zh_TW]=自動代理組態
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=proxyscout
 X-TDE-FactoryName=proxyscout
diff --git a/tdeio/misc/kssld/kssld.desktop b/tdeio/misc/kssld/kssld.desktop
index 7054f8bad..0930930c9 100644
--- a/tdeio/misc/kssld/kssld.desktop
+++ b/tdeio/misc/kssld/kssld.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kssld
 X-TDE-FactoryName=kssld
diff --git a/tdeio/misc/tdeio_uiserver.desktop b/tdeio/misc/tdeio_uiserver.desktop
index 969e0308e..21c14931d 100644
--- a/tdeio/misc/tdeio_uiserver.desktop
+++ b/tdeio/misc/tdeio_uiserver.desktop
@@ -94,7 +94,7 @@ Comment[zh_CN]=TDE 的进度信息用户界面服务器
 Comment[zh_HK]=TDE 的進度資訊介面伺服程式
 Comment[zh_TW]=TDE 的進度資訊使用者介面伺服器
 Comment[zu]=Umlekeleli we-UI Yolwazi Lwenqubo lwe-TDE
-ServiceTypes=
+X-TDE-ServiceTypes=
 # It is a server
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 23cb66c06..ce27b419d 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=tdewalletd
 X-TDE-FactoryName=tdewalletd
diff --git a/tdeio/tests/dummymeta.desktop b/tdeio/tests/dummymeta.desktop
index 6d2748c82..480b56046 100644
--- a/tdeio/tests/dummymeta.desktop
+++ b/tdeio/tests/dummymeta.desktop
@@ -48,7 +48,7 @@ Name[vi]=Siêu giả
 Name[zh_CN]=哑元
 Name[zh_HK]=空的資料定義
 Name[zh_TW]=空的資料定義
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=dummymeta
 MimeType=text/plain
 PreferredItems=Author,Title,Date
diff --git a/tdeioslave/bzip2/kbzip2filter.desktop b/tdeioslave/bzip2/kbzip2filter.desktop
index 51f1c0a84..3555f0379 100644
--- a/tdeioslave/bzip2/kbzip2filter.desktop
+++ b/tdeioslave/bzip2/kbzip2filter.desktop
@@ -83,4 +83,4 @@ Name[zh_HK]=BZip2 過濾器
 Name[zh_TW]=BZip2 過濾器
 Name[zu]=Ihluzo le-BZip2
 X-TDE-Library=kbzip2filter
-ServiceTypes=TDECompressionFilter,application/x-bzip2,application/x-tbz
+X-TDE-ServiceTypes=TDECompressionFilter,application/x-bzip2,application/x-tbz
diff --git a/tdeioslave/gzip/kgzipfilter.desktop b/tdeioslave/gzip/kgzipfilter.desktop
index a3b6c027b..db77cbf9e 100644
--- a/tdeioslave/gzip/kgzipfilter.desktop
+++ b/tdeioslave/gzip/kgzipfilter.desktop
@@ -83,4 +83,4 @@ Name[zh_HK]=GZip 過濾器
 Name[zh_TW]=GZip 過濾器
 Name[zu]=Ihluzo le-GZip
 X-TDE-Library=kgzipfilter
-ServiceTypes=TDECompressionFilter,application/x-gzip,application/x-tgz
+X-TDE-ServiceTypes=TDECompressionFilter,application/x-gzip,application/x-tgz
diff --git a/tdeioslave/http/kcookiejar/kcookiejar.desktop b/tdeioslave/http/kcookiejar/kcookiejar.desktop
index ebc76e2f8..31b0f91f5 100644
--- a/tdeioslave/http/kcookiejar/kcookiejar.desktop
+++ b/tdeioslave/http/kcookiejar/kcookiejar.desktop
@@ -146,7 +146,7 @@ Comment[uz@cyrillic]=Тизимдаги ҳамма кукиларни кузат
 Comment[vi]=Theo dõi các tập tin cookie trong hệ thống.
 Comment[zh_CN]=将全部 cookies 的记录保存在系统中
 Comment[zh_TW]=追蹤系統所有的 cookies
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 Exec=kcookiejar
 X-DCOP-ServiceType=Unique
 X-TDE-StartupNotify=false
diff --git a/tdeioslave/iso/isoservice.desktop b/tdeioslave/iso/isoservice.desktop
index 00093709b..55b4b232e 100644
--- a/tdeioslave/iso/isoservice.desktop
+++ b/tdeioslave/iso/isoservice.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Actions=OpenISO
-ServiceTypes=inode/blockdevice,application/x-iso
+X-TDE-ServiceTypes=inode/blockdevice,application/x-iso
 
 [Desktop Action OpenISO]
 Comment=ISO9660 View
diff --git a/tdeioslave/iso/tdeio_iso.desktop b/tdeioslave/iso/tdeio_iso.desktop
index 8c214d4ed..89b7f2e23 100644
--- a/tdeioslave/iso/tdeio_iso.desktop
+++ b/tdeioslave/iso/tdeio_iso.desktop
@@ -4,7 +4,7 @@ Exec=konqueror iso:%f
 Icon=cd
 Terminal=false
 MimeType=application/x-iso;
-InitialPreference=10
+X-TDE-InitialPreference=10
 NoDisplay=true
 Name=ISO9660 Image Viewer
 Name[hu]=ISO9660 Nézet
diff --git a/tdeioslave/xz/kxzfilter.desktop b/tdeioslave/xz/kxzfilter.desktop
index 7d6f4a649..3d0717324 100644
--- a/tdeioslave/xz/kxzfilter.desktop
+++ b/tdeioslave/xz/kxzfilter.desktop
@@ -83,4 +83,4 @@ Name[zh_HK]=XZ 過濾器
 Name[zh_TW]=XZ 過濾器
 Name[zu]=Ihluzo le-XZ
 X-TDE-Library=kxzfilter
-ServiceTypes=TDECompressionFilter,application/x-xz,application/x-txz,application/x-lzma
+X-TDE-ServiceTypes=TDECompressionFilter,application/x-xz,application/x-txz,application/x-lzma
diff --git a/tdeparts/tests/notepad.desktop b/tdeparts/tests/notepad.desktop
index a529d69a1..2987f1c8e 100644
--- a/tdeparts/tests/notepad.desktop
+++ b/tdeparts/tests/notepad.desktop
@@ -81,6 +81,6 @@ Name[zh_HK]=記事本(範例)
 Name[zh_TW]=記事本(範例)
 Name[zu]=Incwadi yokubhala (umfanekiso)
 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
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libnotepadpart
 Type=Service
diff --git a/tdeprint/tdeprintd.desktop b/tdeprint/tdeprintd.desktop
index 140150b9c..05ec2aa31 100644
--- a/tdeprint/tdeprintd.desktop
+++ b/tdeprint/tdeprintd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=tdeprintd
 X-TDE-FactoryName=tdeprintd
diff --git a/tderesources/tderesources.desktop b/tderesources/tderesources.desktop
index 63aef5cec..dddc4c868 100644
--- a/tderesources/tderesources.desktop
+++ b/tderesources/tderesources.desktop
@@ -3,7 +3,7 @@ Exec=tdecmshell tderesources
 Icon=about_kde
 Type=Application
 Terminal=false
-DocPath=kcontrol/tderesources/index.html
+X-DocPath=kcontrol/tderesources/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=tderesources
 X-TDE-FactoryName=tderesources
diff --git a/tdespell2/plugins/aspell/tdespell_aspell.desktop b/tdespell2/plugins/aspell/tdespell_aspell.desktop
index af78175f0..a4753609d 100644
--- a/tdespell2/plugins/aspell/tdespell_aspell.desktop
+++ b/tdespell2/plugins/aspell/tdespell_aspell.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KSpell/Client
+X-TDE-ServiceTypes=KSpell/Client
 X-TDE-Library=tdespell_aspell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
diff --git a/tdespell2/plugins/hspell/tdespell_hspell.desktop b/tdespell2/plugins/hspell/tdespell_hspell.desktop
index dbeaac73f..9663b81c2 100644
--- a/tdespell2/plugins/hspell/tdespell_hspell.desktop
+++ b/tdespell2/plugins/hspell/tdespell_hspell.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KSpell/Client
+X-TDE-ServiceTypes=KSpell/Client
 X-TDE-Library=tdespell_hspell
 X-TDE-PluginInfo-Author=Mashrab Kuvatov
 X-TDE-PluginInfo-Email=kmashrab@uni-bremen.de
diff --git a/tdespell2/plugins/ispell/tdespell_ispell.desktop b/tdespell2/plugins/ispell/tdespell_ispell.desktop
index 4b1aebcb7..8042d6708 100644
--- a/tdespell2/plugins/ispell/tdespell_ispell.desktop
+++ b/tdespell2/plugins/ispell/tdespell_ispell.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KSpell/Client
+X-TDE-ServiceTypes=KSpell/Client
 X-TDE-Library=tdespell_ispell
 X-TDE-PluginInfo-Author=Zack Rusin
 X-TDE-PluginInfo-Email=zack@kde.org
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.desktop b/tdeui/kdetrayproxy/kdetrayproxy.desktop
index 50e3f8325..e53a6e714 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.desktop
+++ b/tdeui/kdetrayproxy/kdetrayproxy.desktop
@@ -127,7 +127,7 @@ Comment[uk]=Програма посередник, яка дозволяє пр�
 Comment[vi]=Bộ ủy nhiệm hiệu lực các ứng dụng khay hệ thống TDE hoạt động, không cần TWin.
 Comment[zh_CN]=允许 TDE 系统托盘应用程序在没有 TWin 的情况下工作
 Comment[zh_TW]=系統匣代理模組讓系統匣應用程式不必靠 TWin 運作
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kdetrayproxy
 X-TDE-FactoryName=kdetrayproxy