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

117 files changed, 118 insertions, 118 deletions

diff --git a/buildtools/ada/kdevadaproject.desktop b/buildtools/ada/kdevadaproject.desktop
index 882b0f64..f28010ab 100644
--- a/buildtools/ada/kdevadaproject.desktop
+++ b/buildtools/ada/kdevadaproject.desktop
@@ -94,7 +94,7 @@ GenericName[uz]=Ada loyihasi
 GenericName[uz@cyrillic]=Ada лойиҳаси
 GenericName[zh_CN]=Ada 工程
 GenericName[zh_TW]=Ada 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevadaproject
 X-TDevelop-Version=5
 X-TDevelop-Language=Ada
diff --git a/buildtools/ant/kdevantproject.desktop b/buildtools/ant/kdevantproject.desktop
index e2880101..ad223c50 100644
--- a/buildtools/ant/kdevantproject.desktop
+++ b/buildtools/ant/kdevantproject.desktop
@@ -90,7 +90,7 @@ GenericName[uz]=Ant loyihasi
 GenericName[uz@cyrillic]=Ant лойиҳаси
 GenericName[zh_CN]=Ant 工程
 GenericName[zh_TW]=Ant 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevantproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index 1b945553..705d9240 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -187,7 +187,7 @@ void AddServiceDialog::accept()
     stream << "Comment=" << comment_edit->text() << endl;
     if (!iconName.isNull())
         stream << "Icon=" << iconName << endl;
-    stream << "ServiceTypes=" << serviceTypes.join(",") << endl;
+    stream << "X-TDE-ServiceTypes=" << serviceTypes.join(",") << endl;
     item = properties_listview->firstChild();
     while (item) {
         stream << item->text(0) << "=" << item->text(1) << endl;
diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index a149c870..043a6c5d 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -90,7 +90,7 @@ GenericName[uz]=Automake loyihasi
 GenericName[uz@cyrillic]=Automake лойиҳаси
 GenericName[zh_CN]=Automake 工程
 GenericName[zh_TW]=Automake 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 Icon=make
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index b9b6abd8..18d5364b 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -85,7 +85,7 @@ GenericName[tg]=Лоиҳаи TDE Automake
 GenericName[tr]=TDE Automake Projesi
 GenericName[zh_CN]=TDE Automake 工程
 GenericName[zh_TW]=TDE Automake 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 Icon=make
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
diff --git a/buildtools/custommakefiles/kdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop
index 9f81a3d6..90cdac04 100644
--- a/buildtools/custommakefiles/kdevcustomproject.desktop
+++ b/buildtools/custommakefiles/kdevcustomproject.desktop
@@ -85,7 +85,7 @@ GenericName[tg]=Лоиҳаи оддӣ
 GenericName[tr]=Özel Proje
 GenericName[zh_CN]=自定义工程
 GenericName[zh_TW]=自訂專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevcustomproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/pascal/kdevpascalproject.desktop b/buildtools/pascal/kdevpascalproject.desktop
index cde3c21d..2e96196f 100644
--- a/buildtools/pascal/kdevpascalproject.desktop
+++ b/buildtools/pascal/kdevpascalproject.desktop
@@ -88,6 +88,6 @@ GenericName[uz]=Pascal loyihasi
 GenericName[uz@cyrillic]=Pascal лойиҳаси
 GenericName[zh_CN]=Pascal 工程
 GenericName[zh_TW]=Pascal 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevpascalproject
 X-TDevelop-Version=5
diff --git a/buildtools/qmake/kdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop
index 97b4b528..cb9e181f 100644
--- a/buildtools/qmake/kdevtmakeproject.desktop
+++ b/buildtools/qmake/kdevtmakeproject.desktop
@@ -84,7 +84,7 @@ GenericName[tg]=Лоиҳаи TMake
 GenericName[tr]=TMake Projesi
 GenericName[zh_CN]=TMake 工程
 GenericName[zh_TW]=TMake 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=TMake
diff --git a/buildtools/qmake/kdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop
index bf118c56..2f0e5ebf 100644
--- a/buildtools/qmake/kdevtrollproject.desktop
+++ b/buildtools/qmake/kdevtrollproject.desktop
@@ -89,7 +89,7 @@ GenericName[uz]=QMake loyihasi
 GenericName[uz@cyrillic]=QMake лойиҳаси
 GenericName[zh_CN]=QMake 工程
 GenericName[zh_TW]=QMake 專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 X-TDE-Library=libkdevtrollproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/script/kdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop
index 6e135c16..3f919262 100644
--- a/buildtools/script/kdevscriptproject.desktop
+++ b/buildtools/script/kdevscriptproject.desktop
@@ -81,7 +81,7 @@ GenericName[tg]=Лоиҳа бо забони ғарчкунӣ
 GenericName[tr]=Betik Dili Projesi
 GenericName[zh_CN]=脚本语言工程
 GenericName[zh_TW]=文稿語言專案
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
 Icon=tdevelop
 X-TDE-Library=libkdevscriptproject
 X-TDevelop-Version=5
diff --git a/editors/editor-chooser/kdeveditorchooser.desktop b/editors/editor-chooser/kdeveditorchooser.desktop
index 94f06903..db2c7d8c 100644
--- a/editors/editor-chooser/kdeveditorchooser.desktop
+++ b/editors/editor-chooser/kdeveditorchooser.desktop
@@ -84,7 +84,7 @@ GenericName[tr]=Düzenleyici Seçimi
 GenericName[zh_CN]=编辑器选择
 GenericName[zh_TW]=編輯器選擇
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdeveditorchooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
diff --git a/embedded/visualboyadvance/kdevvisualboyadvance.desktop b/embedded/visualboyadvance/kdevvisualboyadvance.desktop
index 292fe6de..fbf1fdf3 100644
--- a/embedded/visualboyadvance/kdevvisualboyadvance.desktop
+++ b/embedded/visualboyadvance/kdevvisualboyadvance.desktop
@@ -78,7 +78,7 @@ GenericName[tr]=VisualBoyAdvance Desteği
 GenericName[zh_CN]=VisualBoyAdvance 支持
 GenericName[zh_TW]=VisualBoyAdvance 支援
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevvisualboyadvance
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/kdevassistant.desktop b/kdevassistant.desktop
index 0e8192cf..478aa028 100644
--- a/kdevassistant.desktop
+++ b/kdevassistant.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kdevassistant %u
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop Assistant
 Name[br]=Skoazeller TDevelop
diff --git a/kdevdesigner/designer/kdevdesigner_part.desktop b/kdevdesigner/designer/kdevdesigner_part.desktop
index 2928a8ad..7ca2b603 100644
--- a/kdevdesigner/designer/kdevdesigner_part.desktop
+++ b/kdevdesigner/designer/kdevdesigner_part.desktop
@@ -9,8 +9,8 @@ Name[ta]=கேமேம்பாட்டு வடிவமைப்பாள�
 Name[tg]=KDevҚисми дизайнгар
 Name[zh_TW]=TDevelop 設計元件
 MimeType=application/x-designer
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libkdevdesignerpart
 Type=Service
-InitialPreference=10
+X-TDE-InitialPreference=10
 
diff --git a/kdevdesigner/src/kdevdesigner.desktop b/kdevdesigner/src/kdevdesigner.desktop
index 1cd245f1..7bba7365 100644
--- a/kdevdesigner/src/kdevdesigner.desktop
+++ b/kdevdesigner/src/kdevdesigner.desktop
@@ -58,7 +58,7 @@ GenericName[zh_TW]=介面設計器
 Exec=kdevdesigner %i -caption "%c"
 Icon=kdevdesigner
 Type=Application
-DocPath=kdevdesigner/index.html
+X-DocPath=kdevdesigner/index.html
 Comment=GUI Designer for Qt/TDE
 Comment[ca]=Dissenyador de IGU per Qt/TDE
 Comment[da]=Grafisk brugerfladedesigner til Qt/TDE
diff --git a/languages/ada/kdevadasupport.desktop b/languages/ada/kdevadasupport.desktop
index f1ae3bf1..a9da4281 100644
--- a/languages/ada/kdevadasupport.desktop
+++ b/languages/ada/kdevadasupport.desktop
@@ -81,7 +81,7 @@ GenericName[tg]=Ёри намудани забони Ada
 GenericName[tr]=Ada Dil Desteği
 GenericName[zh_CN]=Ada 语言支持
 GenericName[zh_TW]=Ada 語言支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevadasupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Ada
diff --git a/languages/bash/kdevbashsupport.desktop b/languages/bash/kdevbashsupport.desktop
index 91a98e3e..27d902de 100644
--- a/languages/bash/kdevbashsupport.desktop
+++ b/languages/bash/kdevbashsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tg]=Ёри намудани забони Bash
 GenericName[tr]=Bash Desteği
 GenericName[zh_CN]=Bash 支持
 GenericName[zh_TW]=Bash 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevbashsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Bash
