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

46 files changed, 50 insertions, 50 deletions

diff --git a/cervisia/cervisia.desktop b/cervisia/cervisia.desktop
index e181976c..8e9f6b64 100644
--- a/cervisia/cervisia.desktop
+++ b/cervisia/cervisia.desktop
@@ -57,7 +57,7 @@ GenericName[zu]=CVSIsiqalo sokugcina
 Exec=cervisia -caption "%c" %i %m %u
 Path=
 Icon=cervisia
-DocPath=cervisia/index.html
+X-DocPath=cervisia/index.html
 Type=Application
 Terminal=false
 MimeType=inode/directory;
@@ -66,7 +66,7 @@ Name[hi]=सर्विसिया
 Name[pa]=ਸਰਵੀਸੀਆ
 Name[ta]= செர்வியா
 Name[th]=เซอร์วิเซีย
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libcervisiapart
 X-TDE-BrowserView-Args=DetailedList
 
diff --git a/kbabel/addons/preview/pothumbnail.desktop b/kbabel/addons/preview/pothumbnail.desktop
index 9bde237a..64c239f4 100644
--- a/kbabel/addons/preview/pothumbnail.desktop
+++ b/kbabel/addons/preview/pothumbnail.desktop
@@ -62,7 +62,7 @@ Name[xh]=Umyalezo wemifanekiso esencwadini
 Name[zh_CN]=消息目录
 Name[zh_TW]=訊息類別
 Name[zu]=Umyalezo Wemifanekiso esencwadini
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-gettext
 X-TDE-Library=pothumbnail
 CacheThumbnail=false
diff --git a/kbabel/addons/tdefile-plugins/tdefile_po.desktop b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
index 7661ed91..2b389420 100644
--- a/kbabel/addons/tdefile-plugins/tdefile_po.desktop
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
@@ -54,7 +54,7 @@ Name[uk]=Інформація каталогу
 Name[xh]=Ulwazi Lwencwadi yemifanekiso
 Name[zh_CN]=目录信息
 Name[zh_TW]=類別資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_po
 MimeType=application/x-gettext
 PreferredGroups=CatalogInfo
diff --git a/kbabel/catalogmanager/catalogmanager.desktop b/kbabel/catalogmanager/catalogmanager.desktop
index b60a6747..981ea9ba 100644
--- a/kbabel/catalogmanager/catalogmanager.desktop
+++ b/kbabel/catalogmanager/catalogmanager.desktop
@@ -91,7 +91,7 @@ GenericName[zh_TW]=翻譯工具目錄管理員
 Exec=catalogmanager %i %m -caption "%c" %U
 Icon=catalogmanager
 Type=Application
-DocPath=kbabel/index.html
+X-DocPath=kbabel/index.html
 Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
diff --git a/kbabel/datatools/accelerators/kbabel_accelstool.desktop b/kbabel/datatools/accelerators/kbabel_accelstool.desktop
index 29f1fd68..aac6391d 100644
--- a/kbabel/datatools/accelerators/kbabel_accelstool.desktop
+++ b/kbabel/datatools/accelerators/kbabel_accelstool.desktop
@@ -99,7 +99,7 @@ Comment[uk]=Перевірити акселератори
 Comment[zh_CN]=检查快捷键
 Comment[zh_TW]=檢查快速鍵
 Shortcuts=Ctrl+H