diff --git a/languages/cpp/app_templates/kapp/app.desktop b/languages/cpp/app_templates/kapp/app.desktop
index 5c7ab928..ec6d8726 100644
--- a/languages/cpp/app_templates/kapp/app.desktop
+++ b/languages/cpp/app_templates/kapp/app.desktop
@@ -3,7 +3,7 @@ Name=%{APPNAME}
 Exec=%{APPNAMELC} %i -caption "%c"
 Icon=%{APPNAMELC}
 Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
 Comment=A TDE KPart Application
 Comment[br]=Ur meziant Kpart evit TDE
 Comment[ca]=Una aplicació KPart per al TDE
diff --git a/languages/cpp/app_templates/kateplugin/plugin.desktop b/languages/cpp/app_templates/kateplugin/plugin.desktop
index 8958ed0f..1995d38f 100644
--- a/languages/cpp/app_templates/kateplugin/plugin.desktop
+++ b/languages/cpp/app_templates/kateplugin/plugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=lib%{APPNAMELC}plugin
 X-Kate-Version=2.2
 Name=My First Kate Plugin
diff --git a/languages/cpp/app_templates/kateplugin2/plugin.desktop b/languages/cpp/app_templates/kateplugin2/plugin.desktop
index 8958ed0f..1995d38f 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin.desktop
+++ b/languages/cpp/app_templates/kateplugin2/plugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
 X-TDE-Library=lib%{APPNAMELC}plugin
 X-Kate-Version=2.2
 Name=My First Kate Plugin
diff --git a/languages/cpp/app_templates/kde4app/kapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop
index 18cdcbe5..008fad44 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.desktop
+++ b/languages/cpp/app_templates/kde4app/kapp4.desktop
@@ -6,7 +6,7 @@ Name[zh_TW]=KApp4 程式
 Exec=kapp4 %i -caption "%c"
 Icon=kapp4
 Type=Application
-DocPath=kapp4/kapp4.html
+X-DocPath=kapp4/kapp4.html
 GenericName=A KDE4 Application
 GenericName[ca]=Una aplicació del KDE4
 GenericName[da]=Et KDE4-program
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang.desktop b/languages/cpp/app_templates/kdevlang/kdevlang.desktop
index 93bb3c3b..3b328bfa 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang.desktop
+++ b/languages/cpp/app_templates/kdevlang/kdevlang.desktop
@@ -8,7 +8,7 @@ Name[nds]=KDev%{ProgNaam}
 Name[sv]=TDevelop %{APPNAME}
 Name[ta]=கெடெவ்%{APPNAME}
 Icon=tdevelop
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDevelop-Language=ChangeMe
 X-TDE-Library=libkdev%{APPNAMELC}
 X-TDevelop-Version=3
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart.desktop b/languages/cpp/app_templates/kdevpart/kdevpart.desktop
index a3029ac6..f8978270 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart.desktop
+++ b/languages/cpp/app_templates/kdevpart/kdevpart.desktop
@@ -68,7 +68,7 @@ Comment[tr]=%{APPNAME} Tanımı
 Comment[zh_CN]=%{APPNAME} 描述
 Comment[zh_TW]=%{APPNAME} 描述
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1
 X-TDevelop-Plugin-Homepage=
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
index a3029ac6..f8978270 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop
@@ -68,7 +68,7 @@ Comment[tr]=%{APPNAME} Tanımı
 Comment[zh_CN]=%{APPNAME} 描述
 Comment[zh_TW]=%{APPNAME} 描述
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1
 X-TDevelop-Plugin-Homepage=
diff --git a/languages/cpp/app_templates/kmake/app.desktop b/languages/cpp/app_templates/kmake/app.desktop
index 5c7ab928..ec6d8726 100644
--- a/languages/cpp/app_templates/kmake/app.desktop
+++ b/languages/cpp/app_templates/kmake/app.desktop
@@ -3,7 +3,7 @@ Name=%{APPNAME}
 Exec=%{APPNAMELC} %i -caption "%c"
 Icon=%{APPNAMELC}
 Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
 Comment=A TDE KPart Application
 Comment[br]=Ur meziant Kpart evit TDE
 Comment[ca]=Una aplicació KPart per al TDE
diff --git a/languages/cpp/app_templates/kofficepart/kopart.desktop b/languages/cpp/app_templates/kofficepart/kopart.desktop
index 6e3c7c4c..ab4fb51d 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.desktop
+++ b/languages/cpp/app_templates/kofficepart/kopart.desktop
@@ -5,5 +5,5 @@ X-TDE-Library=lib%{APPNAMELC}part
 MimeType=application/x-%{APPNAMELC};
 Type=Application
 Icon=%{APPNAMELC}
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-NativeMimeType=application/x-%{APPNAMELC}
diff --git a/languages/cpp/app_templates/kpartapp/app.desktop b/languages/cpp/app_templates/kpartapp/app.desktop
index 0e832427..ebbd7dca 100644
--- a/languages/cpp/app_templates/kpartapp/app.desktop
+++ b/languages/cpp/app_templates/kpartapp/app.desktop
@@ -13,6 +13,6 @@ Name[sv]=%{APPNAME}-del
 Name[ta]=%{APPNAME}பாகம்
 Name[tr]=%{APPNAME} Bileşeni
 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,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=lib%{APPNAMELC}part
 Type=Service
diff --git a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop
index 42f19e60..8c218bb7 100644
--- a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop
@@ -29,7 +29,7 @@ Name[ta]=%{APPNAME} தகவல்
 Name[tg]=Маълумот дар бораи %{APPNAME} 
 Name[zh_CN]=%{APPNAME}的信息
 Name[zh_TW]=%{APPNAME} 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_%{APPNAMELC}
 # change MimeType here! (example: inode/directory)
 MimeType=
diff --git a/languages/cpp/compiler/gccoptions/kdevg77options.desktop b/languages/cpp/compiler/gccoptions/kdevg77options.desktop
index e2a806f5..53c9dadd 100644
--- a/languages/cpp/compiler/gccoptions/kdevg77options.desktop
+++ b/languages/cpp/compiler/gccoptions/kdevg77options.desktop
@@ -48,7 +48,7 @@ Name[ta]=G77விருப்பங்கள்
 Name[tg]=G77Интихобҳо
 Name[tr]=G77Seçenekleri
 Name[zh_TW]=G77 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
diff --git a/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop
index 14bc62df..9b619a26 100644
--- a/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop
+++ b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop
@@ -45,7 +45,7 @@ Name[sv]=Alternativ för gcc
 Name[ta]=Gccவிருப்பங்கள் 
 Name[tr]=GccSeçenekleri
 Name[zh_TW]=Gcc 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=C
diff --git a/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop
index d8487596..e58c3aa5 100644
--- a/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop
+++ b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop
@@ -47,7 +47,7 @@ Name[sv]=Alternativ för g++
 Name[ta]=Gppவிருப்பங்கள் 
 Name[tr]=GppSeçenekleri
 Name[zh_TW]=Gpp 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevgccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=C++