-ServiceTypes=KBabelValidator,KDataTool
+X-TDE-ServiceTypes=KBabelValidator,KDataTool
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/arguments/kbabel_argstool.desktop b/kbabel/datatools/arguments/kbabel_argstool.desktop
index 17e43836..abb2a886 100644
--- a/kbabel/datatools/arguments/kbabel_argstool.desktop
+++ b/kbabel/datatools/arguments/kbabel_argstool.desktop
@@ -100,7 +100,7 @@ Comment[zh_CN]=检查参数
 Comment[zh_TW]=檢查參數
 Shortcuts=Ctrl+D
 ValidationString=arguments
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/context/kbabel_contexttool.desktop b/kbabel/datatools/context/kbabel_contexttool.desktop
index 1a51f967..c3fbd664 100644
--- a/kbabel/datatools/context/kbabel_contexttool.desktop
+++ b/kbabel/datatools/context/kbabel_contexttool.desktop
@@ -94,7 +94,7 @@ Comment[uk]=Пошук за інформацією контексту перек
 Comment[zh_CN]=查找翻译的上下文信息
 Comment[zh_TW]=尋找已翻譯的內容資訊
 Shortcuts=Ctrl+L
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/equations/kbabel_equationstool.desktop b/kbabel/datatools/equations/kbabel_equationstool.desktop
index 0c98d833..c1624416 100644
--- a/kbabel/datatools/equations/kbabel_equationstool.desktop
+++ b/kbabel/datatools/equations/kbabel_equationstool.desktop
@@ -96,7 +96,7 @@ Comment[tr]=Denklemleri Denetle
 Comment[uk]=Перевірити рівняння
 Comment[zh_CN]=检查等式
 Comment[zh_TW]=檢查等式
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 Shortcuts=Ctrl+J
 ValidationString=equations
 DataType=CatalogItem
diff --git a/kbabel/datatools/length/kbabel_lengthtool.desktop b/kbabel/datatools/length/kbabel_lengthtool.desktop
index 1bc2d4c7..bc92b262 100644
--- a/kbabel/datatools/length/kbabel_lengthtool.desktop
+++ b/kbabel/datatools/length/kbabel_lengthtool.desktop
@@ -92,7 +92,7 @@ Comment[tr]=Çevrilen Mesaj Uzunluğunu Denetle
 Comment[uk]=Перевірити довжину перекладених фраз
 Comment[zh_CN]=检查已翻译消息的长度
 Comment[zh_TW]=檢查已翻譯訊息長度
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop b/kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop
index f7bd329f..3bc6a649 100644
--- a/kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop
+++ b/kbabel/datatools/not-translated/kbabel_nottranslatedtool.desktop
@@ -92,6 +92,6 @@ Comment[tr]=İngilizce İhtiva eden Çeviriler
 Comment[uk]=Переклади, які містять англійську
 Comment[zh_CN]=翻译包含英语
 Comment[zh_TW]=包含英文的翻譯
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
diff --git a/kbabel/datatools/pluralforms/kbabel_pluralformstool.desktop b/kbabel/datatools/pluralforms/kbabel_pluralformstool.desktop
index 78cae8ab..8d9fb11b 100644
--- a/kbabel/datatools/pluralforms/kbabel_pluralformstool.desktop
+++ b/kbabel/datatools/pluralforms/kbabel_pluralformstool.desktop
@@ -95,7 +95,7 @@ Comment[tr]=Çoklu Formları denetle
 Comment[uk]=Перевірити форми множини
 Comment[zh_CN]=检查复数形式
 Comment[zh_TW]=檢查單複數型
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/punctuation/kbabel_punctuationtool.desktop b/kbabel/datatools/punctuation/kbabel_punctuationtool.desktop
index 6a4fe32a..7c8f241e 100644
--- a/kbabel/datatools/punctuation/kbabel_punctuationtool.desktop
+++ b/kbabel/datatools/punctuation/kbabel_punctuationtool.desktop
@@ -95,7 +95,7 @@ Comment[uk]=Перевірити пунктуацію
 Comment[zh_CN]=检查标点
 Comment[zh_TW]=檢查標點
 Shortcuts=Ctrl+P
-ServiceTypes=KBabelValidator,KDataTool
+X-TDE-ServiceTypes=KBabelValidator,KDataTool
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/regexp/kbabel_regexptool.desktop b/kbabel/datatools/regexp/kbabel_regexptool.desktop
index c98a7686..d2c67138 100644
--- a/kbabel/datatools/regexp/kbabel_regexptool.desktop
+++ b/kbabel/datatools/regexp/kbabel_regexptool.desktop
@@ -86,7 +86,7 @@ Comment[tr]=Bir Düzgün Anlatım grubu ile birlikte çevrilen mesajları denetl
 Comment[uk]=Перевірити перекладені фрази за допомогою набору формальних виразів
 Comment[zh_CN]=用一组正则表达式检查已翻译消息
 Comment[zh_TW]=利用正規表示式檢查已翻譯訊息
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop b/kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop
index 05091ad8..64ca0aa4 100644
--- a/kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop
+++ b/kbabel/datatools/setfuzzy/kbabel_setfuzzytool.desktop
@@ -92,7 +92,7 @@ Comment[tr]=Tümünü Bulanık Ata
 Comment[uk]=Встановити всі фрази як "неточні"
 Comment[zh_CN]=全部设为模糊
 Comment[zh_TW]=全部設為模糊
-ServiceTypes=KDataTool,KBabelTool
+X-TDE-ServiceTypes=KDataTool,KBabelTool
 DataType=Catalog
 DataMimeTypes=application/x-kbabel-catalog
 ReadOnly=false
diff --git a/kbabel/datatools/whitespace/kbabel_whitespacetool.desktop b/kbabel/datatools/whitespace/kbabel_whitespacetool.desktop
index 36e9bf01..83a79f98 100644
--- a/kbabel/datatools/whitespace/kbabel_whitespacetool.desktop
+++ b/kbabel/datatools/whitespace/kbabel_whitespacetool.desktop
@@ -92,7 +92,7 @@ Comment[tr]=Ayırma Boşluğu Çevirileri
 Comment[uk]=Порожні переклади
 Comment[zh_CN]=空白翻译
 Comment[zh_TW]=空白翻譯
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/datatools/xml/kbabel_xmltool.desktop b/kbabel/datatools/xml/kbabel_xmltool.desktop
index ebbcc58c..112ddda1 100644
--- a/kbabel/datatools/xml/kbabel_xmltool.desktop
+++ b/kbabel/datatools/xml/kbabel_xmltool.desktop
@@ -99,7 +99,7 @@ Comment[tr]=Biçim İmlerini Sına
 Comment[uk]=Перевірити мітки
 Comment[zh_CN]=检查标签
 Comment[zh_TW]=檢查標籤
-ServiceTypes=KDataTool,KBabelValidator
+X-TDE-ServiceTypes=KDataTool,KBabelValidator
 DataType=CatalogItem
 DataMimeTypes=application/x-kbabel-catalogitem
 ReadOnly=true
diff --git a/kbabel/filters/gettext/kbabel_gettext_export.desktop b/kbabel/filters/gettext/kbabel_gettext_export.desktop
index df2738e0..51bcb769 100644
--- a/kbabel/filters/gettext/kbabel_gettext_export.desktop
+++ b/kbabel/filters/gettext/kbabel_gettext_export.desktop
@@ -50,4 +50,4 @@ Name[zh_CN]=KBabel GNU Gettext 导出过滤器
 Name[zh_TW]=KBabel GNU Gettext 匯出過濾器
 X-TDE-Library=kbabel_gettextexport
 X-TDE-Export=application/x-gettext
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/filters/gettext/kbabel_gettext_import.desktop b/kbabel/filters/gettext/kbabel_gettext_import.desktop
index 4e5c45e2..20e51294 100644
--- a/kbabel/filters/gettext/kbabel_gettext_import.desktop
+++ b/kbabel/filters/gettext/kbabel_gettext_import.desktop
@@ -50,4 +50,4 @@ Name[zh_CN]=KBabel GNU Gettext 导入过滤器
 Name[zh_TW]=KBabel GNU Gettext 匯入過濾器
 X-TDE-Library=kbabel_gettextimport
 X-TDE-Import=application/x-gettext
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/filters/linguist/kbabel_linguist_export.desktop b/kbabel/filters/linguist/kbabel_linguist_export.desktop
index dcb0a6ac..12bb9c0e 100644
--- a/kbabel/filters/linguist/kbabel_linguist_export.desktop
+++ b/kbabel/filters/linguist/kbabel_linguist_export.desktop
@@ -50,4 +50,4 @@ Name[zh_CN]=KBabel Linguist 导出过滤器
 Name[zh_TW]=KBabel 語言匯出過濾器
 X-TDE-Library=kbabel_linguistexport
 X-TDE-Export=application/x-linguist
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/filters/linguist/kbabel_linguist_import.desktop b/kbabel/filters/linguist/kbabel_linguist_import.desktop
index 75c8bfcd..12800a33 100644
--- a/kbabel/filters/linguist/kbabel_linguist_import.desktop
+++ b/kbabel/filters/linguist/kbabel_linguist_import.desktop
@@ -50,4 +50,4 @@ Name[zh_CN]=KBabel Linguist 导入过滤器
 Name[zh_TW]=KBabel 語言匯入過濾器
 X-TDE-Library=kbabel_linguistimport
 X-TDE-Import=application/x-linguist
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/filters/xliff/kbabel_xliff_export.desktop b/kbabel/filters/xliff/kbabel_xliff_export.desktop
index 20e7e304..b980ecb9 100644
--- a/kbabel/filters/xliff/kbabel_xliff_export.desktop
+++ b/kbabel/filters/xliff/kbabel_xliff_export.desktop
@@ -44,4 +44,4 @@ Name[zh_CN]=KBabel XLIFF 导出过滤器
 Name[zh_TW]=KBabel XLIFF 匯出過濾器
 X-TDE-Library=kbabel_xliffexport
 X-TDE-Export=application/x-xliff
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/filters/xliff/kbabel_xliff_import.desktop b/kbabel/filters/xliff/kbabel_xliff_import.desktop
index 2febed0f..1f950bff 100644
--- a/kbabel/filters/xliff/kbabel_xliff_import.desktop
+++ b/kbabel/filters/xliff/kbabel_xliff_import.desktop
@@ -44,4 +44,4 @@ Name[zh_CN]=KBabel XLIFF 导入过滤器
 Name[zh_TW]=KBabel XLIFF 匯入過濾器
 X-TDE-Library=kbabel_xliffimport
 X-TDE-Import=application/x-xliff