diff --git a/languages/cpp/debugger/kdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop
index beaf17f3..bcf82469 100644
--- a/languages/cpp/debugger/kdevdebugger.desktop
+++ b/languages/cpp/debugger/kdevdebugger.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Hata Ayıklayıcı Önucu
 GenericName[zh_CN]=调试器前端
 GenericName[zh_TW]=除錯器前端
 Icon=debugger
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevdebugger
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/languages/cpp/kdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop
index cd638819..3b78a131 100644
--- a/languages/cpp/kdevcppsupport.desktop
+++ b/languages/cpp/kdevcppsupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони C++
 GenericName[tr]=C++ Desteği
 GenericName[zh_CN]=C++ 支持
 GenericName[zh_TW]=C++ 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 Icon=source_cpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
diff --git a/languages/cpp/kdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop
index cc54dd73..907b97fb 100644
--- a/languages/cpp/kdevcsupport.desktop
+++ b/languages/cpp/kdevcsupport.desktop
@@ -77,7 +77,7 @@ GenericName[tg]=Ёрӣ намудани забони C
 GenericName[tr]=C Desteği
 GenericName[zh_CN]=C 支持
 GenericName[zh_TW]=C 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 Icon=source_cpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
index b351a8e3..3c5bc68f 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
+++ b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop
@@ -39,6 +39,6 @@ Comment[tr]=TDevelop Özel Dizin PCS Aktarıcısı
 Comment[zh_CN]=TDevelop 自定义目录的 PCS 导入器
 Comment[zh_TW]=TDevelop 自訂目錄 PCS 匯入器
 Icon=gear
-ServiceTypes=TDevelop/PCSImporter
+X-TDE-ServiceTypes=TDevelop/PCSImporter
 X-TDE-Library=libkdevcustompcsimporter
 X-TDevelop-PCSImporter=
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
index 5d91d917..6752adb7 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop
@@ -28,7 +28,7 @@ Comment[sr@Latn]=TDevelop-ov Qt4 PCS uvoznik
 Comment[sv]=TDevelop QT4 PCS-import
 Comment[zh_TW]=TDevelop Qt4 PCS 匯入器
 Icon=gear
-ServiceTypes=TDevelop/PCSImporter
+X-TDE-ServiceTypes=TDevelop/PCSImporter
 X-TDE-Library=libkdevqt4importer
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
index 72161838..1b29323c 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop
@@ -31,7 +31,7 @@ Comment[sr@Latn]=TDevelop-ov Qt3 PCS uvoznik
 Comment[sv]=TDevelop QT3 PCS-import
 Comment[zh_TW]=TDevelop Qt3 PCS 匯入器
 Icon=gear
-ServiceTypes=TDevelop/PCSImporter
+X-TDE-ServiceTypes=TDevelop/PCSImporter
 X-TDE-Library=libkdevqtimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
index 7433518e..9f671533 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop
@@ -43,7 +43,7 @@ Comment[tr]=TDevelop KDELibs PCS Aktarıcısı
 Comment[zh_CN]=TDevelop KDELibs PCS 导入器
 Comment[zh_TW]=TDevelop KDE 函式庫匯入器
 Icon=gear
-ServiceTypes=TDevelop/PCSImporter
+X-TDE-ServiceTypes=TDevelop/PCSImporter
 X-TDE-Library=libkdevtdelibsimporter
 X-TDevelop-PCSImporter=
 X-TDevelop-Version=5
diff --git a/languages/csharp/kdevcsharpsupport.desktop b/languages/csharp/kdevcsharpsupport.desktop
index a5627cc3..3a1f2efc 100644
--- a/languages/csharp/kdevcsharpsupport.desktop
+++ b/languages/csharp/kdevcsharpsupport.desktop
@@ -50,7 +50,7 @@ GenericName[sr]=Подршка за CSharp
 GenericName[sr@Latn]=Podrška za CSharp
 GenericName[sv]=C#-stöd
 GenericName[zh_TW]=C# 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevcsharpsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=CSharp
diff --git a/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop
index 6d2007ea..fdeae733 100644
--- a/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop
+++ b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop
@@ -46,7 +46,7 @@ Name[sv]=Alternativ för pgf77
 Name[ta]=Pgf77 விருப்பங்கள் 
 Name[tg]=Pgf77Интихобҳо
 Name[zh_TW]=Pgf77 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevpgioptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
diff --git a/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop
index f3793949..a0430178 100644
--- a/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop
+++ b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop
@@ -43,7 +43,7 @@ Name[sv]=Alternativ för pghpf
 Name[ta]=Pghpf விருப்பங்கள் 
 Name[tg]=PghpfИнтихобҳо
 Name[zh_TW]=Pghpf 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevpgioptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran
diff --git a/languages/fortran/kdevfortransupport.desktop b/languages/fortran/kdevfortransupport.desktop
index b6465210..38f3f4e6 100644
--- a/languages/fortran/kdevfortransupport.desktop
+++ b/languages/fortran/kdevfortransupport.desktop
@@ -74,7 +74,7 @@ GenericName[tg]=Ёрӣ намудани забони 77 Support
 GenericName[tr]=Fortran 77 Desteği
 GenericName[zh_CN]=Fortran 77 支持
 GenericName[zh_TW]=Fortran 77 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevfortransupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Fortran77
diff --git a/languages/java/app_templates/kappjava/app.desktop b/languages/java/app_templates/kappjava/app.desktop
index 3cc75ad8..6966dbfb 100644
--- a/languages/java/app_templates/kappjava/app.desktop
+++ b/languages/java/app_templates/kappjava/app.desktop
@@ -3,7 +3,7 @@ Name=%{APPNAME}
 Exec=%{APPNAMELC} %i -caption "%c"
 Icon=%{APPNAMELC}
 Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
 Comment=A Java TDE KPart Application
 Comment[ca]=Una aplicació KPart en Java per al TDE
 Comment[da]=Et Java TDE KPart-program
diff --git a/languages/java/kdevjavasupport.desktop b/languages/java/kdevjavasupport.desktop
index 620fb10f..3c04ff7d 100644
--- a/languages/java/kdevjavasupport.desktop
+++ b/languages/java/kdevjavasupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони Java
 GenericName[tr]=Java Desteği
 GenericName[zh_CN]=Java 支持
 GenericName[zh_TW]=Java 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevjavasupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Java
diff --git a/languages/kjssupport/kdevkjssupport.desktop b/languages/kjssupport/kdevkjssupport.desktop
index e972cd18..b017bd8b 100644
--- a/languages/kjssupport/kdevkjssupport.desktop
+++ b/languages/kjssupport/kdevkjssupport.desktop
@@ -48,7 +48,7 @@ GenericName[tr]=TDE JavaScript Desteği
 GenericName[zh_CN]=TDE JavaScript 支持
 GenericName[zh_TW]=TDE JavaScript 支援
 Icon=tdevelop
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDevelop-Language=Javascript
 X-TDE-Library=libkdevkjssupport
 X-TDevelop-Version=3
diff --git a/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
index e99e9385..3d4d57f2 100644
--- a/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
+++ b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop
@@ -47,7 +47,7 @@ Name[sv]=Alternativ för dcc
 Name[ta]=Dccவிருப்பங்கள் 
 Name[tg]=DccИнтихобҳо
 Name[zh_TW]=Dcc 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevdccoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
diff --git a/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
index 660e973d..d7b0149b 100644
--- a/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
+++ b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop
@@ -46,7 +46,7 @@ Name[sv]=Alternativ för fpc
 Name[ta]=Fpcவிருப்பங்கள் 
 Name[tg]=FpcИнтихобҳо
 Name[zh_TW]=Fpc 選項