-ServiceTypes=KBabelFilter
+X-TDE-ServiceTypes=KBabelFilter
diff --git a/kbabel/kbabel/kbabel.desktop b/kbabel/kbabel/kbabel.desktop
index 4081492c..73d0958c 100644
--- a/kbabel/kbabel/kbabel.desktop
+++ b/kbabel/kbabel/kbabel.desktop
@@ -12,7 +12,7 @@ Name[ta]=Kபாபேல்
 Exec=kbabel %i %m -caption "%c" %U
 Icon=kbabel
 Type=Application
-DocPath=kbabel/index.html
+X-DocPath=kbabel/index.html
 MimeType=application/x-gettext;
 GenericName=Translation Tool
 GenericName[af]=Vertaling Program
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop b/kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop
index 9d600346..5a71b84e 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop
@@ -49,4 +49,4 @@ Name[uk]=База даних перекладів для KBabelDict
 Name[zh_CN]=KBabelDict 的翻译数据库
 Name[zh_TW]=KBabelDict 翻譯資料庫
 X-TDE-Library=kbabeldict_dbsearchengine
-ServiceTypes=KBabelDictModule
+X-TDE-ServiceTypes=KBabelDictModule
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop b/kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
index 745c95c9..34158f9b 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
@@ -49,4 +49,4 @@ Name[uk]=Версія 2 бази даних перекладів для KBabelDi
 Name[zh_CN]=KBabelDict 的翻译数据库 v2
 Name[zh_TW]=KBabelDict 翻譯資料庫 v2
 X-TDE-Library=kbabeldict_dbsearchengine2
-ServiceTypes=KBabelDictModule
+X-TDE-ServiceTypes=KBabelDictModule
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
index 648ef208..f0351863 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
@@ -47,5 +47,5 @@ Name[uk]=Модуль допоміжного словника PO для KBabelDi
 Name[zh_CN]=KBabelDict 的 PO 辅助词典模块
 Name[zh_TW]=KBabelDict 輔助 PO 模組
 X-TDE-Library=kbabeldict_poauxiliary
-ServiceTypes=KBabelDictModule
+X-TDE-ServiceTypes=KBabelDictModule
 Applications=kbabel
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop b/kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
index 26033238..0e21e842 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
@@ -47,4 +47,4 @@ Name[uk]=Модуль збірки перекладів PO для KBabelDict
 Name[zh_CN]=KBabelDict 的 PO 概要词典模块
 Name[zh_TW]=KBabelDict PO 摘要模組
 X-TDE-Library=kbabeldict_pocompendium
-ServiceTypes=KBabelDictModule
+X-TDE-ServiceTypes=KBabelDictModule
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop b/kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
index 270d7ca6..8425e32e 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
@@ -47,4 +47,4 @@ Name[uk]=Модуль збірки перекладів TMX для KBabelDict
 Name[zh_CN]=KBabelDict 的 TMX 概要词典模块
 Name[zh_TW]=KBabelDict TMX 摘要模組
 X-TDE-Library=kbabeldict_tmxcompendium
-ServiceTypes=KBabelDictModule
+X-TDE-ServiceTypes=KBabelDictModule
diff --git a/kbugbuster/kbugbuster.desktop b/kbugbuster/kbugbuster.desktop
index fb0cbb7b..0f326446 100644
--- a/kbugbuster/kbugbuster.desktop
+++ b/kbugbuster/kbugbuster.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kbugbuster -caption "%c" %i %m
 Icon=kbugbuster
-DocPath=kbugbuster/index.html
+X-DocPath=kbugbuster/index.html
 GenericName=TDE Bug Management
 GenericName[af]=TDE Fout Bestuuring
 GenericName[bg]=Управление на грешки - TDE
diff --git a/kbugbuster/tderesources/bugzilla.desktop b/kbugbuster/tderesources/bugzilla.desktop
index d4717394..d419e010 100644
--- a/kbugbuster/tderesources/bugzilla.desktop
+++ b/kbugbuster/tderesources/bugzilla.desktop
@@ -43,6 +43,6 @@ Name[zh_CN]=Bugzilla 待办列表
 Name[zh_TW]=Bugzilla 待辦清單
 X-TDE-Library=kcal_bugzilla
 Type=Service
-ServiceTypes=TDEResources/Plugin
+X-TDE-ServiceTypes=TDEResources/Plugin
 X-TDE-ResourceFamily=calendar
 X-TDE-ResourceType=bugzilla
diff --git a/kompare/kompare.desktop b/kompare/kompare.desktop
index 387ce468..a057f7c7 100644
--- a/kompare/kompare.desktop
+++ b/kompare/kompare.desktop
@@ -66,8 +66,8 @@ GenericName[zu]=Diff/PatchIsiqalo sokugcina
 MimeType=text/x-diff;
 Exec=kompare -caption "%c" %i %m -o %U
 Icon=kompare
-DocPath=kompare/index.html
+X-DocPath=kompare/index.html
 Terminal=false
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Development;
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/kompare/komparenavtreepart/komparenavtreepart.desktop b/kompare/komparenavtreepart/komparenavtreepart.desktop
index 42cbac93..5f0b6bc1 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.desktop
+++ b/kompare/komparenavtreepart/komparenavtreepart.desktop
@@ -5,7 +5,7 @@ Name[pt_BR]=Componente da árvore do Kompare
 Name[sv]=Kompare-navigeringsträdsdel
 Name[ta]=கோம்பெர் மரம் பாகம்
 MimeType=text/x-diff
-ServiceTypes=Kompare/NavigationPart
+X-TDE-ServiceTypes=Kompare/NavigationPart
 X-TDE-Library=libkomparenavtreepart
 Type=Service
 Icon=kompare
diff --git a/kompare/komparepart/komparepart.desktop b/kompare/komparepart/komparepart.desktop
index f43a59b5..0c4daf4d 100644
--- a/kompare/komparepart/komparepart.desktop
+++ b/kompare/komparepart/komparepart.desktop
@@ -17,8 +17,8 @@ Name[tg]=Қисмати утилитҳои баробаркунии файлҳо
 Name[th]=ส่วนเปรียบเทียบ
 Name[zu]=Ingxenye yeKompare
 MimeType=text/x-diff