-ServiceTypes=TDevelop/CompilerOptions
+X-TDE-ServiceTypes=TDevelop/CompilerOptions
 X-TDE-Library=libkdevfpcoptions
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
diff --git a/languages/pascal/kdevpascalsupport.desktop b/languages/pascal/kdevpascalsupport.desktop
index 65e9f851..ec54d28d 100644
--- a/languages/pascal/kdevpascalsupport.desktop
+++ b/languages/pascal/kdevpascalsupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони Pascal
 GenericName[tr]=Pascal Dil Desteği
 GenericName[zh_CN]=Pascal 语言支持
 GenericName[zh_TW]=Pascal 語言支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevpascalsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Pascal
diff --git a/languages/perl/kdevperlsupport.desktop b/languages/perl/kdevperlsupport.desktop
index 9c637679..7ba0cecd 100644
--- a/languages/perl/kdevperlsupport.desktop
+++ b/languages/perl/kdevperlsupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони Perl
 GenericName[tr]=Perl Desteği
 GenericName[zh_CN]=Perl 支持
 GenericName[zh_TW]=Perl 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevperlsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Perl
diff --git a/languages/php/kdevphpsupport.desktop b/languages/php/kdevphpsupport.desktop
index eea6c168..7caf8f0e 100644
--- a/languages/php/kdevphpsupport.desktop
+++ b/languages/php/kdevphpsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tg]=Ёрӣ намудани забони PHP
 GenericName[tr]=PHP Desteği
 GenericName[zh_CN]=PHP 支持
 GenericName[zh_TW]=PHP 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevphpsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=PHP
diff --git a/languages/python/kdevpythonsupport.desktop b/languages/python/kdevpythonsupport.desktop
index 61f2ff76..120a76b5 100644
--- a/languages/python/kdevpythonsupport.desktop
+++ b/languages/python/kdevpythonsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tg]=Ёрӣ намудани забони Python
 GenericName[tr]=Python Desteği
 GenericName[zh_CN]=Python 支持
 GenericName[zh_TW]=Python 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevpythonsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Python
diff --git a/languages/ruby/app_templates/kapp/app.desktop b/languages/ruby/app_templates/kapp/app.desktop
index 4587fd3c..b6cb876c 100644
--- a/languages/ruby/app_templates/kapp/app.desktop
+++ b/languages/ruby/app_templates/kapp/app.desktop
@@ -3,7 +3,7 @@ Name=%{APPNAME}
 Exec=ruby %{APPNAMELC}/main.rb %i -caption "%c"
 Icon=%{APPNAMELC}
 Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
 Comment=A TDE KPart Application
 Comment[br]=Ur meziant Kpart evit TDE
 Comment[ca]=Una aplicació KPart per al TDE
diff --git a/languages/ruby/debugger/kdevrbdebugger.desktop b/languages/ruby/debugger/kdevrbdebugger.desktop
index 714b51a3..59911424 100644
--- a/languages/ruby/debugger/kdevrbdebugger.desktop
+++ b/languages/ruby/debugger/kdevrbdebugger.desktop
@@ -65,7 +65,7 @@ GenericName[tr]=Ruby Hata Ayıklayıcı Önucu
 GenericName[zh_CN]=Ruby 调试器前端
 GenericName[zh_TW]=Ruby 除錯器前端介面
 Icon=
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevrbdebugger
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/languages/ruby/kdevrubysupport.desktop b/languages/ruby/kdevrubysupport.desktop
index 9b5c6771..4acfa061 100644
--- a/languages/ruby/kdevrubysupport.desktop
+++ b/languages/ruby/kdevrubysupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони Ruby
 GenericName[tr]=Ruby Desteği
 GenericName[zh_CN]=Ruby 支持
 GenericName[zh_TW]=Ruby 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevrubysupport
 X-TDevelop-Version=5
 X-TDevelop-Language=Ruby