-ServiceTypes=Kompare/ViewPart,KParts/ReadWritePart,KParts/ReadOnlyPart
+X-TDE-ServiceTypes=Kompare/ViewPart,KParts/ReadWritePart,KParts/ReadOnlyPart
 X-TDE-Library=libkomparepart
 Type=Service
 Icon=kompare
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/kuiviewer/designerthumbnail.desktop b/kuiviewer/designerthumbnail.desktop
index a519d5dd..c30e111f 100644
--- a/kuiviewer/designerthumbnail.desktop
+++ b/kuiviewer/designerthumbnail.desktop
@@ -47,7 +47,7 @@ Name[tr]=Qt Designer Dosyaları
 Name[uk]=Файли Qt Designer
 Name[zh_CN]=Qt 设计师文件
 Name[zh_TW]=Qt Designer 檔案
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-designer
 X-TDE-Library=quithumbnail
 CacheThumbnail=true
diff --git a/kuiviewer/kuiviewer.desktop b/kuiviewer/kuiviewer.desktop
index 3f9b57a0..26ab84d1 100644
--- a/kuiviewer/kuiviewer.desktop
+++ b/kuiviewer/kuiviewer.desktop
@@ -55,5 +55,5 @@ MimeType=application/x-designer;
 Terminal=false
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Development;
-InitialPreference=10
-DocPath=kuiviewer/index.html
+X-TDE-InitialPreference=10
+X-DocPath=kuiviewer/index.html
diff --git a/kuiviewer/kuiviewer_part.desktop b/kuiviewer/kuiviewer_part.desktop
index c9322395..803ba04b 100644
--- a/kuiviewer/kuiviewer_part.desktop
+++ b/kuiviewer/kuiviewer_part.desktop
@@ -4,6 +4,6 @@ Name[hi]=के-यूआई-व्यूअर-पार्ट
 Name[sv]=KUIviewer-del
 Name[ta]=KUIவியூவர் உறுப்பு
 MimeType=application/x-designer;
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkuiviewerpart
 Type=Service
diff --git a/tdecachegrind/tdecachegrind/tdecachegrind.desktop b/tdecachegrind/tdecachegrind/tdecachegrind.desktop
index 77b5f73f..2952ba25 100644
--- a/tdecachegrind/tdecachegrind/tdecachegrind.desktop
+++ b/tdecachegrind/tdecachegrind/tdecachegrind.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdecachegrind -caption "%c" %i %m %u
 MimeType=application/x-tdecachegrind;
 Icon=tdecachegrind
-DocPath=tdecachegrind/index.html
+X-DocPath=tdecachegrind/index.html
 Terminal=false
 Name=TDECachegrind
 Name[hi]=के-केश-ग्रिंड
diff --git a/tdefile-plugins/c++/tdefile_cpp.desktop b/tdefile-plugins/c++/tdefile_cpp.desktop
index 7bbed693..787c6a6e 100644
--- a/tdefile-plugins/c++/tdefile_cpp.desktop
+++ b/tdefile-plugins/c++/tdefile_cpp.desktop
@@ -53,7 +53,7 @@ Name[uk]=Інформація про C++
 Name[xh]=C++ Ulwazi
 Name[zh_CN]=C++ 信息
 Name[zh_TW]=C++ 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_cpp
 MimeType=text/x-c++src;text/x-chdr
 PreferredGroups=General
diff --git a/tdefile-plugins/c++/tdefile_h.desktop b/tdefile-plugins/c++/tdefile_h.desktop
index 539ff599..d77ea6e2 100644
--- a/tdefile-plugins/c++/tdefile_h.desktop
+++ b/tdefile-plugins/c++/tdefile_h.desktop
@@ -52,7 +52,7 @@ Name[uk]=Інформація по заголовкам C++
 Name[xh]=C/C++ Ulwazi lokubhaliweyo okuphezulu
 Name[zh_CN]=C/C++ 头文件信息
 Name[zh_TW]=C/C++ 檔頭資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_cpp
 MimeType=text/x-chdr
 PreferredItems=Lines,Code,Comment,Blank,Strings,i18n Strings,Included Files