diff --git a/languages/sql/kdevsqlsupport.desktop b/languages/sql/kdevsqlsupport.desktop
index f5ee67ab..66e05e3e 100644
--- a/languages/sql/kdevsqlsupport.desktop
+++ b/languages/sql/kdevsqlsupport.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Ёрӣ намудани забони SQL
 GenericName[tr]=SQL Desteği
 GenericName[zh_CN]=SQL 支持
 GenericName[zh_TW]=SQL 支援
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
 X-TDE-Library=libkdevsqlsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=SQL
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h
index 31cc5550..5bdcaaf6 100644
--- a/lib/interfaces/kdevplugin.h
+++ b/lib/interfaces/kdevplugin.h
@@ -158,7 +158,7 @@ public:
 
     /**Queries for the plugin which supports given service type (such plugins are called extensions in KDevelop).
     All already loaded plugins will be queried and the <b>first loaded one</b> to support
-    the service type will be returned. Any plugin can be an extension, only "ServiceTypes=..."
+    the service type will be returned. Any plugin can be an extension, only "X-TDE-ServiceTypes=..."
     entry is required in .desktop file for that plugin.
 
     Template argument is used as a type to cast the result to. This is done because extension
diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h
index 05ee050b..d72563d5 100644
--- a/lib/interfaces/kdevplugincontroller.h
+++ b/lib/interfaces/kdevplugincontroller.h
@@ -64,7 +64,7 @@ public:
 
     /**Queries for the plugin which supports given service type.
     All already loaded plugins will be queried and the first one to support the service type
-    will be returned. Any plugin can be an extension, only "ServiceTypes=..." entry is
+    will be returned. Any plugin can be an extension, only "X-TDE-ServiceTypes=..." entry is
     required in .desktop file for that plugin.
     @param serviceType The service type of an extension (like "TDevelop/SourceFormatter")
     @param constraint The constraint which is applied when quering for the service. This
diff --git a/parts/abbrev/kdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop
index 5c230dd4..c13e5770 100644
--- a/parts/abbrev/kdevabbrev.desktop
+++ b/parts/abbrev/kdevabbrev.desktop
@@ -75,7 +75,7 @@ GenericName[tg]=Васеъкунии кӯтоҳ карда шуда
 GenericName[tr]=Kısaltma Genişlemesi
 GenericName[zh_CN]=缩写扩展
 GenericName[zh_TW]=縮寫擴展
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 Icon=fontsizeup
 X-TDE-Library=libkdevabbrev
 X-TDevelop-Version=5
diff --git a/parts/appwizard/common/tde-app.desktop b/parts/appwizard/common/tde-app.desktop
index 5c7ab928..ec6d8726 100644
--- a/parts/appwizard/common/tde-app.desktop
+++ b/parts/appwizard/common/tde-app.desktop
@@ -3,7 +3,7 @@ Name=%{APPNAME}
 Exec=%{APPNAMELC} %i -caption "%c"
 Icon=%{APPNAMELC}
 Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
 Comment=A TDE KPart Application
 Comment[br]=Ur meziant Kpart evit TDE
 Comment[ca]=Una aplicació KPart per al TDE
diff --git a/parts/appwizard/common/tde-part.desktop b/parts/appwizard/common/tde-part.desktop
index 0e832427..ebbd7dca 100644
--- a/parts/appwizard/common/tde-part.desktop
+++ b/parts/appwizard/common/tde-part.desktop
@@ -13,6 +13,6 @@ Name[sv]=%{APPNAME}-del
 Name[ta]=%{APPNAME}பாகம்
 Name[tr]=%{APPNAME} Bileşeni
 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,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=lib%{APPNAMELC}part
 Type=Service
diff --git a/parts/appwizard/kdevappwizard.desktop b/parts/appwizard/kdevappwizard.desktop
index fa9dd541..3156eeb0 100644
--- a/parts/appwizard/kdevappwizard.desktop
+++ b/parts/appwizard/kdevappwizard.desktop
@@ -80,7 +80,7 @@ GenericName[tg]=Устои сохтани гузориш
 GenericName[tr]=Uygulama Sihirbazı
 GenericName[zh_CN]=应用程序向导
 GenericName[zh_TW]=應用程式精靈
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevappwizard
 X-TDevelop-Scope=Core
 X-TDevelop-Version=5
diff --git a/parts/astyle/kdevastyle.desktop b/parts/astyle/kdevastyle.desktop
index ceeaabfc..df9a694c 100644
--- a/parts/astyle/kdevastyle.desktop
+++ b/parts/astyle/kdevastyle.desktop
@@ -75,7 +75,7 @@ GenericName[tr]=Kaynak Kodu Biçimlendirici
 GenericName[zh_CN]=源代码格式化
 GenericName[zh_TW]=程式源碼格式器
 Icon=tdevelop
-ServiceTypes=TDevelop/SourceFormatter
+X-TDE-ServiceTypes=TDevelop/SourceFormatter
 X-TDE-Library=libkdevastyle
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/parts/bookmarks/kdevbookmarks.desktop b/parts/bookmarks/kdevbookmarks.desktop
index 3cbdb233..dfad7dbf 100644
--- a/parts/bookmarks/kdevbookmarks.desktop
+++ b/parts/bookmarks/kdevbookmarks.desktop
@@ -78,7 +78,7 @@ GenericName[tr]=Yerimleri
 GenericName[zh_CN]=书签
 GenericName[zh_TW]=書籤
 Icon=bookmark
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
 X-TDE-Library=libkdevbookmarks
 X-TDevelop-Version=5
diff --git a/parts/classview/kdevclassview.desktop b/parts/classview/kdevclassview.desktop
index 49bfa43c..4ad87aa4 100644
--- a/parts/classview/kdevclassview.desktop
+++ b/parts/classview/kdevclassview.desktop
@@ -75,7 +75,7 @@ GenericName[tg]=Намоиши синфҳо
 GenericName[tr]=Sınıf Görünümü
 GenericName[zh_CN]=类查看器
 GenericName[zh_TW]=類別檢視
-ServiceTypes=TDevelop/CodeBrowserFrontend
+X-TDE-ServiceTypes=TDevelop/CodeBrowserFrontend
 X-TDE-Library=libkdevclassview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/parts/ctags2/kdevctags2.desktop b/parts/ctags2/kdevctags2.desktop
index db79f503..9fbc4164 100644
--- a/parts/ctags2/kdevctags2.desktop
+++ b/parts/ctags2/kdevctags2.desktop
@@ -75,7 +75,7 @@ GenericName[tg]=Интерфейс дар CTags
 GenericName[tr]=CTags Önucu
 GenericName[zh_CN]=CTags前端
 GenericName[zh_TW]=CTags 前端介面
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
 X-TDE-Library=libkdevctags2
 X-TDevelop-Version=5
diff --git a/parts/diff/kdevdiff.desktop b/parts/diff/kdevdiff.desktop
index 13b22e9f..02aab0cd 100644
--- a/parts/diff/kdevdiff.desktop
+++ b/parts/diff/kdevdiff.desktop
@@ -77,7 +77,7 @@ GenericName[tg]=Намоишгари фарқкунанда
 GenericName[tr]=Fark Görüntüleyicisi
 GenericName[zh_CN]=差别查看器
 GenericName[zh_TW]=比較檢視器
-ServiceTypes=TDevelop/DiffFrontend
+X-TDE-ServiceTypes=TDevelop/DiffFrontend
 X-TDE-Library=libkdevdiff
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
diff --git a/parts/distpart/kdevdistpart.desktop b/parts/distpart/kdevdistpart.desktop
index 1b3d095d..106bbdb8 100644
--- a/parts/distpart/kdevdistpart.desktop
+++ b/parts/distpart/kdevdistpart.desktop
@@ -63,7 +63,7 @@ GenericName[tr]=Son Paketleme Desteği
 GenericName[zh_CN]=最终打包支持
 GenericName[zh_TW]=最終包裝支援
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevdistpart
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
diff --git a/parts/documentation/kdevdocumentation.desktop b/parts/documentation/kdevdocumentation.desktop
index 674812f4..5449d8a1 100644
--- a/parts/documentation/kdevdocumentation.desktop
+++ b/parts/documentation/kdevdocumentation.desktop
@@ -74,7 +74,7 @@ GenericName[tr]=Belgelendirme
 GenericName[zh_CN]=文档
 GenericName[zh_TW]=文件
 Icon=khelpcenter
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
 X-TDE-Library=libkdevdocumentation
 X-TDevelop-Version=5
diff --git a/parts/documentation/plugins/chm/docchmplugin.desktop b/parts/documentation/plugins/chm/docchmplugin.desktop
index 95ed1610..90323232 100644
--- a/parts/documentation/plugins/chm/docchmplugin.desktop
+++ b/parts/documentation/plugins/chm/docchmplugin.desktop
@@ -39,6 +39,6 @@ Comment[tg]=Модул барои намоиши файлҳои CHM-е, ки ҳ�
 Comment[tr]=CHM belgelendirmesi için belgelendirme eklentisi
 Comment[zh_CN]=CHM 文档的文档插件
 Comment[zh_TW]=CHM 文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdocchmplugin
diff --git a/parts/documentation/plugins/custom/doccustomplugin.desktop b/parts/documentation/plugins/custom/doccustomplugin.desktop
index d323dc8c..0f4bec5c 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.desktop
+++ b/parts/documentation/plugins/custom/doccustomplugin.desktop
@@ -39,6 +39,6 @@ Comment[tg]=Модул барои кор кардан бо ҳуҷҷатҳо
 Comment[tr]=Her tür belgelendirme için belgelendirme eklentisi
 Comment[zh_CN]=全部类型文档的文档插件
 Comment[zh_TW]=所有型態的文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdoccustomplugin
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.desktop b/parts/documentation/plugins/devhelp/docdevhelpplugin.desktop
index 394ef484..68159dda 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.desktop
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.desktop
@@ -39,6 +39,6 @@ Comment[tr]=DevHelp belgelendirmesi için belgelendirme eklentisi
 Comment[zh_CN]=DevHelp 文档的文档插件
 Comment[zh_TW]=DevHelp 文件外掛程式
 Exec=blubb
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdocdevhelpplugin
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.desktop b/parts/documentation/plugins/djvu/docdjvuplugin.desktop
index c0f4892d..23d0305f 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.desktop
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.desktop
@@ -39,6 +39,6 @@ Comment[tg]=Модул барои наоиш намудани ҳуҷҷатҳо �
 Comment[tr]=djvu biçimi için belgelendirme eklentisi
 Comment[zh_CN]=djvu 格式文档插件
 Comment[zh_TW]=Djvu 格式文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=1
 X-TDE-Library=libdocdjvuplugin
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.desktop b/parts/documentation/plugins/doxygen/docdoxygenplugin.desktop
index bbaf7b24..b41a0d88 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.desktop
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.desktop
@@ -40,6 +40,6 @@ Comment[tg]=Модул барои наоиш намудани ҳуҷҷатҳо �
 Comment[tr]=Doxygen belgelendirmesi için belgelendirme eklentisi
 Comment[zh_CN]=Doxygen 文档的文档插件
 Comment[zh_TW]=Doxygen 文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdocdoxygenplugin
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
index 1cae3582..ed2643aa 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
@@ -38,6 +38,6 @@ Comment[tg]=Модул барои наоиши TDevelopTOC
 Comment[tr]=TDevelopTOC belgelendirmesi için belgelendirme eklentisi
 Comment[zh_CN]=TDevelopTOC 文档的文档插件
 Comment[zh_TW]=TDevelop 目錄文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdockdevtocplugin
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.desktop b/parts/documentation/plugins/pdb/docpdbplugin.desktop
index f0642cdc..c83aaf7f 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.desktop
+++ b/parts/documentation/plugins/pdb/docpdbplugin.desktop
@@ -38,6 +38,6 @@ Comment[tg]=Модул барои наоиш намудани ҳуҷҷатҳо �
 Comment[tr]=Palmdoc biçimi için belgelendirme eklentisi
 Comment[zh_CN]=Palmdoc 格式的文档插件
 Comment[zh_TW]=Palmdoc 格式文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=1
 X-TDE-Library=libdocpdbplugin
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.desktop b/parts/documentation/plugins/pdf/docpdfplugin.desktop
index 4f266415..af330cdc 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.desktop
+++ b/parts/documentation/plugins/pdf/docpdfplugin.desktop
@@ -38,6 +38,6 @@ Comment[tg]=Модул барои наоиши PDF
 Comment[tr]=PDF biçimi için belgelendirme eklentisi
 Comment[zh_CN]=PDF 格式的文档插件
 Comment[zh_TW]=PDF 格式文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=1
 X-TDE-Library=libdocpdfplugin
diff --git a/parts/documentation/plugins/qt/docqtplugin.desktop b/parts/documentation/plugins/qt/docqtplugin.desktop
index 8e1a087a..f3125f9c 100644
--- a/parts/documentation/plugins/qt/docqtplugin.desktop
+++ b/parts/documentation/plugins/qt/docqtplugin.desktop
@@ -39,6 +39,6 @@ Comment[tg]=Модул барои наоиши QT DCF
 Comment[tr]=Qt DCF Belgelendirmesi için belgelendirme eklentisi
 Comment[zh_CN]=Qt DCF 文档的文档插件
 Comment[zh_TW]=Qt DCF 文件外掛程式
-ServiceTypes=TDevelop/DocumentationPlugins
+X-TDE-ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
 X-TDE-Library=libdocqtplugin
diff --git a/parts/documentation/protocols/chm/kchmpart.desktop b/parts/documentation/protocols/chm/kchmpart.desktop
index 1b3740d0..21e5d1ad 100644
--- a/parts/documentation/protocols/chm/kchmpart.desktop
+++ b/parts/documentation/protocols/chm/kchmpart.desktop
@@ -41,6 +41,6 @@ Name[hi]=के-सीएचएम-पार्ट
 Name[nds]=Chm-Kieker (TDevelop)
 Name[pl]=Program KChm
 Name[sv]=Kchm-del
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libkchmpart
 X-TDevelop-Version=5
diff --git a/parts/doxygen/kdevdoxygen.desktop b/parts/doxygen/kdevdoxygen.desktop
index 7d50f15b..7329467d 100644
--- a/parts/doxygen/kdevdoxygen.desktop
+++ b/parts/doxygen/kdevdoxygen.desktop
@@ -73,7 +73,7 @@ GenericName[tg]=Тарафдори намудани Doxygen
 GenericName[tr]=Doxygen Desteği
 GenericName[zh_CN]=Doxygen 支持
 GenericName[zh_TW]=Doxygen 支援
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 Icon=tdevelop
 X-TDE-Library=libkdevdoxygen
 X-TDevelop-Version=5
diff --git a/parts/filecreate/kdevfilecreate.desktop b/parts/filecreate/kdevfilecreate.desktop
index 1861090d..3c43e8d9 100644
--- a/parts/filecreate/kdevfilecreate.desktop
+++ b/parts/filecreate/kdevfilecreate.desktop
@@ -70,7 +70,7 @@ GenericName[tg]=Устои бунёд кардани файлҳо
 GenericName[zh_CN]=文件创建
 GenericName[zh_TW]=檔案建立
 Icon=wizard
-ServiceTypes=TDevelop/CreateFile
+X-TDE-ServiceTypes=TDevelop/CreateFile
 X-TDE-Library=libkdevfilecreate
 X-TDevelop-Version=5
 X-TDevelop-Properties=FileCreation
diff --git a/parts/filelist/kdevfilelist.desktop b/parts/filelist/kdevfilelist.desktop
index da37f14b..21cda58b 100644
--- a/parts/filelist/kdevfilelist.desktop
+++ b/parts/filelist/kdevfilelist.desktop
@@ -69,7 +69,7 @@ GenericName[tg]=Рӯйхати файлҳо
 GenericName[zh_CN]=文件列表
 GenericName[zh_TW]=檔案列表
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
 X-TDE-Library=libkdevfilelist
 X-TDevelop-Version=5
diff --git a/parts/fileselector/kdevfileselector.desktop b/parts/fileselector/kdevfileselector.desktop
index 785db621..88764bdc 100644
--- a/parts/fileselector/kdevfileselector.desktop
+++ b/parts/fileselector/kdevfileselector.desktop
@@ -81,7 +81,7 @@ GenericName[tr]=Dosya Seçici
 GenericName[zh_CN]=文件选择器
 GenericName[zh_TW]=檔案選擇器
 Icon=fileopen
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevfileselector
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/fileview/kdevfilegroups.desktop b/parts/fileview/kdevfilegroups.desktop
index bfa3e699..c5a8d43c 100644
--- a/parts/fileview/kdevfilegroups.desktop
+++ b/parts/fileview/kdevfilegroups.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Гурӯҳи файлҳо
 GenericName[tr]=Dosya Grupları
 GenericName[zh_CN]=文件分组
 GenericName[zh_TW]=檔案群組
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 Icon=attach
 X-TDE-Library=libkdevfilegroups
 X-TDevelop-Version=5
diff --git a/parts/fileview/kdevfileview.desktop b/parts/fileview/kdevfileview.desktop
index 6a702e1b..d728ffec 100644
--- a/parts/fileview/kdevfileview.desktop
+++ b/parts/fileview/kdevfileview.desktop
@@ -77,7 +77,7 @@ GenericName[tg]=Дарахти файлҳо
 GenericName[tr]=Dosya Ağacı
 GenericName[zh_CN]=文件树
 GenericName[zh_TW]=檔案樹
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 Icon=folder
 X-TDE-Library=libkdevfileview
 X-TDevelop-Version=5
diff --git a/parts/filter/kdevfilter.desktop b/parts/filter/kdevfilter.desktop
index 1ce8122a..774455da 100644
--- a/parts/filter/kdevfilter.desktop
+++ b/parts/filter/kdevfilter.desktop
@@ -75,7 +75,7 @@ GenericName[tg]=Бо пӯсти фармон филтр ва мондан
 GenericName[tr]=Kabuk filtreleme ve Ekleme
 GenericName[zh_CN]=Shell 过滤和插入
 GenericName[zh_TW]=Shell 過濾與插入
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevfilter
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/fullscreen/kdevfullscreen.desktop b/parts/fullscreen/kdevfullscreen.desktop
index 6f935c85..4dcd3468 100644
--- a/parts/fullscreen/kdevfullscreen.desktop
+++ b/parts/fullscreen/kdevfullscreen.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Tam Ekran
 GenericName[zh_CN]=全屏
 GenericName[zh_TW]=全螢幕
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Core
 X-TDE-Library=libkdevfullscreen
 X-TDevelop-Version=5
diff --git a/parts/grepview/kdevgrepview.desktop b/parts/grepview/kdevgrepview.desktop
index 0521c804..0897c736 100644
--- a/parts/grepview/kdevgrepview.desktop
+++ b/parts/grepview/kdevgrepview.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Grep Önucu
 GenericName[zh_CN]=Grep 前端
 GenericName[zh_TW]=Grep 前端介面
 Icon=find
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevgrepview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/konsole/kdevkonsoleview.desktop b/parts/konsole/kdevkonsoleview.desktop
index 4a9fa14e..aabd7a31 100644
--- a/parts/konsole/kdevkonsoleview.desktop
+++ b/parts/konsole/kdevkonsoleview.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Gömülü Terminal
 GenericName[zh_CN]=嵌入的 Konsole
 GenericName[zh_TW]=嵌入式主控台
 Icon=konsole
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevkonsoleview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/openwith/kdevopenwith.desktop b/parts/openwith/kdevopenwith.desktop
index 0108daaa..5a32a101 100644
--- a/parts/openwith/kdevopenwith.desktop
+++ b/parts/openwith/kdevopenwith.desktop
@@ -75,7 +75,7 @@ GenericName[tr]="Birlikte Aç" Menü Eki
 GenericName[zh_CN]=“打开方式”菜单项
 GenericName[zh_TW]="開啟方式"選單
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevopenwith
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/outputviews/kdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop
index bca43d54..a5faf631 100644
--- a/parts/outputviews/kdevappoutputview.desktop
+++ b/parts/outputviews/kdevappoutputview.desktop
@@ -77,7 +77,7 @@ GenericName[tr]=Uygulama Çıktı Görünümü
 GenericName[zh_CN]=应用程序输出查看器
 GenericName[zh_TW]=應用程式輸出檢視
 Icon=exec
-ServiceTypes=TDevelop/AppFrontend
+X-TDE-ServiceTypes=TDevelop/AppFrontend
 X-TDE-Library=libkdevappview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
diff --git a/parts/outputviews/kdevmakeview.desktop b/parts/outputviews/kdevmakeview.desktop
index bfea5cec..67ba6345 100644
--- a/parts/outputviews/kdevmakeview.desktop
+++ b/parts/outputviews/kdevmakeview.desktop
@@ -80,7 +80,7 @@ GenericName[tr]=Derleyici Önucu
 GenericName[zh_CN]=编译器前端
 GenericName[zh_TW]=編譯器前端介面
 Icon=konsole
-ServiceTypes=TDevelop/MakeFrontend
+X-TDE-ServiceTypes=TDevelop/MakeFrontend
 X-TDE-Library=libkdevmakeview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
diff --git a/parts/partexplorer/kdevpartexplorer.desktop b/parts/partexplorer/kdevpartexplorer.desktop
index ff432eeb..93a4fc5e 100644
--- a/parts/partexplorer/kdevpartexplorer.desktop
+++ b/parts/partexplorer/kdevpartexplorer.desktop
@@ -69,7 +69,7 @@ GenericName[tg]=Восиати дархости қисматҳо
 GenericName[tr]=Bileşen Gezinti Aracı
 GenericName[zh_CN]=模块浏览器工具
 GenericName[zh_TW]=元件探索工具
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevpartexplorer
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/quickopen/kdevquickopen.desktop b/parts/quickopen/kdevquickopen.desktop
index 42a8e8ff..f60cdf19 100644
--- a/parts/quickopen/kdevquickopen.desktop
+++ b/parts/quickopen/kdevquickopen.desktop
@@ -73,7 +73,7 @@ GenericName[tr]=HızlıAç
 GenericName[zh_CN]=快速打开
 GenericName[zh_TW]=快速開啟
 Icon=tdevelop
-ServiceTypes=TDevelop/QuickOpen
+X-TDE-ServiceTypes=TDevelop/QuickOpen
 X-TDevelop-Scope=Project
 X-TDE-Library=libkdevquickopen
 X-TDevelop-Version=5
diff --git a/parts/regexptest/kdevregexptest.desktop b/parts/regexptest/kdevregexptest.desktop
index 57f93f73..14549434 100644
--- a/parts/regexptest/kdevregexptest.desktop
+++ b/parts/regexptest/kdevregexptest.desktop
@@ -75,7 +75,7 @@ GenericName[tg]=Тафтиши баёни ботартиб
 GenericName[tr]=Düzenli İfade Test Edicisi
 GenericName[zh_CN]=正则表达式测试
 GenericName[zh_TW]=正規表示式測試器
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevregexptest
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/replace/kdevreplace.desktop b/parts/replace/kdevreplace.desktop
index d2490c05..2b0d16c2 100644
--- a/parts/replace/kdevreplace.desktop
+++ b/parts/replace/kdevreplace.desktop
@@ -73,7 +73,7 @@ GenericName[tr]=Değiştirme Bileşeni
 GenericName[zh_CN]=替换模块
 GenericName[zh_TW]=取代元件
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
 X-TDE-Library=libkdevreplace
 X-TDevelop-Version=5
diff --git a/parts/scripting/kdevscripting.desktop b/parts/scripting/kdevscripting.desktop
index 22ef15e8..ba1f4dea 100644
--- a/parts/scripting/kdevscripting.desktop
+++ b/parts/scripting/kdevscripting.desktop
@@ -62,7 +62,7 @@ Comment[tr]=Betik Yazma eklentisi TDevelop uygulamasına KScript tabanlı betik
 Comment[zh_CN]=脚本插件可为 TDevelop 应用程序提供基于 KScript 的脚本。
 Comment[zh_TW]=文稿外掛程式提供 TDevelop 應用程式一個 KScript 基礎的文稿機制。
 Icon=shellscript
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1
 X-TDevelop-Plugin-Homepage=http://www.sourcextreme.com/projects/tdevelop
diff --git a/parts/snippet/kdevsnippet.desktop b/parts/snippet/kdevsnippet.desktop
index f9ba9652..6c40bca7 100644
--- a/parts/snippet/kdevsnippet.desktop
+++ b/parts/snippet/kdevsnippet.desktop
@@ -95,7 +95,7 @@ GenericName[tr]=Kod Parçacıkları
 GenericName[zh_CN]=代码片段
 GenericName[zh_TW]=程式碼片段
 Icon=editcut
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
 X-TDE-Library=libkdevsnippet
 X-TDevelop-Version=5
diff --git a/parts/texttools/kdevtexttools.desktop b/parts/texttools/kdevtexttools.desktop
index fd5fc736..66919eeb 100644
--- a/parts/texttools/kdevtexttools.desktop
+++ b/parts/texttools/kdevtexttools.desktop
@@ -77,7 +77,7 @@ GenericName[tg]=Тасвири матни структурӣ
 GenericName[tr]=Metin Yapısı
 GenericName[zh_CN]=文件结构
 GenericName[zh_TW]=文字結構
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevtexttools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/tipofday/kdevtipofday.desktop b/parts/tipofday/kdevtipofday.desktop
index 7efdbd9f..45a4dd3f 100644
--- a/parts/tipofday/kdevtipofday.desktop
+++ b/parts/tipofday/kdevtipofday.desktop
@@ -87,7 +87,7 @@ GenericName[tr]=Günün İpucu
 GenericName[zh_CN]=日积月累
 GenericName[zh_TW]=本日小提示
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevtipofday
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
diff --git a/parts/tools/kdevtools.desktop b/parts/tools/kdevtools.desktop
index 225b4b5f..343c8ef4 100644
--- a/parts/tools/kdevtools.desktop
+++ b/parts/tools/kdevtools.desktop
@@ -75,7 +75,7 @@ GenericName[tr]=Araçlar Menü Eklemesi
 GenericName[zh_CN]=工具菜单附加
 GenericName[zh_TW]=新增工具選單
 Icon=configure
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevtools
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/uimode/kdevuichooser.desktop b/parts/uimode/kdevuichooser.desktop
index afb21a50..218e68bb 100644
--- a/parts/uimode/kdevuichooser.desktop
+++ b/parts/uimode/kdevuichooser.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=Kullanıcı Arayüzü Seçimi
 GenericName[zh_CN]=用户界面选择
 GenericName[zh_TW]=使用者介面選擇器
 Icon=view_choose
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevuichooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
diff --git a/parts/valgrind/kdevvalgrind.desktop b/parts/valgrind/kdevvalgrind.desktop
index e2142182..546d64b1 100644
--- a/parts/valgrind/kdevvalgrind.desktop
+++ b/parts/valgrind/kdevvalgrind.desktop
@@ -67,7 +67,7 @@ GenericName[tr]=Valgrind Önucu
 GenericName[zh_CN]=Valgrind 前端
 GenericName[zh_TW]=Valgrind 前端介面
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
 X-TDE-Library=libkdevvalgrind
 X-TDevelop-Version=5
diff --git a/parts/vcsmanager/kdevvcsmanager.desktop b/parts/vcsmanager/kdevvcsmanager.desktop
index 35cdf2aa..6f8f88dc 100644
--- a/parts/vcsmanager/kdevvcsmanager.desktop
+++ b/parts/vcsmanager/kdevvcsmanager.desktop
@@ -50,7 +50,7 @@ Comment[tr]=Sürüm Kontrol Sistemi Yöneticisi
 Comment[zh_CN]=版本控制系统管理器
 Comment[zh_TW]=版本控制系統管理員
 Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1
 X-TDevelop-Plugin-Homepage=
diff --git a/tdevelop.desktop b/tdevelop.desktop
index 8b354b10..bfab1370 100644
--- a/tdevelop.desktop
+++ b/tdevelop.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdevelop %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop: Multilanguage
 Name[br]=TDevelop : meur a yezh
diff --git a/tdevelop_c_cpp.desktop b/tdevelop_c_cpp.desktop
index d8a84de3..1b0927c1 100644
--- a/tdevelop_c_cpp.desktop
+++ b/tdevelop_c_cpp.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdevelop --profile CandCppIDE %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop: C/C++
 Name[br]=TDevelop : C/C++
diff --git a/tdevelop_kde_cpp.desktop b/tdevelop_kde_cpp.desktop
index c73f2f06..7c9fab67 100644
--- a/tdevelop_kde_cpp.desktop
+++ b/tdevelop_kde_cpp.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdevelop --profile KDECppIDE %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop: TDE/C++
 Name[br]=TDevelop : TDE/C++
diff --git a/tdevelop_ruby.desktop b/tdevelop_ruby.desktop
index 4197b936..fa6f80fb 100644
--- a/tdevelop_ruby.desktop
+++ b/tdevelop_ruby.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdevelop --profile RubyIDE %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop: Ruby
 Name[br]=TDevelop : Ruby
diff --git a/tdevelop_scripting.desktop b/tdevelop_scripting.desktop
index 78642ceb..9243020a 100644
--- a/tdevelop_scripting.desktop
+++ b/tdevelop_scripting.desktop
@@ -3,7 +3,7 @@ Type=Application
 Exec=tdevelop --profile ScriptingLanguageIDE %u
 MimeType=application/x-tdevelop;
 Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
 Terminal=false
 Name=TDevelop: Scripting
 Name[ca]=TDevelop: Scripts
diff --git a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
index 4bc49cfc..51418398 100644
--- a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
+++ b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop
@@ -36,7 +36,7 @@ Comment[tr]=Clearcase Proje Bütünleştirilmesi Aracı
 Comment[zh_CN]=Clearcase 工程集成功能
 Comment[zh_TW]=Clearcase 專案整合工具
 Exec=blubb
-ServiceTypes=TDevelop/VCSIntegrator
+X-TDE-ServiceTypes=TDevelop/VCSIntegrator
 X-TDE-Library=libclearcaseintegrator
 X-TDevelop-Default=false
 X-TDevelop-VCS=ClearCase
diff --git a/vcs/clearcase/kdevclearcase.desktop b/vcs/clearcase/kdevclearcase.desktop
index 9b3df9df..f88cfed3 100644
--- a/vcs/clearcase/kdevclearcase.desktop
+++ b/vcs/clearcase/kdevclearcase.desktop
@@ -76,7 +76,7 @@ GenericName[tg]=Интегратсияи ClearCase
 GenericName[tr]=ClearCase Bütünleştirmesi
 GenericName[zh_CN]=ClearCase集成
 GenericName[zh_TW]=ClearCase 整合
-ServiceTypes=TDevelop/VersionControl
+X-TDE-ServiceTypes=TDevelop/VersionControl
 X-TDE-Library=libkdevclearcase
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,ClearcaseVCS
diff --git a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
index a6f189f7..623fc827 100644
--- a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
+++ b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop
@@ -37,7 +37,7 @@ Comment[zh_CN]=CVS 服务工程集成功能
 Comment[zh_TW]=CVS 服務專案整合工具
 Icon=cervisia
 Exec=blubb
-ServiceTypes=TDevelop/VCSIntegrator
+X-TDE-ServiceTypes=TDevelop/VCSIntegrator
 X-TDE-Library=libcvsserviceintegrator
 X-TDevelop-Default=true
 X-TDevelop-VCS=CVS
diff --git a/vcs/cvsservice/kdevcvsservice.desktop b/vcs/cvsservice/kdevcvsservice.desktop
index 921e91d1..fed6b6e4 100644
--- a/vcs/cvsservice/kdevcvsservice.desktop
+++ b/vcs/cvsservice/kdevcvsservice.desktop
@@ -71,7 +71,7 @@ GenericName[tr]=CVS Bütünleştirmesi (Cervisia)
 GenericName[zh_CN]=CVS 集成(Cervisia)
 GenericName[zh_TW]=CVS 整合（Cervisia）
 Icon=cervisia
-ServiceTypes=TDevelop/VersionControl
+X-TDE-ServiceTypes=TDevelop/VersionControl
 X-TDE-Library=libkdevcvsservice
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,CVSService
diff --git a/vcs/perforce/integrator/kdevperforceintegrator.desktop b/vcs/perforce/integrator/kdevperforceintegrator.desktop
index 78ad9bf2..54939787 100644
--- a/vcs/perforce/integrator/kdevperforceintegrator.desktop
+++ b/vcs/perforce/integrator/kdevperforceintegrator.desktop
@@ -36,7 +36,7 @@ Comment[tr]=Perforce Proje Bütünleştirme Aracı
 Comment[zh_CN]=Perforce 工程集成功能
 Comment[zh_TW]=Perforce 專案整合工具
 Exec=blubb
-ServiceTypes=TDevelop/VCSIntegrator
+X-TDE-ServiceTypes=TDevelop/VCSIntegrator
 X-TDE-Library=libperforceintegrator
 X-TDevelop-Default=false
 X-TDevelop-VCS=Perforce
diff --git a/vcs/perforce/kdevperforce.desktop b/vcs/perforce/kdevperforce.desktop
index d837faeb..d882799f 100644
--- a/vcs/perforce/kdevperforce.desktop
+++ b/vcs/perforce/kdevperforce.desktop
@@ -76,7 +76,7 @@ GenericName[tg]=Интегратсия Perforce
 GenericName[tr]=Perforce Bütünleştirmesi
 GenericName[zh_CN]=Perforce 集成
 GenericName[zh_TW]=Perforce 整合
-ServiceTypes=TDevelop/VersionControl
+X-TDE-ServiceTypes=TDevelop/VersionControl
 X-TDE-Library=libkdevperforce
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,PerforceVCS
diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
index 6e666667..76971af6 100644
--- a/vcs/subversion/integrator/kdevsubversionintegrator.desktop
+++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
@@ -37,7 +37,7 @@ Comment[zh_CN]=Subversion 工程集成功能
 Comment[zh_TW]=Subversion 專案整合工具
 Icon=misc
 Exec=blubb
-ServiceTypes=TDevelop/VCSIntegrator
+X-TDE-ServiceTypes=TDevelop/VCSIntegrator
 X-TDE-Library=libsubversionintegrator
 X-TDevelop-Default=false
 X-TDevelop-VCS=Subversion
diff --git a/vcs/subversion/kdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop
index bf52db8c..3fd79b5a 100644
--- a/vcs/subversion/kdevsubversion.desktop
+++ b/vcs/subversion/kdevsubversion.desktop
@@ -28,7 +28,7 @@ GenericName[ru]=Интеграция Subversion
 GenericName[ta]=துணை பதிப்பு
 GenericName[tg]=Зер-ривоят
 Icon=misc
-ServiceTypes=TDevelop/VersionControl
+X-TDE-ServiceTypes=TDevelop/VersionControl
 X-TDE-Library=libkdevsubversion
 X-TDevelop-Version=5
 X-TDevelop-Properties=VCS,SubversionVCS
diff --git a/vcs/subversion/kdevsvnd.desktop b/vcs/subversion/kdevsvnd.desktop
index 9ba3e877..1bbdbe72 100644
--- a/vcs/subversion/kdevsvnd.desktop
+++ b/vcs/subversion/kdevsvnd.desktop
@@ -24,7 +24,7 @@ Name[sr@Latn]=TDevelop-ov Modul za Subversion
 Name[sv]=TDevelop Subversion-Modul
 Name[zh_TW]=TDevelop Subversion 模組
 Comment=Provides subversion client services with TDevelop
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kdevsvnd
 X-TDE-FactoryName=kdevsvnd