diff --git a/tdefile-plugins/diff/tdefile_diff.desktop b/tdefile-plugins/diff/tdefile_diff.desktop
index b1d0e9da..f533b09f 100644
--- a/tdefile-plugins/diff/tdefile_diff.desktop
+++ b/tdefile-plugins/diff/tdefile_diff.desktop
@@ -51,7 +51,7 @@ Name[tr]=Diff İstatistikleri
 Name[uk]=Статистика відмінностей
 Name[zh_CN]=Diff 统计
 Name[zh_TW]=Diff 狀態
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_diff
 MimeType=text/x-diff
 PreferredItems=Files,First,Format,Hunks,Insert,Modify,Delete
diff --git a/tdefile-plugins/ts/tdefile_ts.desktop b/tdefile-plugins/ts/tdefile_ts.desktop
index 1d4faebb..84b4f641 100644
--- a/tdefile-plugins/ts/tdefile_ts.desktop
+++ b/tdefile-plugins/ts/tdefile_ts.desktop
@@ -47,7 +47,7 @@ Name[tr]=Qt Dilbilimci Dosya Bilgisi
 Name[uk]=інформація про файл формату Qt Linguist
 Name[zh_CN]=Qt 语言大师文件信息
 Name[zh_TW]=Qt 語言檔資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_ts
 MimeType=application/x-linguist
 PreferredGroups=General
diff --git a/tdeioslave/svn/ksvnd/ksvnd.desktop b/tdeioslave/svn/ksvnd/ksvnd.desktop
index de9ab32d..fb0ce924 100644
--- a/tdeioslave/svn/ksvnd/ksvnd.desktop
+++ b/tdeioslave/svn/ksvnd/ksvnd.desktop
@@ -43,7 +43,7 @@ Name[uk]=Модуль KDED Subversion
 Name[zh_CN]=KDED Subversion 模块
 Name[zh_TW]=KDED Subversion 模組
 Comment=Provides tdeio subversion client services with TDESDK apps
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=ksvnd
 X-TDE-FactoryName=ksvnd
diff --git a/tdeioslave/svn/svnhelper/apply_patch.desktop b/tdeioslave/svn/svnhelper/apply_patch.desktop
index 872f6136..ad623601 100644
--- a/tdeioslave/svn/svnhelper/apply_patch.desktop
+++ b/tdeioslave/svn/svnhelper/apply_patch.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-diff
+X-TDE-ServiceTypes=text/x-diff
 #uncomment when Exec is implemented
 #Actions=Apply
 X-TDE-Priority=TopLevel
diff --git a/tdeioslave/svn/svnhelper/subversion.desktop b/tdeioslave/svn/svnhelper/subversion.desktop
index 7ee3430b..1b1f8551 100644
--- a/tdeioslave/svn/svnhelper/subversion.desktop
+++ b/tdeioslave/svn/svnhelper/subversion.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory,all/all
+X-TDE-ServiceTypes=inode/directory,all/all
 X-TDE-Submenu=Subversion
 X-TDE-Submenu[fa]=زیرنسخه
 X-TDE-Submenu[ne]=उप संस्करण
diff --git a/tdeioslave/svn/svnhelper/subversion_toplevel.desktop b/tdeioslave/svn/svnhelper/subversion_toplevel.desktop
index bded3518..4a054326 100644
--- a/tdeioslave/svn/svnhelper/subversion_toplevel.desktop
+++ b/tdeioslave/svn/svnhelper/subversion_toplevel.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory,all/all
+X-TDE-ServiceTypes=inode/directory,all/all
 X-TDE-Priority=TopLevel
 
 X-TDE-GetActionMenu=kded ksvnd getTopLevelActionMenu(KURL::List)
diff --git a/umbrello/umbrello/umbrello.desktop b/umbrello/umbrello/umbrello.desktop
index 4f2e6d40..ce03ad20 100644
--- a/umbrello/umbrello/umbrello.desktop
+++ b/umbrello/umbrello/umbrello.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=umbrello -caption "%c" %i %m
 Icon=umbrello
-DocPath=umbrello/index.html
+X-DocPath=umbrello/index.html
 Terminal=false
 Name=Umbrello
 Name[hi]=अम्बरैलो