summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-11 17:19:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-11 17:19:18 -0500
commitfd7a824a665cc57443575c3d157b0d9ff1fb2af1 (patch)
treea64a2c6ca8371101e23b8f5a70e4e0f726d32a4f
parenta0f523a8b19360d875c4055398dc7191eda08f5d (diff)
downloadkoffice-fd7a824a665cc57443575c3d157b0d9ff1fb2af1.tar.gz
koffice-fd7a824a665cc57443575c3d157b0d9ff1fb2af1.zip
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
-rw-r--r--chalk/chalk.desktop2
-rw-r--r--chalk/chalkpart.desktop2
-rw-r--r--chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop2
-rw-r--r--chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop2
-rw-r--r--chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop2
-rw-r--r--chalk/colorspaces/gray_u8/chalkgrayplugin.desktop2
-rw-r--r--chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop2
-rw-r--r--chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop2
-rw-r--r--chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop2
-rw-r--r--chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop2
-rw-r--r--chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop2
-rw-r--r--chalk/colorspaces/wet/chalkwetplugin.desktop2
-rw-r--r--chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop2
-rw-r--r--chalk/colorspaces/wetsticky/chalkwsplugin.desktop2
-rw-r--r--chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop2
-rw-r--r--chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop2
-rw-r--r--chalk/plugins/filters/blur/chalkblurfilter.desktop2
-rw-r--r--chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop2
-rw-r--r--chalk/plugins/filters/cimg/chalkcimg.desktop2
-rw-r--r--chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop2
-rw-r--r--chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop2
-rw-r--r--chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop2
-rw-r--r--chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop2
-rw-r--r--chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop2
-rw-r--r--chalk/plugins/filters/embossfilter/chalkembossfilter.desktop2
-rw-r--r--chalk/plugins/filters/example/chalkexample.desktop2
-rw-r--r--chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop2
-rw-r--r--chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop2
-rw-r--r--chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop2
-rw-r--r--chalk/plugins/filters/levelfilter/chalklevelfilter.desktop2
-rw-r--r--chalk/plugins/filters/noisefilter/chalknoisefilter.desktop2
-rw-r--r--chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop2
-rw-r--r--chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop2
-rw-r--r--chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop2
-rw-r--r--chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop2
-rw-r--r--chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop2
-rw-r--r--chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop2
-rw-r--r--chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop2
-rw-r--r--chalk/plugins/filters/threadtest/chalkthreadtest.desktop2
-rw-r--r--chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop2
-rw-r--r--chalk/plugins/filters/wavefilter/chalkwavefilter.desktop2
-rw-r--r--chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop2
-rw-r--r--chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop2
-rw-r--r--chalk/plugins/tools/selectiontools/chalkselectiontools.desktop2
-rw-r--r--chalk/plugins/tools/tool_crop/chalktoolcrop.desktop2
-rw-r--r--chalk/plugins/tools/tool_curves/chalktoolcurves.desktop2
-rw-r--r--chalk/plugins/tools/tool_filter/chalktoolfilter.desktop2
-rw-r--r--chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop2
-rw-r--r--chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop2
-rw-r--r--chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop2
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop2
-rw-r--r--chalk/plugins/tools/tool_star/chalktoolstar.desktop2
-rw-r--r--chalk/plugins/tools/tool_transform/chalktooltransform.desktop2
-rw-r--r--chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop2
-rw-r--r--chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop2
-rw-r--r--chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop2
-rw-r--r--chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop2
-rw-r--r--chalk/plugins/viewplugins/histogram/chalkhistogram.desktop2
-rw-r--r--chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop2
-rw-r--r--chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop2
-rw-r--r--chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop2
-rw-r--r--chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop2
-rw-r--r--chalk/plugins/viewplugins/performancetest/chalkperftest.desktop2
-rw-r--r--chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop2
-rw-r--r--chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkscripting.desktop2
-rw-r--r--chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop2
-rw-r--r--chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop2
-rw-r--r--chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop2
-rw-r--r--chalk/plugins/viewplugins/substrate/chalksubstrate.desktop2
-rw-r--r--chalk/plugins/viewplugins/variations/chalkvariations.desktop2
-rw-r--r--doc/koffice.desktop2
-rw-r--r--example/examplepart.desktop2
-rw-r--r--filters/chalk/gmagick/chalk_magick_export.desktop2
-rw-r--r--filters/chalk/gmagick/chalk_magick_import.desktop2
-rw-r--r--filters/chalk/jpeg/chalk_jpeg_export.desktop2
-rw-r--r--filters/chalk/jpeg/chalk_jpeg_import.desktop2
-rw-r--r--filters/chalk/magick/chalk_magick_export.desktop2
-rw-r--r--filters/chalk/magick/chalk_magick_import.desktop2
-rw-r--r--filters/chalk/openexr/chalk_openexr_export.desktop2
-rw-r--r--filters/chalk/openexr/chalk_openexr_import.desktop2
-rw-r--r--filters/chalk/pdf/chalk_pdf_import.desktop2
-rw-r--r--filters/chalk/png/chalk_png_export.desktop2
-rw-r--r--filters/chalk/png/chalk_png_import.desktop2
-rw-r--r--filters/chalk/raw/chalk_raw_import.desktop2
-rw-r--r--filters/chalk/tiff/chalk_tiff_export.desktop2
-rw-r--r--filters/chalk/tiff/chalk_tiff_import.desktop2
-rw-r--r--filters/chalk/xcf/chalk_xcf_export.desktop2
-rw-r--r--filters/chalk/xcf/chalk_xcf_import.desktop2
-rw-r--r--filters/generic_wrapper/generic_filter.desktop2
-rw-r--r--filters/karbon/ai/karbon_ai_import.desktop2
-rw-r--r--filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop2
-rw-r--r--filters/karbon/eps/karbon_eps_export.desktop2
-rw-r--r--filters/karbon/eps/karbon_eps_import.desktop2
-rw-r--r--filters/karbon/eps/karbon_ps_import.desktop2
-rw-r--r--filters/karbon/kontour/karbon_kontour_import.desktop2
-rw-r--r--filters/karbon/msod/karbon_msod_import.desktop2
-rw-r--r--filters/karbon/oodraw/karbon_oodraw_import.desktop2
-rw-r--r--filters/karbon/png/karbon_png_export.desktop2
-rw-r--r--filters/karbon/svg/karbon_svg_export.desktop2
-rw-r--r--filters/karbon/svg/karbon_svg_import.desktop2
-rw-r--r--filters/karbon/wmf/karbon_wmf_export.desktop2
-rw-r--r--filters/karbon/wmf/karbon_wmf_import.desktop2
-rw-r--r--filters/karbon/xaml/karbon_xaml_export.desktop2
-rw-r--r--filters/karbon/xaml/karbon_xaml_import.desktop2
-rw-r--r--filters/karbon/xcf/karbon_xcf_export.desktop2
-rw-r--r--filters/karbon/xfig/karbon_xfig_import.desktop2
-rw-r--r--filters/kchart/bmp/kchart_bmp_export.desktop2
-rw-r--r--filters/kchart/jpeg/kchart_jpeg_export.desktop2
-rw-r--r--filters/kchart/mng/kchart_mng_export.desktop2
-rw-r--r--filters/kchart/png/kchart_png_export.desktop2
-rw-r--r--filters/kchart/svg/kchart_svg_export.desktop2
-rw-r--r--filters/kchart/xbm/kchart_xbm_export.desktop2
-rw-r--r--filters/kchart/xpm/kchart_xpm_export.desktop2
-rw-r--r--filters/kformula/latex/kformula_latex_export.desktop2
-rw-r--r--filters/kformula/mathml/kformula_mathml_export.desktop2
-rw-r--r--filters/kformula/mathml/kformula_mathml_import.desktop2
-rw-r--r--filters/kformula/png/kformula_png_export.desktop2
-rw-r--r--filters/kformula/svg/kformula_svg_export.desktop2
-rw-r--r--filters/kivio/imageexport/kivio_image_export.desktop2
-rw-r--r--filters/kpresenter/bmp/kpresenter_bmp_export.desktop2
-rw-r--r--filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop2
-rw-r--r--filters/kpresenter/kword/kprkword.desktop2
-rw-r--r--filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop2
-rw-r--r--filters/kpresenter/mng/kpresenter_mng_export.desktop2
-rw-r--r--filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop2
-rw-r--r--filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop2
-rw-r--r--filters/kpresenter/png/kpresenter_png_export.desktop2
-rw-r--r--filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop2
-rw-r--r--filters/kpresenter/svg/kpresenter_svg_export.desktop2
-rw-r--r--filters/kpresenter/xbm/kpresenter_xbm_export.desktop2
-rw-r--r--filters/kpresenter/xpm/kpresenter_xpm_export.desktop2
-rw-r--r--filters/kspread/applixspread/kspread_applixspread_import.desktop2
-rw-r--r--filters/kspread/csv/kspread_csv_export.desktop2
-rw-r--r--filters/kspread/csv/kspread_csv_import.desktop2
-rw-r--r--filters/kspread/dbase/kspread_dbase_import.desktop2
-rw-r--r--filters/kspread/excel/import/kspread_excel_import.desktop2
-rw-r--r--filters/kspread/excel/kspread_excel_export.desktop2
-rw-r--r--filters/kspread/gnumeric/kspread_gnumeric_export.desktop2
-rw-r--r--filters/kspread/gnumeric/kspread_gnumeric_import.desktop2
-rw-r--r--filters/kspread/html/kspread_html_export.desktop2
-rw-r--r--filters/kspread/kexi/kspread_kexi_import.desktop2
-rw-r--r--filters/kspread/latex/export/kspread_latex_export.desktop2
-rw-r--r--filters/kspread/opencalc/kspread_opencalc_export.desktop2
-rw-r--r--filters/kspread/opencalc/kspread_opencalc_import.desktop2
-rw-r--r--filters/kspread/qpro/kspread_qpro_import.desktop2
-rw-r--r--filters/kugar/kugarnop/kugar_kugar_import.desktop2
-rw-r--r--filters/kword/abiword/kword_abiword_export.desktop2
-rw-r--r--filters/kword/abiword/kword_abiword_import.desktop2
-rw-r--r--filters/kword/amipro/kword_amipro_export.desktop2
-rw-r--r--filters/kword/amipro/kword_amipro_import.desktop2
-rw-r--r--filters/kword/applixword/kword_applixword_import.desktop2
-rw-r--r--filters/kword/ascii/kword_ascii_export.desktop2
-rw-r--r--filters/kword/ascii/kword_ascii_import.desktop2
-rw-r--r--filters/kword/docbook/kword_docbook_export.desktop2
-rw-r--r--filters/kword/hancomword/kword_hancomword_import.desktop2
-rw-r--r--filters/kword/html/export/kword_html_export.desktop2
-rw-r--r--filters/kword/html/import/kword_html_import.desktop2
-rw-r--r--filters/kword/kword1.3/import/kword_kword1dot3_import.desktop2
-rw-r--r--filters/kword/latex/export/kword_latex_export.desktop2
-rw-r--r--filters/kword/latex/import/kword_latex_import.desktop2
-rw-r--r--filters/kword/msword/kword_msword_import.desktop2
-rw-r--r--filters/kword/mswrite/kword_mswrite_export.desktop2
-rw-r--r--filters/kword/mswrite/kword_mswrite_import.desktop2
-rw-r--r--filters/kword/oowriter/kword_oowriter_export.desktop2
-rw-r--r--filters/kword/oowriter/kword_oowriter_import.desktop2
-rw-r--r--filters/kword/palmdoc/kword_palmdoc_export.desktop2
-rw-r--r--filters/kword/palmdoc/kword_palmdoc_import.desktop2
-rw-r--r--filters/kword/pdf/kword_pdf_import.desktop2
-rw-r--r--filters/kword/rtf/export/kword_rtf_export.desktop2
-rw-r--r--filters/kword/rtf/import/kword_rtf_import.desktop2
-rw-r--r--filters/kword/starwriter/kword_starwriter_import.desktop2
-rw-r--r--filters/kword/wml/kword_wml_export.desktop2
-rw-r--r--filters/kword/wml/kword_wml_import.desktop2
-rw-r--r--filters/kword/wordperfect/export/kword_wp_export.desktop2
-rw-r--r--filters/kword/wordperfect/import/kword_wp_import.desktop2
-rw-r--r--filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop2
-rw-r--r--filters/xsltfilter/export/xslt_export.desktop2
-rw-r--r--filters/xsltfilter/import/xslt_import.desktop2
-rw-r--r--karbon/data/karbon.desktop4
-rw-r--r--karbon/data/karbonpart.desktop4
-rw-r--r--karbon/plugins/imagetool/karbonimagetool.desktop2
-rw-r--r--karbon/plugins/zoomtool/karbonzoomtool.desktop2
-rw-r--r--karbon/tools/karbondefaulttools.desktop2
-rw-r--r--kchart/kchart.desktop2
-rw-r--r--kchart/kchartpart.desktop2
-rw-r--r--kexi/formeditor/factories/kformdesigner_containers.desktop2
-rw-r--r--kexi/formeditor/factories/kformdesigner_stdwidgets.desktop2
-rw-r--r--kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop4
-rw-r--r--kexi/formeditor/test/kformdesigner.desktop2
-rw-r--r--kexi/formeditor/test/kformdesigner_part.desktop2
-rw-r--r--kexi/kexi.desktop2
-rw-r--r--kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop4
-rw-r--r--kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop4
-rw-r--r--kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop4
-rw-r--r--kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop4
-rw-r--r--kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop4
-rw-r--r--kexi/migration/mysql/keximigrate_mysql.desktop4
-rw-r--r--kexi/migration/pqxx/keximigrate_pqxx.desktop4
-rw-r--r--kexi/plugins/forms/kexiformhandler.desktop2
-rw-r--r--kexi/plugins/forms/kformdesigner_kexidbfactory.desktop2
-rw-r--r--kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop2
-rw-r--r--kexi/plugins/macros/kexipart/keximacrohandler.desktop2
-rw-r--r--kexi/plugins/migration/keximigrationhandler.desktop2
-rw-r--r--kexi/plugins/queries/kexiqueryhandler.desktop2
-rw-r--r--kexi/plugins/relations/kexirelationhandler.desktop2
-rw-r--r--kexi/plugins/reports/kexireporthandler.desktop2
-rw-r--r--kexi/plugins/reports/kformdesigner_kexireportfactory.desktop2
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop2
-rw-r--r--kexi/plugins/tables/kexitablehandler.desktop2
-rw-r--r--kformula/kformula.desktop2
-rw-r--r--kformula/kformulapart.desktop2
-rw-r--r--kivio/kiviopart/kivio.desktop2
-rw-r--r--kivio/kiviopart/kiviopart.desktop2
-rw-r--r--koshell/koshell.desktop2
-rw-r--r--kounavail/kounavail.desktop2
-rw-r--r--kplato/kplato.desktop2
-rw-r--r--kplato/kplatopart.desktop2
-rw-r--r--kpresenter/kpresenter.desktop2
-rw-r--r--kpresenter/kpresenterpart.desktop2
-rw-r--r--kspread/kspread.desktop2
-rw-r--r--kspread/kspreadpart.desktop2
-rw-r--r--kugar/kudesigner/kudesigner.desktop4
-rw-r--r--kugar/part/kugar.desktop2
-rw-r--r--kugar/part/kugarpart.desktop2
-rw-r--r--kword/kword.desktop4
-rw-r--r--kword/kwordpart.desktop4
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread.desktop2
-rw-r--r--kword/mailmerge/kwserialletter_classic.desktop2
-rw-r--r--kword/mailmerge/sql/kwserialletter_qtsqldb.desktop2
-rw-r--r--kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop2
-rw-r--r--kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop2
-rw-r--r--lib/kofficecore/kodocinfopropspage.desktop2
-rw-r--r--tools/kthesaurus/KThesaurus.desktop2
-rw-r--r--tools/quickprint/chalk_konqi.desktop2
-rw-r--r--tools/quickprint/karbon_konqi.desktop2
-rw-r--r--tools/quickprint/kchart_konqi.desktop2
-rw-r--r--tools/quickprint/kexi_konqi.desktop2
-rw-r--r--tools/quickprint/kformula_konqi.desktop2
-rw-r--r--tools/quickprint/kivio_konqi.desktop2
-rw-r--r--tools/quickprint/kpresenter_konqi.desktop2
-rw-r--r--tools/quickprint/kspread_konqi.desktop2
-rw-r--r--tools/quickprint/kword_konqi.desktop2
-rw-r--r--tools/spell/tdespelltool.desktop2
-rw-r--r--tools/tdefile-plugins/abiword/tdefile_abiword.desktop2
-rw-r--r--tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop2
-rw-r--r--tools/tdefile-plugins/koffice/tdefile_koffice.desktop2
-rw-r--r--tools/tdefile-plugins/ooo/tdefile_ooo.desktop2
-rw-r--r--tools/thesaurus/thesaurustool.desktop2
-rw-r--r--tools/thumbnail/clipartthumbnail.desktop2
-rw-r--r--tools/thumbnail/kofficethumbnail.desktop2
-rw-r--r--tools/thumbnail/otherofficethumbnail.desktop2
253 files changed, 266 insertions, 266 deletions
diff --git a/chalk/chalk.desktop b/chalk/chalk.desktop
index 2f251e2d..a3f231cf 100644
--- a/chalk/chalk.desktop
+++ b/chalk/chalk.desktop
@@ -5,7 +5,7 @@ Name[km]= Chalk
Name[lo]=ກຣິຕາ
Name[ne]=क्रिता
Exec=chalk %U
-DocPath=chalk/index.html
+X-DocPath=chalk/index.html
Comment=Edit and paint images
Comment[bg]=Редактиране и оцветяване на изображения
Comment[ca]=Edita i pinta imatges
diff --git a/chalk/chalkpart.desktop b/chalk/chalkpart.desktop
index 9238c4cf..9ee1186b 100644
--- a/chalk/chalkpart.desktop
+++ b/chalk/chalkpart.desktop
@@ -42,7 +42,7 @@ Name[zh_TW]=KOffice 繪圖與影像編輯元件
X-TDE-Library=libchalkpart
MimeType=application/x-chalk
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/x-chalk
GenericName=Image Object
GenericName[bg]=Графично изображение
diff --git a/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop b/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
index dcbfe062..1facc6a3 100644
--- a/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
+++ b/chalk/colorspaces/cmyk_u16/chalk_cmyk_u16_plugin.desktop
@@ -79,7 +79,7 @@ Comment[sv]=Färgmodell för 16-bitars heltal per kanal CMYK-bilder
Comment[uk]=Модель кольору з 16-бітним цілим числом для кожного каналу зображень CMYK
Comment[zh_CN]=16 位整数每通道 CYMK 图像的色彩模型
Comment[zh_TW]=每色頻為 16-bit 的 CMYK 圖片色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_cmyk_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop b/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
index c5f433fc..b6b7ff6a 100644
--- a/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
+++ b/chalk/colorspaces/cmyk_u8/chalkcmykplugin.desktop
@@ -92,7 +92,7 @@ Comment[tr]=8-bit/kanal CMYK görüntüler için renk modeli
Comment[uk]=Модель кольору CMYK для зображень 8-біт/каналів
Comment[zh_CN]=八位/通道 CMYK 图像的色彩模型
Comment[zh_TW]=8-bit/色頻的 CMYK 圖片色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalkcmykplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop b/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
index 754aebd3..295cec74 100644
--- a/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
+++ b/chalk/colorspaces/gray_u16/chalk_gray_u16_plugin.desktop
@@ -77,7 +77,7 @@ Comment[sv]=Färgmodell för 16-bitars heltal per kanal gråskalebilder
Comment[uk]=Модель кольору для зображень відтінків сірого, 16-біт/канал
Comment[zh_CN]=每通道 16 位整数的灰度图像色彩模型
Comment[zh_TW]=每色頻為 16-bit 的灰階圖片色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-Chalk-Version=2
X-TDE-Library=chalk_gray_u16_plugin
diff --git a/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop b/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
index 633b95ae..db962675 100644
--- a/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
+++ b/chalk/colorspaces/gray_u8/chalkgrayplugin.desktop
@@ -91,7 +91,7 @@ Comment[tr]=8-bit griton görüntüler için renk modeli.
Comment[uk]=Модель кольору зображень відтінків сірого (8-бітів)
Comment[zh_CN]=8 位灰度图像的色彩模型
Comment[zh_TW]=8-bit 灰階圖片的色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalkgrayplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop b/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
index a522653b..63765cd2 100644
--- a/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
+++ b/chalk/colorspaces/lms_f32/chalk_lms_f32_plugin.desktop
@@ -71,7 +71,7 @@ Comment[sr@Latn]=Model boja za LMS konusni prostor (duge srednje i kratke talasn
Comment[sv]=Färgmodell för LMS-konrymd (Långa, mellanliggande och korta våglängder)
Comment[uk]=Модель кольорів для конусного простору LMS (довгі середні і короткі довжини кольорів)
Comment[zh_TW]=LMS cone space 顏色模式(Long Middle and Short 波長)
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_lms_f32_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop b/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
index c8904ed4..5f5d2f41 100644
--- a/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
+++ b/chalk/colorspaces/rgb_f16half/chalk_rgb_f16half_plugin.desktop
@@ -70,7 +70,7 @@ Comment[sr@Latn]=Model boja za RGB slike, 16-bitno realno „polu“ po kanalu
Comment[sv]=Färgmodell för 16-bitars flyttal 'halva' per kanal RGB-bilder
Comment[uk]=Модель кольорів для 16-бітних зображень RGB, з плаваючою комою, "половина" на канал
Comment[zh_TW]=每色頻 16-bit 半浮點 RGB 圖片的色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_rgb_f16half_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop b/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
index 95c28283..4c42d500 100644
--- a/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
+++ b/chalk/colorspaces/rgb_f32/chalk_rgb_f32_plugin.desktop
@@ -71,7 +71,7 @@ Comment[sr@Latn]=Model boja za RGB slike, 32-bitno realno po kanalu
Comment[sv]=Färgmodell för 32-bitars flyttal per kanal RGB-bilder
Comment[uk]=Модель кольорів для зображень RGB 32-біт з плаваючою комою на канал
Comment[zh_TW]=每色頻 32-bit 浮點 RGB 圖片的色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-Chalk-Version=2
X-TDE-Library=chalk_rgb_f32_plugin
diff --git a/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop b/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
index 85a860c7..040715d2 100644
--- a/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
+++ b/chalk/colorspaces/rgb_u16/chalk_rgb_u16_plugin.desktop
@@ -73,7 +73,7 @@ Comment[sr@Latn]=Model boja za RGB slike, 16-bitno celobrojno po kanalu
Comment[sv]=Färgmodell för 16-bitars heltal/kanal RGB-bilder
Comment[uk]=Модель кольорів для зображень RGB 32-біт ціле число на канал
Comment[zh_TW]=每色頻 16-bit 整數 RGB 圖片的色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_rgb_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop b/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
index 82ca7b8a..30c4e3c0 100644
--- a/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
+++ b/chalk/colorspaces/rgb_u8/chalkrgbplugin.desktop
@@ -93,7 +93,7 @@ Comment[tr]=8-bit/kanal RGB görüntüler için renk modeli.
Comment[uk]=Модель кольорів для зображень RGB з 8-бітами/канал
Comment[zh_CN]=8 位/通道 RGB 图像的色彩模型
Comment[zh_TW]=8-bit/色頻 RGB 圖片的色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalkrgbplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/wet/chalkwetplugin.desktop b/chalk/colorspaces/wet/chalkwetplugin.desktop
index bfa7e12d..41b69a75 100644
--- a/chalk/colorspaces/wet/chalkwetplugin.desktop
+++ b/chalk/colorspaces/wet/chalkwetplugin.desktop
@@ -80,7 +80,7 @@ Comment[sv]=Färgmodell och verktyg för att måla med simulerade vattenfärger
Comment[uk]=Модель кольорів та засобів для малювання з симулюванням акварелі
Comment[zh_CN]=模拟水彩绘画的色彩模型和工具
Comment[zh_TW]=以模擬水色繪製的色彩模型與工具
-ServiceTypes=Chalk/ColorSpace,Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ColorSpace,Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkwetplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop b/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
index e81597e4..16408160 100644
--- a/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
+++ b/chalk/colorspaces/wetsticky/brushop/chalkwsbrushpaintop.desktop
@@ -67,7 +67,7 @@ Comment[sr@Latn]=Mokra i lepljiva četkica
Comment[sv]=Våt och klibbig målarpensel
Comment[uk]=Пензель з параметрами вогкості і клейкості
Comment[zh_TW]=濕 & 黏的筆刷
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalkwsbrushpaintop
X-Chalk-Version=2
diff --git a/chalk/colorspaces/wetsticky/chalkwsplugin.desktop b/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
index e1f9d1fd..7a8fc4d0 100644
--- a/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
+++ b/chalk/colorspaces/wetsticky/chalkwsplugin.desktop
@@ -39,7 +39,7 @@ Name[sv]=Våt och klibbig dukfärgmodell
Name[uk]=Канва моделі кольорів з параметрами вогкості і клейкості
Name[zh_CN]=湿性/粘性画布色彩模型
Name[zh_TW]=濕 & 黏的畫布色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalkwsplugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop b/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
index 0a7ffaec..30bcfd71 100644
--- a/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
+++ b/chalk/colorspaces/ycbcr_u16/chalk_ycbcr_u16_plugin.desktop
@@ -65,7 +65,7 @@ Comment[sr@Latn]=Model boja za YCbCr slike, 16-bitno celobrojno po kanalu
Comment[sv]=Färgmodell för YCbCr-bilder med 16-bitars heltal per kanal
Comment[uk]=Модель кольорів для зображень YCbCr з цілим 16-біт/канал
Comment[zh_TW]=每色頻為 16-bit 的 YCbCr 圖片色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_ycbcr_u16_plugin
X-Chalk-Version=2
diff --git a/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop b/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
index ed7e63f3..10ef47cd 100644
--- a/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
+++ b/chalk/colorspaces/ycbcr_u8/chalk_ycbcr_u8_plugin.desktop
@@ -65,7 +65,7 @@ Comment[sr@Latn]=Model boja za YCbCr slike, 8-bitno celobrojno po kanalu
Comment[sv]=Färgmodell för YCbCr-bilder med 8-bitars heltal per kanal
Comment[uk]=Модель кольорів для зображень YCbCr з цілим 8-біт/канал
Comment[zh_TW]=每色頻為 16-bit 的 YCbCr 圖片色彩模型
-ServiceTypes=Chalk/ColorSpace
+X-TDE-ServiceTypes=Chalk/ColorSpace
Type=Service
X-TDE-Library=chalk_ycbcr_u8_plugin
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/blur/chalkblurfilter.desktop b/chalk/plugins/filters/blur/chalkblurfilter.desktop
index 1c0ae9dc..d39948ac 100644
--- a/chalk/plugins/filters/blur/chalkblurfilter.desktop
+++ b/chalk/plugins/filters/blur/chalkblurfilter.desktop
@@ -32,7 +32,7 @@ Name[sr@Latn]=Konvolucioni filteri (proširenje)
Name[sv]=Faltningsfilter (utökning)
Name[uk]=Фільтри згортки (розширення)
Name[zh_TW]=皺褶過濾器(延伸)
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkblurfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop b/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
index 820ca679..4c6750ce 100644
--- a/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
+++ b/chalk/plugins/filters/bumpmap/chalkbumpmapfilter.desktop
@@ -65,7 +65,7 @@ Comment[sr@Latn]=Filter mape reljefa
Comment[sv]=Bulkartefilter
Comment[uk]=Фільтр рельєфу
Comment[zh_TW]=Bumpmap 的過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkbumpmap
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/cimg/chalkcimg.desktop b/chalk/plugins/filters/cimg/chalkcimg.desktop
index 469dbf65..51f50227 100644
--- a/chalk/plugins/filters/cimg/chalkcimg.desktop
+++ b/chalk/plugins/filters/cimg/chalkcimg.desktop
@@ -73,7 +73,7 @@ Comment[sv]=Cimg-bildförbättringsfilter
Comment[uk]=Фільтр (CImg) відновлення зображень
Comment[zh_CN]=CImg 图像修复滤镜
Comment[zh_TW]=CImg 圖片修復過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkcimg
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop b/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
index 8a9b18f6..5872e8b1 100644
--- a/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
+++ b/chalk/plugins/filters/colorify/chalkcolorifyfilter.desktop
@@ -36,7 +36,7 @@ Name[uk]=Фільтри кольору (розширення)
Name[uz]=Rang filterlari (kengaytma)
Name[uz@cyrillic]=Ранг филтерлари (кенгайтма)
Name[zh_TW]=色彩過濾器(延伸)
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkcolorify
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop b/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
index 03aa776a..3b197c23 100644
--- a/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
+++ b/chalk/plugins/filters/colors/chalkextensioncolorsfilters.desktop
@@ -36,7 +36,7 @@ Name[uk]=Фільтри кольору (розширення)
Name[uz]=Rang filterlari (kengaytma)
Name[uz@cyrillic]=Ранг филтерлари (кенгайтма)
Name[zh_TW]=色彩過濾器(延伸)
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkextensioncolorsfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop b/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
index 9bd66109..8df54a72 100644
--- a/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
+++ b/chalk/plugins/filters/colorsfilters/chalkcolorsfilter.desktop
@@ -88,7 +88,7 @@ Comment[uz]=Rang filterlari
Comment[uz@cyrillic]=Ранг филтерлари
Comment[zh_CN]=颜色滤镜
Comment[zh_TW]=色彩過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkcolorsfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop b/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
index c6469069..bfc937be 100644
--- a/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
+++ b/chalk/plugins/filters/convolutionfilters/chalkconvolutionfilters.desktop
@@ -69,7 +69,7 @@ Comment[sr@Latn]=Konvolucioni filteri
Comment[sv]=Faltningsfilter
Comment[uk]=Фільтри згортки
Comment[zh_TW]=皺褶過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkconvolutionfilters
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop b/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
index 02caf8b3..8dc26dd1 100644
--- a/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
+++ b/chalk/plugins/filters/cubismfilter/chalkcubismfilter.desktop
@@ -79,7 +79,7 @@ Comment[uk]=Фільтр кубізму
Comment[uz]=Kubizm filteri
Comment[uz@cyrillic]=Кубизм филтери
Comment[zh_TW]=立體過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkcubismfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop b/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
index 44d74631..71d77550 100644
--- a/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
+++ b/chalk/plugins/filters/embossfilter/chalkembossfilter.desktop
@@ -65,7 +65,7 @@ Comment[sr@Latn]=Reljefni filter
Comment[sv]=Relieffilter
Comment[uk]=Фільтр барельєфу
Comment[zh_TW]=浮雕過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkembossfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/example/chalkexample.desktop b/chalk/plugins/filters/example/chalkexample.desktop
index 9dd9c92d..d0ec6af4 100644
--- a/chalk/plugins/filters/example/chalkexample.desktop
+++ b/chalk/plugins/filters/example/chalkexample.desktop
@@ -75,7 +75,7 @@ Comment[uk]=Інвертація кольорів зображення
Comment[uz]=Rasmning ranglarini teskarisiga almashtirish
Comment[uz@cyrillic]=Расмнинг рангларини тескарисига алмаштириш
Comment[zh_TW]=倒轉圖片的色彩
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkexample
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop b/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
index aaae41aa..0127cf62 100644
--- a/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
+++ b/chalk/plugins/filters/fastcolortransfer/chalkfastcolortransfer.desktop
@@ -63,7 +63,7 @@ Name[sr@Latn]=Filter za prenos boja
Name[sv]=Färgöverföringsfilter
Name[uk]=Перенесення кольору
Name[zh_TW]=色彩轉換過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkfastcolortransfer
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop b/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
index a0c4d4bc..dec7c8e0 100644
--- a/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
+++ b/chalk/plugins/filters/imageenhancement/chalkimageenhancement.desktop
@@ -74,7 +74,7 @@ Comment[uk]=Покращання якості зображення
Comment[uz]=Rasmning sifatini oshirish
Comment[uz@cyrillic]=Расмнинг сифатини ошириш
Comment[zh_TW]=增強圖片的品質
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkimageenhancement
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop b/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
index f137113b..f871df75 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
+++ b/chalk/plugins/filters/lenscorrectionfilter/chalklenscorrectionfilter.desktop
@@ -63,7 +63,7 @@ Name[uk]=Корекція спотворення лінзи
Name[uz]=Linzani toʻgʻrilash filteri
Name[uz@cyrillic]=Линзани тўғрилаш филтери
Name[zh_TW]=LensCorrection 過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalklenscorrectionfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop b/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
index f7e2d5fc..28fd4de7 100644
--- a/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
+++ b/chalk/plugins/filters/levelfilter/chalklevelfilter.desktop
@@ -67,7 +67,7 @@ Comment[sr@Latn]=Nivoi
Comment[sv]=Nivåer
Comment[uk]=Рівні
Comment[zh_TW]=等級
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalklevelfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop b/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
index 3ce9400d..26012a86 100644
--- a/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
+++ b/chalk/plugins/filters/noisefilter/chalknoisefilter.desktop
@@ -71,7 +71,7 @@ Comment[sr@Latn]=Dodaj šum na sliku
Comment[sv]=Lägg till brus i en bild
Comment[uk]=Додавання шуму в зображення
Comment[zh_TW]=在圖片中增加雜訊
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalknoisefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop b/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
index 1bfb41af..6666db8a 100644
--- a/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
+++ b/chalk/plugins/filters/oilpaintfilter/chalkoilpaintfilter.desktop
@@ -71,7 +71,7 @@ Comment[sr@Latn]=Filter za ulje na platnu
Comment[sv]=Oljemålningsfilter
Comment[uk]=Фільтр олійних фарб
Comment[zh_TW]=油畫過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkoilpaintfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop b/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
index b2185882..b76cd4f4 100644
--- a/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
+++ b/chalk/plugins/filters/pixelizefilter/chalkpixelizefilter.desktop
@@ -77,7 +77,7 @@ Comment[uk]=Фільтр пікселювання
Comment[uz]=Piksellashtirish filteri
Comment[uz@cyrillic]=Пикселлаштириш филтери
Comment[zh_TW]=像素化過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkpixelizefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop b/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
index c7bacfea..47195755 100644
--- a/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
+++ b/chalk/plugins/filters/raindropsfilter/chalkraindropsfilter.desktop
@@ -75,7 +75,7 @@ Comment[uk]=Фільтр дощових крапель
Comment[uz]=Yomgʻir tomchilari filteri
Comment[uz@cyrillic]=Ёмғир томчилари филтери
Comment[zh_TW]=雨滴過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkraindropsfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop b/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
index c1ba6cb5..295c6a72 100644
--- a/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
+++ b/chalk/plugins/filters/randompickfilter/chalkrandompickfilter.desktop
@@ -59,7 +59,7 @@ Name[sr@Latn]=Filter za nasumičan izbor
Name[sv]=Slumpmässigt urvalsfilter
Name[uk]=Випадковий вибір
Name[zh_TW]=隨機挑選過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkrandompickfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop b/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
index 1158800e..5a06d21a 100644
--- a/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
+++ b/chalk/plugins/filters/roundcorners/chalkroundcornersfilter.desktop
@@ -33,7 +33,7 @@ Name[sr@Latn]=Sobelov filter
Name[sv]=Sobelfilter
Name[uk]=Фільтр Собеля
Name[zh_TW]=Sobel 過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkroundcornersfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop b/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
index 2cdbe754..db75c552 100644
--- a/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
+++ b/chalk/plugins/filters/smalltilesfilter/chalksmalltilesfilter.desktop
@@ -33,7 +33,7 @@ Name[sr@Latn]=Filter malih ploča
Name[sv]=Smårutorsfilter
Name[uk]=Фільтр маленьких плиток
Name[zh_TW]=小塊拼貼過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalksmalltilesfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop b/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
index 427dca8b..d7456c70 100644
--- a/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
+++ b/chalk/plugins/filters/sobelfilter/chalksobelfilter.desktop
@@ -33,7 +33,7 @@ Name[sr@Latn]=Sobelov filter
Name[sv]=Sobelfilter
Name[uk]=Фільтр Собеля
Name[zh_TW]=Sobel 過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalksobelfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/threadtest/chalkthreadtest.desktop b/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
index 13a62621..1b49da4e 100644
--- a/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
+++ b/chalk/plugins/filters/threadtest/chalkthreadtest.desktop
@@ -32,7 +32,7 @@ Name[sr@Latn]=Filter za inverziju sa nitima
Name[sv]=Inverteringsfilter med trådar
Name[uk]=Інвертування
Name[zh_TW]=有 Thread 的反轉過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkthreadtest
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop b/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
index 0b805f02..ac9eb83f 100644
--- a/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
+++ b/chalk/plugins/filters/unsharp/chalkunsharpfilter.desktop
@@ -34,7 +34,7 @@ Name[uk]=Фільтри покращання зображення (розшир
Name[uz]=Rasmning sifatini oshirish filterlari (kengaytma)
Name[uz@cyrillic]=Расмнинг сифатини ошириш филтерлари (кенгайтма)
Name[zh_TW]=增強過濾器(延伸)
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkunsharpfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop b/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
index 3c841b88..5843b46a 100644
--- a/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
+++ b/chalk/plugins/filters/wavefilter/chalkwavefilter.desktop
@@ -66,7 +66,7 @@ Name[uk]=Хвилі
Name[uz]=Toʻlqin filteri
Name[uz@cyrillic]=Тўлқин филтери
Name[zh_TW]=Wave 過濾器
-ServiceTypes=Chalk/Filter
+X-TDE-ServiceTypes=Chalk/Filter
Type=Service
X-TDE-Library=chalkwavefilter
X-Chalk-Version=2
diff --git a/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop b/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
index a17df417..fa3eb2a8 100644
--- a/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
+++ b/chalk/plugins/paintops/defaultpaintops/chalkdefaultpaintops.desktop
@@ -87,7 +87,7 @@ Comment[uz]=Andoza chizish amallari
Comment[uz@cyrillic]=Андоза чизиш амаллари
Comment[zh_CN]=默认绘图操作
Comment[zh_TW]=預設繪圖操作
-ServiceTypes=Chalk/Paintop
+X-TDE-ServiceTypes=Chalk/Paintop
Type=Service
X-TDE-Library=chalkdefaultpaintops
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop b/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
index f1b34b63..bfea17d7 100644
--- a/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
+++ b/chalk/plugins/tools/defaulttools/chalkdefaulttools.desktop
@@ -50,7 +50,7 @@ Name[uz]=Andoza vositalar
Name[uz@cyrillic]=Андоза воситалар
Name[zh_CN]=默认工具
Name[zh_TW]=預設工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalkdefaulttools
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
index f005126b..58c9bf64 100644
--- a/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
+++ b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop
@@ -46,7 +46,7 @@ Name[uz]=Tanlash vositalari
Name[uz@cyrillic]=Танлаш воситалари
Name[zh_CN]=选择工具
Name[zh_TW]=選取區工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalkselectiontools
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
index 325fbf78..5c698ce6 100644
--- a/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
+++ b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop
@@ -41,7 +41,7 @@ Name[sv]=Beskärningsverktyg
Name[uk]=Засіб обрізування
Name[zh_CN]=裁剪工具
Name[zh_TW]=剪裁工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolcrop
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
index 76ea7b29..35b194cc 100644
--- a/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
+++ b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop
@@ -30,7 +30,7 @@ Name[sr@Latn]=Alat za krive
Name[sv]=Kurvverktyg
Name[uk]=Криві
Name[zh_TW]=曲線工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolcurves
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
index 991709b9..90512e8d 100644
--- a/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
+++ b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop
@@ -86,7 +86,7 @@ Comment[sv]=Filtreringsverktyg och målningsåtgärd
Comment[uk]=Засіб фільтрування та дій малювання
Comment[zh_CN]=过滤器工具和绘图集成
Comment[zh_TW]=濾鏡工具與繪圖操作
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolfilter
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
index 9899e284..409f3241 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
+++ b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop
@@ -29,7 +29,7 @@ Name[sr@Latn]=Alat za mrežu u perspektivi
Name[sv]=Perspektivrutnätsverktyg
Name[uk]=Засіб ґратки перспективи
Name[zh_TW]=透視格工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolperspectivegrid
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
index 9f1a9b9c..618516ea 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
+++ b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop
@@ -31,7 +31,7 @@ Name[sr@Latn]=Alati za transformaciju perspektive
Name[sv]=Perspektivtransformverktyg
Name[uk]=Засіб перспективи
Name[zh_TW]=透視轉換工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolperspectivetransform
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
index 2b10ed9d..e6063531 100644
--- a/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
+++ b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop
@@ -46,7 +46,7 @@ Name[uz]=Pligon vositasi
Name[uz@cyrillic]=Плигон воситаси
Name[zh_CN]=多边形工具
Name[zh_TW]=多邊形工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolpolygon
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
index b68aa879..b1d9c82a 100644
--- a/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
+++ b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop
@@ -43,7 +43,7 @@ Name[uz]=Koʻpburchak asbobi
Name[uz@cyrillic]=Кўпбурчак асбоби
Name[zh_CN]=折线工具
Name[zh_TW]=任意線工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolpolyline
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
index cc83dccc..7c630753 100644
--- a/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
+++ b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop
@@ -37,7 +37,7 @@ Name[sv]=Välj liknande färg-verktyg
Name[uk]=Засіб вибору подібних кольорів
Name[zh_CN]=选择相似颜色工具
Name[zh_TW]=選取近似色彩工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolselectsimilar
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_star/chalktoolstar.desktop b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
index f2b68b7a..4a0147d7 100644
--- a/chalk/plugins/tools/tool_star/chalktoolstar.desktop
+++ b/chalk/plugins/tools/tool_star/chalktoolstar.desktop
@@ -46,7 +46,7 @@ Name[uz]=Yulduz vositasi
Name[uz@cyrillic]=Юлдуз воситаси
Name[zh_CN]=星形工具
Name[zh_TW]=星形工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktoolstar
X-Chalk-Version=2
diff --git a/chalk/plugins/tools/tool_transform/chalktooltransform.desktop b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
index 48fe8042..453427ed 100644
--- a/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
+++ b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop
@@ -40,7 +40,7 @@ Name[uz]=Aylantirish asbobi
Name[uz@cyrillic]=Айлантириш асбоби
Name[zh_CN]=变形工具
Name[zh_TW]=變形工具
-ServiceTypes=Chalk/Tool
+X-TDE-ServiceTypes=Chalk/Tool
Type=Service
X-TDE-Library=chalktooltransform
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop b/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
index 20ace829..5e260b15 100644
--- a/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
+++ b/chalk/plugins/viewplugins/colorrange/chalkcolorrange.desktop
@@ -34,7 +34,7 @@ Name[sr@Latn]=Opseg boja
Name[sv]=Färgintervall
Name[uk]=Діапазон кольорів
Name[zh_TW]=色彩範圍
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkcolorrange
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop b/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
index ee89d0be..bb7f84d1 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
+++ b/chalk/plugins/viewplugins/colorspaceconversion/chalkcolorspaceconversion.desktop
@@ -34,7 +34,7 @@ Name[sr@Latn]=Pretvaranje prostora boja
Name[sv]=Färgrymdskonvertering
Name[uk]=Перетворення простору кольорів
Name[zh_TW]=色彩空間轉換
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkcolorspaceconversion
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop b/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
index 959dfe34..1a50159c 100644
--- a/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
+++ b/chalk/plugins/viewplugins/dropshadow/chalkdropshadow.desktop
@@ -33,7 +33,7 @@ Name[uk]=Тінь
Name[uz]=Soya tushirish
Name[uz@cyrillic]=Соя тушириш
Name[zh_CN]=阴影
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkdropshadow
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop b/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
index 603086ed..a8d0fd0b 100644
--- a/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
+++ b/chalk/plugins/viewplugins/filtersgallery/chalkfiltersgallery.desktop
@@ -39,7 +39,7 @@ Name[uz]=Filterlar toʻplami
Name[uz@cyrillic]=Филтерлар тўплами
Name[zh_CN]=滤镜库
Name[zh_TW]=濾鏡畫廊
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkfiltersgallery
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop b/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
index 378754aa..f8a7f3bb 100644
--- a/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
+++ b/chalk/plugins/viewplugins/histogram/chalkhistogram.desktop
@@ -37,7 +37,7 @@ Name[uz]=Gistogramma plagini
Name[uz@cyrillic]=Гистограмма плагини
Name[zh_CN]=直方图插件
Name[zh_TW]=直方圖外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkhistogram
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop b/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
index ff60e0e6..d4df758a 100644
--- a/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
+++ b/chalk/plugins/viewplugins/histogram_docker/chalkhistogramdocker.desktop
@@ -34,7 +34,7 @@ Name[uk]=Швартувальник гістограм
Name[uz]=Gistogramma paneli
Name[uz@cyrillic]=Гистограмма панели
Name[zh_TW]=直方圖停駐點
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkhistogramdocker
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop b/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
index 939fcf34..5a4b996f 100644
--- a/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
+++ b/chalk/plugins/viewplugins/history_docker/chalkhistorydocker.desktop
@@ -67,7 +67,7 @@ Comment[uk]=Швартувальник історії команд для Chalk
Comment[uz]=Chalk uchun buyruqlar tarixi paneli
Comment[uz@cyrillic]=Chalk учун буйруқлар тарихи панели
Comment[zh_TW]=Chalk 的指令紀錄停駐點
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkhistorydocker
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop b/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
index 980e3fde..26976291 100644
--- a/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
+++ b/chalk/plugins/viewplugins/imagesize/chalkimagesize.desktop
@@ -33,7 +33,7 @@ Name[sr@Latn]=Priključak za promenu veličine i skaliranje slika
Name[sv]=Insticksprogram för bildstorleksändring och skalning
Name[uk]=Втулок зміни розміру та масштабування зображень
Name[zh_TW]=圖片大小與縮放外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkimagesize
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop b/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
index 3aa4f21a..c91b37b4 100644
--- a/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
+++ b/chalk/plugins/viewplugins/modify_selection/chalkmodifyselection.desktop
@@ -34,7 +34,7 @@ Name[sr@Latn]=Izmena izbora
Name[sv]=Ändra markering
Name[uk]=Зміна виділення
Name[zh_TW]=變更選取
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkmodifyselection
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop b/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
index a034ada1..081b6921 100644
--- a/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
+++ b/chalk/plugins/viewplugins/performancetest/chalkperftest.desktop
@@ -35,7 +35,7 @@ Name[uk]=Тест швидкодії
Name[uz]=Unumdorilkni tekshirish
Name[uz@cyrillic]=Унумдорилкни текшириш
Name[zh_TW]=效能測試
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkperftest
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop b/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
index 6d0ce1ed..b421a17d 100644
--- a/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
+++ b/chalk/plugins/viewplugins/rotateimage/chalkrotateimage.desktop
@@ -34,7 +34,7 @@ Name[uk]=Втулок обертання зображень
Name[uz]=Rasmni burish plagini
Name[uz@cyrillic]=Расмни буриш плагини
Name[zh_TW]=旋轉圖片外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkrotateimage
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop b/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
index 09441e83..03c002ca 100644
--- a/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
+++ b/chalk/plugins/viewplugins/screenshot/chalkscreenshot.desktop
@@ -41,7 +41,7 @@ Name[uz]=Skrinshot
Name[uz@cyrillic]=Скриншот
Name[zh_CN]=抓图
Name[zh_TW]=螢幕快照
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkscreenshot
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
index eba3ea37..8bfd2875 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
@@ -75,7 +75,7 @@ Comment[uz]=Skriptlarni ishga tushirishga ruxsat berish
Comment[uz@cyrillic]=Скриптларни ишга туширишга рухсат бериш
Comment[zh_CN]=允许执行脚本
Comment[zh_TW]=允許執行命令稿
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkscripting
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
index 654e809c..1163d065 100644
--- a/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
+++ b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop
@@ -20,7 +20,7 @@ Name[sr@Latn]=Izbor neprozirnog
Name[sv]=Markera ogenomskinliga
Name[uk]=Виділення непрозорих ділянок
Name[zh_TW]=選擇不透明
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkselectopaque
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop b/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
index 39bf9f10..adff39ee 100644
--- a/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
+++ b/chalk/plugins/viewplugins/separate_channels/chalkseparatechannels.desktop
@@ -36,7 +36,7 @@ Name[uz]=Kanallarni ajratish uchun plagin
Name[uz@cyrillic]=Каналларни ажратиш учун плагин
Name[zh_CN]=独立通道插件
Name[zh_TW]=分離色頻外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkseparatechannels
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop b/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
index 2f5677a0..71521444 100644
--- a/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
+++ b/chalk/plugins/viewplugins/shearimage/chalkshearimage.desktop
@@ -31,7 +31,7 @@ Name[sr@Latn]=Priključak za smicanje slike
Name[sv]=Insticksprogram för skjuva bild
Name[uk]=Втулок перекошення зображення
Name[zh_TW]=修剪圖片外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkshearimage
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop b/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
index 0cb18a74..249d3da5 100644
--- a/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
+++ b/chalk/plugins/viewplugins/substrate/chalksubstrate.desktop
@@ -29,7 +29,7 @@ Name[sr@Latn]=Supstrat
Name[sv]=Substrat
Name[uk]=Підложка
Name[zh_TW]=基底
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalksubstrate
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/variations/chalkvariations.desktop b/chalk/plugins/viewplugins/variations/chalkvariations.desktop
index 75cb0a40..e37fe027 100644
--- a/chalk/plugins/viewplugins/variations/chalkvariations.desktop
+++ b/chalk/plugins/viewplugins/variations/chalkvariations.desktop
@@ -34,7 +34,7 @@ Name[uk]=Варіації
Name[uz]=Variatsiya plagini
Name[uz@cyrillic]=Вариация плагини
Name[zh_TW]=變動外掛程式
-ServiceTypes=Chalk/ViewPlugin
+X-TDE-ServiceTypes=Chalk/ViewPlugin
Type=Service
X-TDE-Library=chalkvariations
X-Chalk-Version=2
diff --git a/doc/koffice.desktop b/doc/koffice.desktop
index 067e01bf..d4cec859 100644
--- a/doc/koffice.desktop
+++ b/doc/koffice.desktop
@@ -4,6 +4,6 @@ Name=KOffice
Name[sv]=Koffice
Name[tr]=Koffice
NoDisplay=true
-DocPath=koffice/index.html
+X-DocPath=koffice/index.html
Categories=Qt;TDE;Office;
Icon=koffice
diff --git a/example/examplepart.desktop b/example/examplepart.desktop
index 6a705871..2cd2a85b 100644
--- a/example/examplepart.desktop
+++ b/example/examplepart.desktop
@@ -54,6 +54,6 @@ Name[zh_TW]=KOffice 範例元件
X-TDE-Library=libexamplepart
MimeType=application/x-example
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/x-example
Icon=example
diff --git a/filters/chalk/gmagick/chalk_magick_export.desktop b/filters/chalk/gmagick/chalk_magick_export.desktop
index a850207e..c039c42f 100644
--- a/filters/chalk/gmagick/chalk_magick_export.desktop
+++ b/filters/chalk/gmagick/chalk_magick_export.desktop
@@ -48,7 +48,7 @@ Name[uz@cyrillic]=Chalk Magick экспорт филтери
Name[zh_CN]=Chalk Magick 导出过滤器
Name[zh_TW]=Chalk Magick 匯出過濾程式
X-TDE-Export=image/gif,image/cgm,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Import=application/x-chalk
X-TDE-Weight=1
diff --git a/filters/chalk/gmagick/chalk_magick_import.desktop b/filters/chalk/gmagick/chalk_magick_import.desktop
index af5f62b5..0b01c1d4 100644
--- a/filters/chalk/gmagick/chalk_magick_import.desktop
+++ b/filters/chalk/gmagick/chalk_magick_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
X-TDE-Weight=1
X-TDE-Library=libchalkgmagickimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/jpeg/chalk_jpeg_export.desktop b/filters/chalk/jpeg/chalk_jpeg_export.desktop
index c0a39027..7c9d0769 100644
--- a/filters/chalk/jpeg/chalk_jpeg_export.desktop
+++ b/filters/chalk/jpeg/chalk_jpeg_export.desktop
@@ -44,7 +44,7 @@ Name[uz]=Chalk PNG eksport filteri
Name[uz@cyrillic]=Chalk PNG экспорт филтери
Name[zh_CN]=Chalk PNG 导出过滤器
Name[zh_TW]=Chalk PNG 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/jpeg
X-TDE-Import=application/x-chalk
diff --git a/filters/chalk/jpeg/chalk_jpeg_import.desktop b/filters/chalk/jpeg/chalk_jpeg_import.desktop
index e1b6e22a..f5edf149 100644
--- a/filters/chalk/jpeg/chalk_jpeg_import.desktop
+++ b/filters/chalk/jpeg/chalk_jpeg_import.desktop
@@ -44,7 +44,7 @@ Name[uz]=Chalk PNG import filteri
Name[uz@cyrillic]=Chalk PNG импорт филтери
Name[zh_CN]=Chalk PNG 导入过滤器
Name[zh_TW]=Chalk PNG 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=application/x-chalk
X-TDE-Import=image/jpeg
diff --git a/filters/chalk/magick/chalk_magick_export.desktop b/filters/chalk/magick/chalk_magick_export.desktop
index 0159c129..d6afd93b 100644
--- a/filters/chalk/magick/chalk_magick_export.desktop
+++ b/filters/chalk/magick/chalk_magick_export.desktop
@@ -48,7 +48,7 @@ Name[uz@cyrillic]=Chalk Magick экспорт филтери
Name[zh_CN]=Chalk Magick 导出过滤器
Name[zh_TW]=Chalk Magick 匯出過濾程式
X-TDE-Export=image/gif,image/cgm,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xpm,image/x-rgb,image/x-eps
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Import=application/x-chalk
X-TDE-Weight=1
diff --git a/filters/chalk/magick/chalk_magick_import.desktop b/filters/chalk/magick/chalk_magick_import.desktop
index 1195e5ec..3cd3f72a 100644
--- a/filters/chalk/magick/chalk_magick_import.desktop
+++ b/filters/chalk/magick/chalk_magick_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/x-xcf-gimp,image/gif,image/cgm,image/x-bmp,image/x-ico,image/x-pcx,image/x-portable-pixmap,image/x-targa,image/x-xbm,image/x-xcf,image/x-xpm,image/x-vnd.adobe.photoshop,image/x-rgb,image/x-eps
X-TDE-Weight=1
X-TDE-Library=libchalkmagickimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/openexr/chalk_openexr_export.desktop b/filters/chalk/openexr/chalk_openexr_export.desktop
index b0fa521d..6f2ca79c 100644
--- a/filters/chalk/openexr/chalk_openexr_export.desktop
+++ b/filters/chalk/openexr/chalk_openexr_export.desktop
@@ -45,7 +45,7 @@ Name[uz@cyrillic]=Chalk OpenEXR экспорт филтери
Name[zh_CN]=Chalk OpenEXR 导出过滤器
Name[zh_TW]=Chalk OpenEXR 匯出過濾程式
X-TDE-Export=image/x-exr
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Import=application/x-chalk
X-TDE-Weight=1
diff --git a/filters/chalk/openexr/chalk_openexr_import.desktop b/filters/chalk/openexr/chalk_openexr_import.desktop
index 0ab53e90..b57051d1 100644
--- a/filters/chalk/openexr/chalk_openexr_import.desktop
+++ b/filters/chalk/openexr/chalk_openexr_import.desktop
@@ -49,4 +49,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/x-exr
X-TDE-Weight=1
X-TDE-Library=libchalk_openexr_import
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/pdf/chalk_pdf_import.desktop b/filters/chalk/pdf/chalk_pdf_import.desktop
index 3238eb46..587ba4c4 100644
--- a/filters/chalk/pdf/chalk_pdf_import.desktop
+++ b/filters/chalk/pdf/chalk_pdf_import.desktop
@@ -43,7 +43,7 @@ Name[zh_TW]=Chalk PDF 匯入過濾程式
Comment=
Comment[uz]=PDF-fayllarni Chalk bilan oʻqish vositasi
Comment[uz@cyrillic]=PDF-файлларни Chalk билан ўқиш воситаси
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
X-TDE-Available=
X-TDE-Export=application/x-chalk
X-TDE-Import=application/pdf
diff --git a/filters/chalk/png/chalk_png_export.desktop b/filters/chalk/png/chalk_png_export.desktop
index b283316d..8312d476 100644
--- a/filters/chalk/png/chalk_png_export.desktop
+++ b/filters/chalk/png/chalk_png_export.desktop
@@ -44,7 +44,7 @@ Name[uz@cyrillic]=Chalk PNG экспорт филтери
Name[zh_CN]=Chalk PNG 导出过滤器
Name[zh_TW]=Chalk PNG 匯出過濾程式
X-TDE-Export=image/png
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Import=application/x-chalk
X-TDE-Weight=1
diff --git a/filters/chalk/png/chalk_png_import.desktop b/filters/chalk/png/chalk_png_import.desktop
index 087ba264..3fd55174 100644
--- a/filters/chalk/png/chalk_png_import.desktop
+++ b/filters/chalk/png/chalk_png_import.desktop
@@ -48,4 +48,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/png
X-TDE-Weight=1
X-TDE-Library=libchalkpngimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/raw/chalk_raw_import.desktop b/filters/chalk/raw/chalk_raw_import.desktop
index 167561a0..97084995 100644
--- a/filters/chalk/raw/chalk_raw_import.desktop
+++ b/filters/chalk/raw/chalk_raw_import.desktop
@@ -48,4 +48,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/x-raw
X-TDE-Weight=1
X-TDE-Library=libchalk_raw_import
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/chalk/tiff/chalk_tiff_export.desktop b/filters/chalk/tiff/chalk_tiff_export.desktop
index d4227ecd..8a347e13 100644
--- a/filters/chalk/tiff/chalk_tiff_export.desktop
+++ b/filters/chalk/tiff/chalk_tiff_export.desktop
@@ -44,7 +44,7 @@ Name[uz]=Chalk TIFF eksport filteri
Name[uz@cyrillic]=Chalk TIFF экспорт филтери
Name[zh_CN]=Chalk TIFF 导出过滤器
Name[zh_TW]=Chalk TIFF 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/tiff
X-TDE-Import=application/x-chalk
diff --git a/filters/chalk/tiff/chalk_tiff_import.desktop b/filters/chalk/tiff/chalk_tiff_import.desktop
index a2b83446..e51e5f2c 100644
--- a/filters/chalk/tiff/chalk_tiff_import.desktop
+++ b/filters/chalk/tiff/chalk_tiff_import.desktop
@@ -44,7 +44,7 @@ Name[uz]=Chalk TIFF import filteri
Name[uz@cyrillic]=Chalk TIFF импорт филтери
Name[zh_CN]=Chalk TIFF 导入过滤器
Name[zh_TW]=Chalk TIFF 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=application/x-chalk
X-TDE-Import=image/tiff
diff --git a/filters/chalk/xcf/chalk_xcf_export.desktop b/filters/chalk/xcf/chalk_xcf_export.desktop
index 6b525d66..6b7ca637 100644
--- a/filters/chalk/xcf/chalk_xcf_export.desktop
+++ b/filters/chalk/xcf/chalk_xcf_export.desktop
@@ -45,7 +45,7 @@ Name[uz@cyrillic]=Chalk XCF экспорт филтери
Name[zh_CN]=Chalk XCF 导出过滤器
Name[zh_TW]=Chalk XCF 匯出過濾程式
X-TDE-Export=image/x-xcf-gimp
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Import=application/x-chalk
X-TDE-Weight=1
diff --git a/filters/chalk/xcf/chalk_xcf_import.desktop b/filters/chalk/xcf/chalk_xcf_import.desktop
index 7e4af3e5..e5a6fb2c 100644
--- a/filters/chalk/xcf/chalk_xcf_import.desktop
+++ b/filters/chalk/xcf/chalk_xcf_import.desktop
@@ -49,4 +49,4 @@ X-TDE-Export=application/x-chalk
X-TDE-Import=image/x-xcf-gimp
X-TDE-Weight=1
X-TDE-Library=libchalkxcfimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/generic_wrapper/generic_filter.desktop b/filters/generic_wrapper/generic_filter.desktop
index a22b6fa9..d6de391a 100644
--- a/filters/generic_wrapper/generic_filter.desktop
+++ b/filters/generic_wrapper/generic_filter.desktop
@@ -54,5 +54,5 @@ X-TDE-Export=application/x-kpresenter
X-TDE-Import=application/x-magicpoint
X-TDE-Weight=1
Type=Service
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
X-TDE-Library=libgenerickofilter
diff --git a/filters/karbon/ai/karbon_ai_import.desktop b/filters/karbon/ai/karbon_ai_import.desktop
index 15ec0f10..16e71245 100644
--- a/filters/karbon/ai/karbon_ai_import.desktop
+++ b/filters/karbon/ai/karbon_ai_import.desktop
@@ -64,4 +64,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=application/illustrator
X-TDE-Weight=1
X-TDE-Library=libkarbonaiimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop b/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
index 6542478e..3359ea78 100644
--- a/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
+++ b/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop
@@ -66,4 +66,4 @@ X-TDE-Export=application/x-kontour
X-TDE-Import=application/x-applixgraphics
X-TDE-Weight=1
X-TDE-Library=libapplixgraphicimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_eps_export.desktop b/filters/karbon/eps/karbon_eps_export.desktop
index 97ffa1a5..32fa89eb 100644
--- a/filters/karbon/eps/karbon_eps_export.desktop
+++ b/filters/karbon/eps/karbon_eps_export.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=image/x-eps
X-TDE-Import=application/x-karbon
X-TDE-Weight=1
X-TDE-Library=libkarbonepsexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_eps_import.desktop b/filters/karbon/eps/karbon_eps_import.desktop
index 033b3338..4f7c42e1 100644
--- a/filters/karbon/eps/karbon_eps_import.desktop
+++ b/filters/karbon/eps/karbon_eps_import.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=application/illustrator
X-TDE-Import=image/x-eps
X-TDE-Weight=1
X-TDE-Library=libkarbonepsimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/eps/karbon_ps_import.desktop b/filters/karbon/eps/karbon_ps_import.desktop
index a7420e18..49591e94 100644
--- a/filters/karbon/eps/karbon_ps_import.desktop
+++ b/filters/karbon/eps/karbon_ps_import.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=application/illustrator
X-TDE-Import=application/postscript
X-TDE-Weight=1
X-TDE-Library=libkarbonepsimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/kontour/karbon_kontour_import.desktop b/filters/karbon/kontour/karbon_kontour_import.desktop
index 3c773e8a..7135db72 100644
--- a/filters/karbon/kontour/karbon_kontour_import.desktop
+++ b/filters/karbon/kontour/karbon_kontour_import.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=application/x-kontour
X-TDE-Weight=1
X-TDE-Library=libkarbonkontourimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/msod/karbon_msod_import.desktop b/filters/karbon/msod/karbon_msod_import.desktop
index 01cb4bcf..e56fd4f3 100644
--- a/filters/karbon/msod/karbon_msod_import.desktop
+++ b/filters/karbon/msod/karbon_msod_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=image/x-msod
X-TDE-Weight=1
X-TDE-Library=libkarbonmsodimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/oodraw/karbon_oodraw_import.desktop b/filters/karbon/oodraw/karbon_oodraw_import.desktop
index 24fab032..8214426a 100644
--- a/filters/karbon/oodraw/karbon_oodraw_import.desktop
+++ b/filters/karbon/oodraw/karbon_oodraw_import.desktop
@@ -60,4 +60,4 @@ X-TDE-Library=liboodrawimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/png/karbon_png_export.desktop b/filters/karbon/png/karbon_png_export.desktop
index 748e66d9..f34a3ec6 100644
--- a/filters/karbon/png/karbon_png_export.desktop
+++ b/filters/karbon/png/karbon_png_export.desktop
@@ -59,7 +59,7 @@ Name[uz@cyrillic]=Karbon14 PNG экспорт филтери
Name[xh]=Isihluzi Sokurhweba ngaphandle se Karbon14 PNG
Name[zh_CN]=Karbon14 PNG 导出过滤器
Name[zh_TW]=Karbon14 EPS 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/png
X-TDE-Import=application/x-karbon
diff --git a/filters/karbon/svg/karbon_svg_export.desktop b/filters/karbon/svg/karbon_svg_export.desktop
index 46fd6ccd..044811f6 100644
--- a/filters/karbon/svg/karbon_svg_export.desktop
+++ b/filters/karbon/svg/karbon_svg_export.desktop
@@ -59,7 +59,7 @@ Name[uz@cyrillic]=Karbon14 SVG экспорт филтери
Name[xh]=Isihluzi Sokurhweba Sangaphandle se Karbon14 SVG
Name[zh_CN]=Karbon14 SVG 导出过滤器
Name[zh_TW]=Karbon14 SVG 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/svg+xml
X-TDE-Import=application/x-karbon
diff --git a/filters/karbon/svg/karbon_svg_import.desktop b/filters/karbon/svg/karbon_svg_import.desktop
index f60e9dad..4aa82a07 100644
--- a/filters/karbon/svg/karbon_svg_import.desktop
+++ b/filters/karbon/svg/karbon_svg_import.desktop
@@ -61,4 +61,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=image/svg+xml
X-TDE-Weight=1
X-TDE-Library=libkarbonsvgimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/wmf/karbon_wmf_export.desktop b/filters/karbon/wmf/karbon_wmf_export.desktop
index e8967100..a685cfb0 100644
--- a/filters/karbon/wmf/karbon_wmf_export.desktop
+++ b/filters/karbon/wmf/karbon_wmf_export.desktop
@@ -54,7 +54,7 @@ Name[uz]=Karbon14 WMF eksport filteri
Name[uz@cyrillic]=Karbon14 WMF экспорт филтери
Name[zh_CN]=Karbon14 WMF 导出过滤器
Name[zh_TW]=Karbon14 WMF 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/x-wmf
X-TDE-Import=application/x-karbon
diff --git a/filters/karbon/wmf/karbon_wmf_import.desktop b/filters/karbon/wmf/karbon_wmf_import.desktop
index d04f0696..08733561 100644
--- a/filters/karbon/wmf/karbon_wmf_import.desktop
+++ b/filters/karbon/wmf/karbon_wmf_import.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=image/x-wmf
X-TDE-Weight=1
X-TDE-Library=libwmfimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/xaml/karbon_xaml_export.desktop b/filters/karbon/xaml/karbon_xaml_export.desktop
index 5d320449..3a027c84 100644
--- a/filters/karbon/xaml/karbon_xaml_export.desktop
+++ b/filters/karbon/xaml/karbon_xaml_export.desktop
@@ -46,7 +46,7 @@ Name[uz]=Karbon14 WVG eksport filteri
Name[uz@cyrillic]=Karbon14 WVG экспорт филтери
Name[zh_CN]=Karbon14 WVG 导出过滤器
Name[zh_TW]=Karbon14 WVG 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/wvg+xml
X-TDE-Import=application/x-karbon
diff --git a/filters/karbon/xaml/karbon_xaml_import.desktop b/filters/karbon/xaml/karbon_xaml_import.desktop
index b301c9f9..a03c38d6 100644
--- a/filters/karbon/xaml/karbon_xaml_import.desktop
+++ b/filters/karbon/xaml/karbon_xaml_import.desktop
@@ -50,4 +50,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=image/wvg+xml
X-TDE-Weight=1
X-TDE-Library=libkarbonxamlimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/karbon/xcf/karbon_xcf_export.desktop b/filters/karbon/xcf/karbon_xcf_export.desktop
index 4cc02cad..5716d79a 100644
--- a/filters/karbon/xcf/karbon_xcf_export.desktop
+++ b/filters/karbon/xcf/karbon_xcf_export.desktop
@@ -57,7 +57,7 @@ Name[uz@cyrillic]=Karbon14 Gimp экспорт филтери
Name[xh]=Isihluzi Sokurhweba ngaphandle se Karbon14 Gimp
Name[zh_CN]=Karbon14 Gimp 导出过滤器
Name[zh_TW]=Karbon14 Gimp 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=image/x-xcf-gimp
X-TDE-Import=application/x-karbon
diff --git a/filters/karbon/xfig/karbon_xfig_import.desktop b/filters/karbon/xfig/karbon_xfig_import.desktop
index b28521a5..f494da55 100644
--- a/filters/karbon/xfig/karbon_xfig_import.desktop
+++ b/filters/karbon/xfig/karbon_xfig_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/x-karbon
X-TDE-Import=image/x-xfig
X-TDE-Weight=1
X-TDE-Library=libxfigimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/bmp/kchart_bmp_export.desktop b/filters/kchart/bmp/kchart_bmp_export.desktop
index 4befa4b3..fbc17f60 100644
--- a/filters/kchart/bmp/kchart_bmp_export.desktop
+++ b/filters/kchart/bmp/kchart_bmp_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/x-bmp
X-TDE-Weight=1
X-TDE-Library=libkchartbmpexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/jpeg/kchart_jpeg_export.desktop b/filters/kchart/jpeg/kchart_jpeg_export.desktop
index 01133a78..05317a7f 100644
--- a/filters/kchart/jpeg/kchart_jpeg_export.desktop
+++ b/filters/kchart/jpeg/kchart_jpeg_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/jpeg
X-TDE-Weight=1
X-TDE-Library=libkchartjpegexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/mng/kchart_mng_export.desktop b/filters/kchart/mng/kchart_mng_export.desktop
index 3c6272b4..0be9421f 100644
--- a/filters/kchart/mng/kchart_mng_export.desktop
+++ b/filters/kchart/mng/kchart_mng_export.desktop
@@ -44,4 +44,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=video/x-mng
X-TDE-Weight=1
X-TDE-Library=libkchartmngexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/png/kchart_png_export.desktop b/filters/kchart/png/kchart_png_export.desktop
index a9f22238..34f7f2c4 100644
--- a/filters/kchart/png/kchart_png_export.desktop
+++ b/filters/kchart/png/kchart_png_export.desktop
@@ -54,4 +54,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/png
X-TDE-Weight=1
X-TDE-Library=libkchartpngexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/svg/kchart_svg_export.desktop b/filters/kchart/svg/kchart_svg_export.desktop
index 6e3d1672..d25bdbc3 100644
--- a/filters/kchart/svg/kchart_svg_export.desktop
+++ b/filters/kchart/svg/kchart_svg_export.desktop
@@ -54,4 +54,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/svg+xml
X-TDE-Weight=1
X-TDE-Library=libkchartsvgexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/xbm/kchart_xbm_export.desktop b/filters/kchart/xbm/kchart_xbm_export.desktop
index 67224ff2..2e7dc6dd 100644
--- a/filters/kchart/xbm/kchart_xbm_export.desktop
+++ b/filters/kchart/xbm/kchart_xbm_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/x-xbm
X-TDE-Weight=1
X-TDE-Library=libkchartxbmexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kchart/xpm/kchart_xpm_export.desktop b/filters/kchart/xpm/kchart_xpm_export.desktop
index dfd356de..9b7ace93 100644
--- a/filters/kchart/xpm/kchart_xpm_export.desktop
+++ b/filters/kchart/xpm/kchart_xpm_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kchart
X-TDE-Export=image/x-xpm
X-TDE-Weight=1
X-TDE-Library=libkchartxpmexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kformula/latex/kformula_latex_export.desktop b/filters/kformula/latex/kformula_latex_export.desktop
index e6cac924..166068cb 100644
--- a/filters/kformula/latex/kformula_latex_export.desktop
+++ b/filters/kformula/latex/kformula_latex_export.desktop
@@ -64,6 +64,6 @@ Name[uz@cyrillic]=KFormula LaTeX экспорт филтери
Name[xh]=Isihluzi Sokurhweba ngaphandle se KFormula LaTeX
Name[zh_CN]=KFormula LaTeX 导出过滤器
Name[zh_TW]=KFormula LaTeX 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkfolatexexport
diff --git a/filters/kformula/mathml/kformula_mathml_export.desktop b/filters/kformula/mathml/kformula_mathml_export.desktop
index a7766855..2974c3d9 100644
--- a/filters/kformula/mathml/kformula_mathml_export.desktop
+++ b/filters/kformula/mathml/kformula_mathml_export.desktop
@@ -59,6 +59,6 @@ Name[uz]=KFormula MathML eksport filteri
Name[uz@cyrillic]=KFormula MathML экспорт филтери
Name[zh_CN]=KFormula MathML 导出过滤器
Name[zh_TW]=KFormula MathML 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkfomathmlexport
diff --git a/filters/kformula/mathml/kformula_mathml_import.desktop b/filters/kformula/mathml/kformula_mathml_import.desktop
index 030ec160..a022bcf5 100644
--- a/filters/kformula/mathml/kformula_mathml_import.desktop
+++ b/filters/kformula/mathml/kformula_mathml_import.desktop
@@ -59,6 +59,6 @@ Name[uz]=KFormula MathML import filteri
Name[uz@cyrillic]=KFormula MathML импорт филтери
Name[zh_CN]=KFormula MathML 导入过滤器
Name[zh_TW]=KFormula MathML 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkfomathmlimport
diff --git a/filters/kformula/png/kformula_png_export.desktop b/filters/kformula/png/kformula_png_export.desktop
index 673e5791..9ed77f9c 100644
--- a/filters/kformula/png/kformula_png_export.desktop
+++ b/filters/kformula/png/kformula_png_export.desktop
@@ -65,6 +65,6 @@ Name[uz@cyrillic]=KFormula PNG экспорт филтери
Name[xh]=Isihluzi Sokurhweba ngaphandle se KFormula PNG
Name[zh_CN]=KFormula PNG 导出过滤器
Name[zh_TW]=KFormula PNG 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkfopngexport
diff --git a/filters/kformula/svg/kformula_svg_export.desktop b/filters/kformula/svg/kformula_svg_export.desktop
index c90be58a..b7853cf5 100644
--- a/filters/kformula/svg/kformula_svg_export.desktop
+++ b/filters/kformula/svg/kformula_svg_export.desktop
@@ -51,6 +51,6 @@ Name[uz]=KFormula SVG eksport filteri
Name[uz@cyrillic]=KFormula SVG экспорт филтери
Name[zh_CN]=KFormula SVG 导出过滤器
Name[zh_TW]=KFormula SVG 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkfosvgexport
diff --git a/filters/kivio/imageexport/kivio_image_export.desktop b/filters/kivio/imageexport/kivio_image_export.desktop
index b9d442b6..7708536a 100644
--- a/filters/kivio/imageexport/kivio_image_export.desktop
+++ b/filters/kivio/imageexport/kivio_image_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kivio
X-TDE-Export=image/png,image/jpeg,image/x-bmp
X-TDE-Weight=1
X-TDE-Library=libkivioimageexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/bmp/kpresenter_bmp_export.desktop b/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
index 2bd00c34..c7243e6e 100644
--- a/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
+++ b/filters/kpresenter/bmp/kpresenter_bmp_export.desktop
@@ -50,4 +50,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/x-bmp
X-TDE-Weight=1
X-TDE-Library=libkpresenterbmpexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop b/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
index 5308508b..3d867de1 100644
--- a/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
+++ b/filters/kpresenter/jpeg/kpresenter_jpeg_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/jpeg
X-TDE-Weight=1
X-TDE-Library=libkpresenterjpegexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/kword/kprkword.desktop b/filters/kpresenter/kword/kprkword.desktop
index 4a61b927..f7e79b2d 100644
--- a/filters/kpresenter/kword/kprkword.desktop
+++ b/filters/kpresenter/kword/kprkword.desktop
@@ -54,4 +54,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Weight=1
X-TDE-Export=application/x-kword
X-TDE-Library=libkprkword
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop b/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
index 8e94e783..0d6d850f 100644
--- a/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
+++ b/filters/kpresenter/magicpoint/kpresenter_magicpoint_import.desktop
@@ -59,4 +59,4 @@ Name[zh_CN]=KPresenter 的 Magicpoint 导入过滤器
Name[zh_TW]=KPresenter 的 Magicpoint Import 匯入過濾程式
X-TDE-Wrapper-Export=application/x-kpresenter
X-TDE-Wrapper-Import=application/x-magicpoint
-ServiceTypes=KOfficeGenericFilter
+X-TDE-ServiceTypes=KOfficeGenericFilter
diff --git a/filters/kpresenter/mng/kpresenter_mng_export.desktop b/filters/kpresenter/mng/kpresenter_mng_export.desktop
index 5cf21d9a..3bc19b3f 100644
--- a/filters/kpresenter/mng/kpresenter_mng_export.desktop
+++ b/filters/kpresenter/mng/kpresenter_mng_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=video/x-mng
X-TDE-Weight=1
X-TDE-Library=libkpresentermngexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop b/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
index fc5313b8..b3b6b3b5 100644
--- a/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
+++ b/filters/kpresenter/ooimpress/kpresenter_ooimpress_export.desktop
@@ -60,4 +60,4 @@ X-TDE-Library=libooimpressexport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop b/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
index 9e02cd6e..fb7decfa 100644
--- a/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
+++ b/filters/kpresenter/ooimpress/kpresenter_ooimpress_import.desktop
@@ -61,4 +61,4 @@ X-TDE-Library=libooimpressimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/png/kpresenter_png_export.desktop b/filters/kpresenter/png/kpresenter_png_export.desktop
index f3ebc30f..f96146e0 100644
--- a/filters/kpresenter/png/kpresenter_png_export.desktop
+++ b/filters/kpresenter/png/kpresenter_png_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/png
X-TDE-Weight=1
X-TDE-Library=libkpresenterpngexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop b/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
index 62e91098..6a8b9d1d 100644
--- a/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
+++ b/filters/kpresenter/powerpoint/import/kpresenter_powerpoint_import.desktop
@@ -48,4 +48,4 @@ X-TDE-Export=application/vnd.oasis.opendocument.presentation
X-TDE-Import=application/mspowerpoint
X-TDE-Weight=1
X-TDE-Library=libpowerpointimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/svg/kpresenter_svg_export.desktop b/filters/kpresenter/svg/kpresenter_svg_export.desktop
index 7eebd8bd..5fe7df2f 100644
--- a/filters/kpresenter/svg/kpresenter_svg_export.desktop
+++ b/filters/kpresenter/svg/kpresenter_svg_export.desktop
@@ -49,4 +49,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/svg+xml
X-TDE-Weight=1
X-TDE-Library=libkpresentersvgexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/xbm/kpresenter_xbm_export.desktop b/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
index bc6f7d6e..b9714cd8 100644
--- a/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
+++ b/filters/kpresenter/xbm/kpresenter_xbm_export.desktop
@@ -48,4 +48,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/x-xbm
X-TDE-Weight=1
X-TDE-Library=libkpresenterxbmexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kpresenter/xpm/kpresenter_xpm_export.desktop b/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
index 86ebdebc..047270ca 100644
--- a/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
+++ b/filters/kpresenter/xpm/kpresenter_xpm_export.desktop
@@ -48,4 +48,4 @@ X-TDE-Import=application/x-kpresenter
X-TDE-Export=image/x-xpm
X-TDE-Weight=1
X-TDE-Library=libkpresenterxpmexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/applixspread/kspread_applixspread_import.desktop b/filters/kspread/applixspread/kspread_applixspread_import.desktop
index 06522906..2d44feac 100644
--- a/filters/kspread/applixspread/kspread_applixspread_import.desktop
+++ b/filters/kspread/applixspread/kspread_applixspread_import.desktop
@@ -65,4 +65,4 @@ X-TDE-Export=application/x-kspread
X-TDE-Import=application/x-applixspread
X-TDE-Weight=1
X-TDE-Library=libapplixspreadimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/csv/kspread_csv_export.desktop b/filters/kspread/csv/kspread_csv_export.desktop
index f9cd591f..debdf63e 100644
--- a/filters/kspread/csv/kspread_csv_export.desktop
+++ b/filters/kspread/csv/kspread_csv_export.desktop
@@ -70,4 +70,4 @@ X-TDE-Export=text/x-csv,text/plain
X-TDE-Import=application/x-kspread
X-TDE-Weight=50
X-TDE-Library=libcsvexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/csv/kspread_csv_import.desktop b/filters/kspread/csv/kspread_csv_import.desktop
index 1be732d4..f689c7c4 100644
--- a/filters/kspread/csv/kspread_csv_import.desktop
+++ b/filters/kspread/csv/kspread_csv_import.desktop
@@ -69,4 +69,4 @@ X-TDE-Export=application/x-kspread
X-TDE-Import=text/x-csv,text/plain
X-TDE-Weight=50
X-TDE-Library=libcsvimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/dbase/kspread_dbase_import.desktop b/filters/kspread/dbase/kspread_dbase_import.desktop
index 9583edc3..40d624b8 100644
--- a/filters/kspread/dbase/kspread_dbase_import.desktop
+++ b/filters/kspread/dbase/kspread_dbase_import.desktop
@@ -62,4 +62,4 @@ X-TDE-Export=application/x-kspread
X-TDE-Import=application/x-dbase
X-TDE-Weight=1
X-TDE-Library=libdbaseimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/excel/import/kspread_excel_import.desktop b/filters/kspread/excel/import/kspread_excel_import.desktop
index f075ec82..28b5dd0f 100644
--- a/filters/kspread/excel/import/kspread_excel_import.desktop
+++ b/filters/kspread/excel/import/kspread_excel_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/vnd.oasis.opendocument.spreadsheet
X-TDE-Import=application/msexcel
X-TDE-Weight=1
X-TDE-Library=libexcelimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/excel/kspread_excel_export.desktop b/filters/kspread/excel/kspread_excel_export.desktop
index 6e1c9c06..ca80050b 100644
--- a/filters/kspread/excel/kspread_excel_export.desktop
+++ b/filters/kspread/excel/kspread_excel_export.desktop
@@ -58,4 +58,4 @@ Name[zh_TW]=KSpread 的 Excel 匯出過濾程式
#X-TDE-Import=application/x-kspread
#X-TDE-Weight=1
#X-TDE-Library=libkspreadexcelexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/gnumeric/kspread_gnumeric_export.desktop b/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
index 01ea2701..51ea98b4 100644
--- a/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
+++ b/filters/kspread/gnumeric/kspread_gnumeric_export.desktop
@@ -70,4 +70,4 @@ X-TDE-Library=libgnumericexport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/gnumeric/kspread_gnumeric_import.desktop b/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
index 51d2a474..992b422d 100644
--- a/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
+++ b/filters/kspread/gnumeric/kspread_gnumeric_import.desktop
@@ -71,4 +71,4 @@ X-TDE-Library=libgnumericimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/html/kspread_html_export.desktop b/filters/kspread/html/kspread_html_export.desktop
index 41d2692b..9abcbec1 100644
--- a/filters/kspread/html/kspread_html_export.desktop
+++ b/filters/kspread/html/kspread_html_export.desktop
@@ -69,4 +69,4 @@ X-TDE-Export=text/html
X-TDE-Import=application/x-kspread
X-TDE-Weight=50
X-TDE-Library=libkspreadhtmlexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/kexi/kspread_kexi_import.desktop b/filters/kspread/kexi/kspread_kexi_import.desktop
index c9540740..54ba3664 100644
--- a/filters/kspread/kexi/kspread_kexi_import.desktop
+++ b/filters/kspread/kexi/kspread_kexi_import.desktop
@@ -37,7 +37,7 @@ Name[uk]=Фільтр імпорту Kexi для KSpread
Name[uz]=KSpread uchun Kexi import filteri
Name[uz@cyrillic]=KSpread учун Kexi импорт филтери
Name[zh_TW]=Kexi 的 KSpread 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=application/x-kspread
X-TDE-Import=application/x-kexiproject-sqlite3
diff --git a/filters/kspread/latex/export/kspread_latex_export.desktop b/filters/kspread/latex/export/kspread_latex_export.desktop
index fd133da5..fbd13fba 100644
--- a/filters/kspread/latex/export/kspread_latex_export.desktop
+++ b/filters/kspread/latex/export/kspread_latex_export.desktop
@@ -60,6 +60,6 @@ Name[uz@cyrillic]=KSpread учун LaTeX экспорт филтери
Name[wa]=Passete LaTeX di rexhowe po KSpread
Name[zh_CN]=KSpread LATEX 导出过滤器
Name[zh_TW]=KSpread LATEX 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkspreadlatexexport
diff --git a/filters/kspread/opencalc/kspread_opencalc_export.desktop b/filters/kspread/opencalc/kspread_opencalc_export.desktop
index c983a078..39287722 100644
--- a/filters/kspread/opencalc/kspread_opencalc_export.desktop
+++ b/filters/kspread/opencalc/kspread_opencalc_export.desktop
@@ -56,4 +56,4 @@ X-TDE-Export=application/vnd.sun.xml.calc
X-TDE-Import=application/x-kspread
X-TDE-Weight=1
X-TDE-Library=libopencalcexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/opencalc/kspread_opencalc_import.desktop b/filters/kspread/opencalc/kspread_opencalc_import.desktop
index 4439e39f..b27dffcd 100644
--- a/filters/kspread/opencalc/kspread_opencalc_import.desktop
+++ b/filters/kspread/opencalc/kspread_opencalc_import.desktop
@@ -59,4 +59,4 @@ X-TDE-Library=libopencalcimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kspread/qpro/kspread_qpro_import.desktop b/filters/kspread/qpro/kspread_qpro_import.desktop
index 6484f651..9ca22582 100644
--- a/filters/kspread/qpro/kspread_qpro_import.desktop
+++ b/filters/kspread/qpro/kspread_qpro_import.desktop
@@ -71,4 +71,4 @@ X-TDE-Library=libqproimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kugar/kugarnop/kugar_kugar_import.desktop b/filters/kugar/kugarnop/kugar_kugar_import.desktop
index 343d5303..38f245c0 100644
--- a/filters/kugar/kugarnop/kugar_kugar_import.desktop
+++ b/filters/kugar/kugarnop/kugar_kugar_import.desktop
@@ -61,4 +61,4 @@ ImportDescription=Kugar
X-TDE-Export=application/x-vnd.kde.kugar.mixed
ExportDescription=Kugar Mixed
X-TDE-Library=libkugarnopimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/abiword/kword_abiword_export.desktop b/filters/kword/abiword/kword_abiword_export.desktop
index 6b9755fc..1b75be78 100644
--- a/filters/kword/abiword/kword_abiword_export.desktop
+++ b/filters/kword/abiword/kword_abiword_export.desktop
@@ -70,4 +70,4 @@ X-TDE-Export=application/x-abiword
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libabiwordexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/abiword/kword_abiword_import.desktop b/filters/kword/abiword/kword_abiword_import.desktop
index bfd020d9..c6274e71 100644
--- a/filters/kword/abiword/kword_abiword_import.desktop
+++ b/filters/kword/abiword/kword_abiword_import.desktop
@@ -70,4 +70,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/x-abiword
X-TDE-Weight=1
X-TDE-Library=libabiwordimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/amipro/kword_amipro_export.desktop b/filters/kword/amipro/kword_amipro_export.desktop
index a7345240..8c651d63 100644
--- a/filters/kword/amipro/kword_amipro_export.desktop
+++ b/filters/kword/amipro/kword_amipro_export.desktop
@@ -65,4 +65,4 @@ X-TDE-Export=application/x-amipro
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libamiproexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/amipro/kword_amipro_import.desktop b/filters/kword/amipro/kword_amipro_import.desktop
index 2a1a141c..9fd93e1b 100644
--- a/filters/kword/amipro/kword_amipro_import.desktop
+++ b/filters/kword/amipro/kword_amipro_import.desktop
@@ -65,4 +65,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/x-amipro
X-TDE-Weight=1
X-TDE-Library=libamiproimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/applixword/kword_applixword_import.desktop b/filters/kword/applixword/kword_applixword_import.desktop
index 1a94c948..054c3e1d 100644
--- a/filters/kword/applixword/kword_applixword_import.desktop
+++ b/filters/kword/applixword/kword_applixword_import.desktop
@@ -69,4 +69,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/x-applixword
X-TDE-Weight=1
X-TDE-Library=libapplixwordimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/ascii/kword_ascii_export.desktop b/filters/kword/ascii/kword_ascii_export.desktop
index 75ed1e96..371e6f3f 100644
--- a/filters/kword/ascii/kword_ascii_export.desktop
+++ b/filters/kword/ascii/kword_ascii_export.desktop
@@ -70,4 +70,4 @@ X-TDE-Export=text/plain
X-TDE-Import=application/x-kword
X-TDE-Weight=50
X-TDE-Library=libasciiexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/ascii/kword_ascii_import.desktop b/filters/kword/ascii/kword_ascii_import.desktop
index c3d9d08d..b1846781 100644
--- a/filters/kword/ascii/kword_ascii_import.desktop
+++ b/filters/kword/ascii/kword_ascii_import.desktop
@@ -53,4 +53,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=text/plain
X-TDE-Weight=1
X-TDE-Library=libasciiimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/docbook/kword_docbook_export.desktop b/filters/kword/docbook/kword_docbook_export.desktop
index 8aa052b7..4fbf4a57 100644
--- a/filters/kword/docbook/kword_docbook_export.desktop
+++ b/filters/kword/docbook/kword_docbook_export.desktop
@@ -69,4 +69,4 @@ X-TDE-Export=text/sgml
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libdocbookexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/hancomword/kword_hancomword_import.desktop b/filters/kword/hancomword/kword_hancomword_import.desktop
index 1826f746..935cc796 100644
--- a/filters/kword/hancomword/kword_hancomword_import.desktop
+++ b/filters/kword/hancomword/kword_hancomword_import.desktop
@@ -63,4 +63,4 @@ X-TDE-Export=application/vnd.oasis.opendocument.text
X-TDE-Import=application/x-hancomword
X-TDE-Weight=1
X-TDE-Library=libhancomwordimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/html/export/kword_html_export.desktop b/filters/kword/html/export/kword_html_export.desktop
index 2a3f9502..74e95dfc 100644
--- a/filters/kword/html/export/kword_html_export.desktop
+++ b/filters/kword/html/export/kword_html_export.desktop
@@ -70,4 +70,4 @@ X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Export=text/html
X-TDE-Library=libhtmlexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/html/import/kword_html_import.desktop b/filters/kword/html/import/kword_html_import.desktop
index f6ffb4f0..f3244206 100644
--- a/filters/kword/html/import/kword_html_import.desktop
+++ b/filters/kword/html/import/kword_html_import.desktop
@@ -70,4 +70,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=text/html
X-TDE-Weight=1
X-TDE-Library=libhtmlimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop b/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
index 8be7c341..82a7881c 100644
--- a/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
+++ b/filters/kword/kword1.3/import/kword_kword1dot3_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/vnd.oasis.opendocument.text
X-TDE-Import=application/x-kword
X-TDE-Weight=20
X-TDE-Library=libkwordkword1dot3import
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/latex/export/kword_latex_export.desktop b/filters/kword/latex/export/kword_latex_export.desktop
index 7b00a42a..2967428c 100644
--- a/filters/kword/latex/export/kword_latex_export.desktop
+++ b/filters/kword/latex/export/kword_latex_export.desktop
@@ -70,6 +70,6 @@ Name[xh]=Isihluzi Sokurhweba ngaphandle se KWord LATEX
Name[zh_CN]=KWord LATEX 导出过滤器
Name[zh_TW]=KWord LATEX 匯出過濾程式
Name[zu]=KWord LATEX Icebo lokuhlaziya ifayela yemininingwane Yezohwebo Lezangaphandle
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkwordlatexexport
diff --git a/filters/kword/latex/import/kword_latex_import.desktop b/filters/kword/latex/import/kword_latex_import.desktop
index e1d588b3..51aef6e9 100644
--- a/filters/kword/latex/import/kword_latex_import.desktop
+++ b/filters/kword/latex/import/kword_latex_import.desktop
@@ -60,6 +60,6 @@ Name[uz@cyrillic]=KWord LaTeX импорт филтери
Name[wa]=Passete LaTeX d' intrêye po KWord
Name[zh_CN]=KWord Latex 导入过滤器
Name[zh_TW]=KWord Latex 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libkwordlateximport
diff --git a/filters/kword/msword/kword_msword_import.desktop b/filters/kword/msword/kword_msword_import.desktop
index 4b067358..63d55788 100644
--- a/filters/kword/msword/kword_msword_import.desktop
+++ b/filters/kword/msword/kword_msword_import.desktop
@@ -61,4 +61,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/msword
X-TDE-Weight=1
X-TDE-Library=libmswordimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/mswrite/kword_mswrite_export.desktop b/filters/kword/mswrite/kword_mswrite_export.desktop
index d02974fc..9572e530 100644
--- a/filters/kword/mswrite/kword_mswrite_export.desktop
+++ b/filters/kword/mswrite/kword_mswrite_export.desktop
@@ -59,4 +59,4 @@ X-TDE-Export=application/x-mswrite
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libmswriteexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/mswrite/kword_mswrite_import.desktop b/filters/kword/mswrite/kword_mswrite_import.desktop
index 85d592d3..33552ece 100644
--- a/filters/kword/mswrite/kword_mswrite_import.desktop
+++ b/filters/kword/mswrite/kword_mswrite_import.desktop
@@ -64,4 +64,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/x-mswrite
X-TDE-Weight=1
X-TDE-Library=libmswriteimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/oowriter/kword_oowriter_export.desktop b/filters/kword/oowriter/kword_oowriter_export.desktop
index ca8ab16a..dfdae146 100644
--- a/filters/kword/oowriter/kword_oowriter_export.desktop
+++ b/filters/kword/oowriter/kword_oowriter_export.desktop
@@ -56,4 +56,4 @@ X-TDE-Export=application/vnd.sun.xml.writer
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=liboowriterexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/oowriter/kword_oowriter_import.desktop b/filters/kword/oowriter/kword_oowriter_import.desktop
index f5b828b1..fd707c8c 100644
--- a/filters/kword/oowriter/kword_oowriter_import.desktop
+++ b/filters/kword/oowriter/kword_oowriter_import.desktop
@@ -59,4 +59,4 @@ X-TDE-Library=liboowriterimport
X-TDE-LibraryMajor=1
X-TDE-LibraryMinor=0
X-TDE-LibraryDependencies=
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/palmdoc/kword_palmdoc_export.desktop b/filters/kword/palmdoc/kword_palmdoc_export.desktop
index 6e994e66..99a51904 100644
--- a/filters/kword/palmdoc/kword_palmdoc_export.desktop
+++ b/filters/kword/palmdoc/kword_palmdoc_export.desktop
@@ -65,4 +65,4 @@ X-TDE-Export=application/vnd.palm
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libpalmdocexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/palmdoc/kword_palmdoc_import.desktop b/filters/kword/palmdoc/kword_palmdoc_import.desktop
index e4b879d1..875073a7 100644
--- a/filters/kword/palmdoc/kword_palmdoc_import.desktop
+++ b/filters/kword/palmdoc/kword_palmdoc_import.desktop
@@ -65,4 +65,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/vnd.palm
X-TDE-Weight=1
X-TDE-Library=libpalmdocimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/pdf/kword_pdf_import.desktop b/filters/kword/pdf/kword_pdf_import.desktop
index f123b076..e02d617c 100644
--- a/filters/kword/pdf/kword_pdf_import.desktop
+++ b/filters/kword/pdf/kword_pdf_import.desktop
@@ -58,4 +58,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=application/pdf
X-TDE-Weight=1
X-TDE-Library=libpdfimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/rtf/export/kword_rtf_export.desktop b/filters/kword/rtf/export/kword_rtf_export.desktop
index 0beff2e3..d47f229b 100644
--- a/filters/kword/rtf/export/kword_rtf_export.desktop
+++ b/filters/kword/rtf/export/kword_rtf_export.desktop
@@ -68,4 +68,4 @@ X-TDE-Export=text/rtf,application/msword
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=librtfexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/rtf/import/kword_rtf_import.desktop b/filters/kword/rtf/import/kword_rtf_import.desktop
index 8894a52b..c4d1c8cf 100644
--- a/filters/kword/rtf/import/kword_rtf_import.desktop
+++ b/filters/kword/rtf/import/kword_rtf_import.desktop
@@ -70,4 +70,4 @@ ImportDescription=RTF
X-TDE-Export=application/x-kword
ExportDescription=KWord
X-TDE-Library=librtfimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/starwriter/kword_starwriter_import.desktop b/filters/kword/starwriter/kword_starwriter_import.desktop
index b1d5ff65..40dfc376 100644
--- a/filters/kword/starwriter/kword_starwriter_import.desktop
+++ b/filters/kword/starwriter/kword_starwriter_import.desktop
@@ -56,7 +56,7 @@ Name[uz@cyrillic]=KWord StarWriter 5.x импорт филтери
Name[xh]=Isihluzi Sokurhweba se KWord StarWriter 5.x
Name[zh_CN]=KWord StarWriter 5.x 导入过滤器
Name[zh_TW]=KWord StarWriter 5.x 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Export=application/x-kword
X-TDE-Import=application/vnd.stardivision.writer
diff --git a/filters/kword/wml/kword_wml_export.desktop b/filters/kword/wml/kword_wml_export.desktop
index 5063cd13..582d2201 100644
--- a/filters/kword/wml/kword_wml_export.desktop
+++ b/filters/kword/wml/kword_wml_export.desktop
@@ -64,4 +64,4 @@ X-TDE-Export=text/vnd.wap.wml
X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Library=libwmlexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wml/kword_wml_import.desktop b/filters/kword/wml/kword_wml_import.desktop
index c09aa5bc..73957036 100644
--- a/filters/kword/wml/kword_wml_import.desktop
+++ b/filters/kword/wml/kword_wml_import.desktop
@@ -64,4 +64,4 @@ X-TDE-Export=application/x-kword
X-TDE-Import=text/vnd.wap.wml
X-TDE-Weight=1
X-TDE-Library=libwmlimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wordperfect/export/kword_wp_export.desktop b/filters/kword/wordperfect/export/kword_wp_export.desktop
index 95e15cbc..8dd52767 100644
--- a/filters/kword/wordperfect/export/kword_wp_export.desktop
+++ b/filters/kword/wordperfect/export/kword_wp_export.desktop
@@ -66,4 +66,4 @@ X-TDE-Import=application/x-kword
X-TDE-Weight=1
X-TDE-Export=application/wordperfect
X-TDE-Library=libwpexport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/kword/wordperfect/import/kword_wp_import.desktop b/filters/kword/wordperfect/import/kword_wp_import.desktop
index d0574939..ed00b915 100644
--- a/filters/kword/wordperfect/import/kword_wp_import.desktop
+++ b/filters/kword/wordperfect/import/kword_wp_import.desktop
@@ -68,4 +68,4 @@ X-TDE-Export=application/vnd.sun.xml.writer
X-TDE-Import=application/wordperfect
X-TDE-Weight=1
X-TDE-Library=libwpimport
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop b/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
index 594637d0..88e515ef 100644
--- a/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
+++ b/filters/olefilters/powerpoint97/ole_powerpoint97_import.desktop
@@ -64,4 +64,4 @@ X-TDE-Export=application/x-kpresenter
X-TDE-Import=application/mspowerpoint
X-TDE-Weight=1
X-TDE-Library=libolefilter
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
diff --git a/filters/xsltfilter/export/xslt_export.desktop b/filters/xsltfilter/export/xslt_export.desktop
index 4902578b..6be663d4 100644
--- a/filters/xsltfilter/export/xslt_export.desktop
+++ b/filters/xsltfilter/export/xslt_export.desktop
@@ -67,6 +67,6 @@ Name[wa]=Passete XSLT di rexhowe po KOffice
Name[xh]=Isihluzi Sokurhweba ngaphandle se KOffice XSLT
Name[zh_CN]=KOffice XSLT 导出过滤器
Name[zh_TW]=KOffice XSLT 匯出過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libxsltexport
diff --git a/filters/xsltfilter/import/xslt_import.desktop b/filters/xsltfilter/import/xslt_import.desktop
index 7cfec1b9..411ac671 100644
--- a/filters/xsltfilter/import/xslt_import.desktop
+++ b/filters/xsltfilter/import/xslt_import.desktop
@@ -66,6 +66,6 @@ Name[wa]=Passete XSLT d' intrêye po KOffice
Name[xh]=Isihluzi Sokurhweba se KOffice XSLT
Name[zh_CN]=KOffice XSLT 导入过滤器
Name[zh_TW]=KOffice XSLT 匯入過濾程式
-ServiceTypes=KOfficeFilter
+X-TDE-ServiceTypes=KOfficeFilter
Type=Service
X-TDE-Library=libxsltimport
diff --git a/karbon/data/karbon.desktop b/karbon/data/karbon.desktop
index 4e510b87..cf38d98b 100644
--- a/karbon/data/karbon.desktop
+++ b/karbon/data/karbon.desktop
@@ -63,9 +63,9 @@ GenericName[zh_CN]=可缩放图像
GenericName[zh_TW]=可縮放向量圖
MimeType=application/vnd.oasis.opendocument.graphics;application/x-karbon;application/illustrator;image/x-eps;application/postscript
# kghostview has 6 for application/postscript, we need to be under that...
-InitialPreference=5
+X-TDE-InitialPreference=5
Type=Application
Icon=karbon
X-TDE-NativeMimeType=application/x-karbon
Categories=Qt;TDE;Graphics;
-DocPath=karbon/index.html
+X-DocPath=karbon/index.html
diff --git a/karbon/data/karbonpart.desktop b/karbon/data/karbonpart.desktop
index 3019daca..a9faf749 100644
--- a/karbon/data/karbonpart.desktop
+++ b/karbon/data/karbonpart.desktop
@@ -50,9 +50,9 @@ Name[zh_TW]=KOffice 可縮放圖片元件
X-TDE-Library=libkarbonpart
MimeType=application/x-karbon;application/illustrator;image/x-eps;application/postscript;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template
# kghostview has 6 for application/postscript, we need to be under that...
-InitialPreference=5
+X-TDE-InitialPreference=5
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/x-karbon
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.graphics
X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template
diff --git a/karbon/plugins/imagetool/karbonimagetool.desktop b/karbon/plugins/imagetool/karbonimagetool.desktop
index 9beba337..3a79d37d 100644
--- a/karbon/plugins/imagetool/karbonimagetool.desktop
+++ b/karbon/plugins/imagetool/karbonimagetool.desktop
@@ -43,6 +43,6 @@ Name[uz]=Rasm vositasi
Name[uz@cyrillic]=Расм воситаси
Name[zh_CN]=图像工具
Name[zh_TW]=圖片工具
-ServiceTypes=Karbon/CoreModule
+X-TDE-ServiceTypes=Karbon/CoreModule
Type=Service
X-TDE-Library=karbon_imagetoolplugin
diff --git a/karbon/plugins/zoomtool/karbonzoomtool.desktop b/karbon/plugins/zoomtool/karbonzoomtool.desktop
index fb18659c..0bfae62b 100644
--- a/karbon/plugins/zoomtool/karbonzoomtool.desktop
+++ b/karbon/plugins/zoomtool/karbonzoomtool.desktop
@@ -43,6 +43,6 @@ Name[uz]=Kattalashtirish vositasi
Name[uz@cyrillic]=Катталаштириш воситаси
Name[zh_CN]=缩放工具
Name[zh_TW]=縮放工具
-ServiceTypes=Karbon/CoreModule
+X-TDE-ServiceTypes=Karbon/CoreModule
Type=Service
X-TDE-Library=karbon_zoomtoolplugin
diff --git a/karbon/tools/karbondefaulttools.desktop b/karbon/tools/karbondefaulttools.desktop
index 80cf6f1e..bf6097d5 100644
--- a/karbon/tools/karbondefaulttools.desktop
+++ b/karbon/tools/karbondefaulttools.desktop
@@ -50,6 +50,6 @@ Name[uz]=Andoza vositalar
Name[uz@cyrillic]=Андоза воситалар
Name[zh_CN]=默认工具
Name[zh_TW]=預設工具
-ServiceTypes=Karbon/CoreModule
+X-TDE-ServiceTypes=Karbon/CoreModule
Type=Service
X-TDE-Library=karbon_defaulttools
diff --git a/kchart/kchart.desktop b/kchart/kchart.desktop
index d463e52d..c0fd8853 100644
--- a/kchart/kchart.desktop
+++ b/kchart/kchart.desktop
@@ -111,4 +111,4 @@ X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Office;
-DocPath=kchart/index.html
+X-DocPath=kchart/index.html
diff --git a/kchart/kchartpart.desktop b/kchart/kchartpart.desktop
index b4fadebf..5f2679a4 100644
--- a/kchart/kchartpart.desktop
+++ b/kchart/kchartpart.desktop
@@ -53,7 +53,7 @@ Name[zh_TW]=KOffice Chart 元件
X-TDE-Library=libkchartpart
Type=Service
MimeType=application/x-kchart;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,KOfficeChart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,KOfficeChart
X-TDE-NativeMimeType=application/x-kchart
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.chart-template
diff --git a/kexi/formeditor/factories/kformdesigner_containers.desktop b/kexi/formeditor/factories/kformdesigner_containers.desktop
index 0cd57c75..38939ec4 100644
--- a/kexi/formeditor/factories/kformdesigner_containers.desktop
+++ b/kexi/formeditor/factories/kformdesigner_containers.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KFormDesigner/WidgetFactory
+X-TDE-ServiceTypes=KFormDesigner/WidgetFactory
Name=Container Widgets
Name[bg]=Контейнери
diff --git a/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop b/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
index c3c55bb9..1872a9d3 100644
--- a/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
+++ b/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KFormDesigner/WidgetFactory
+X-TDE-ServiceTypes=KFormDesigner/WidgetFactory
Name=Basic Widgets
Name[bg]=Основни графични обекти
diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop b/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
index bfcb4a2d..e47cc117 100644
--- a/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
+++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop
@@ -44,7 +44,7 @@ Name[uk]=Втулок дизайнера форм KDevelop
Name[zh_CN]=表单设计器 KDevelop 插件
Name[zh_TW]=表單設計師 KDevelop 外掛程式
MimeType=application/x-designer;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-Library=libkformdesigner_kdev_part
Type=Service
-InitialPreference=0
+X-TDE-InitialPreference=0
diff --git a/kexi/formeditor/test/kformdesigner.desktop b/kexi/formeditor/test/kformdesigner.desktop
index 06ab1837..e159b1b4 100644
--- a/kexi/formeditor/test/kformdesigner.desktop
+++ b/kexi/formeditor/test/kformdesigner.desktop
@@ -12,7 +12,7 @@ Name[zh_CN]=KForm 设计器
Exec=kformdesigner %i %m -caption "%c"
Icon=kformdesigner
Type=Application
-DocPath=kformdesigner/kformdesigner.html
+X-DocPath=kformdesigner/kformdesigner.html
GenericName=Form Designer
GenericName[bg]=Проектиране на форми
GenericName[br]=Ergrafer ar paperenn-reol
diff --git a/kexi/formeditor/test/kformdesigner_part.desktop b/kexi/formeditor/test/kformdesigner_part.desktop
index e572ff5c..749e9ecf 100644
--- a/kexi/formeditor/test/kformdesigner_part.desktop
+++ b/kexi/formeditor/test/kformdesigner_part.desktop
@@ -47,6 +47,6 @@ Name[uz@cyrillic]=Шакл дизайнери
Name[zh_CN]=表单设计器
Name[zh_TW]=表單設計師
MimeType=application/x-designer;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-Library=libkformdesigner_part
Type=Service
diff --git a/kexi/kexi.desktop b/kexi/kexi.desktop
index eaba222d..a61361bb 100644
--- a/kexi/kexi.desktop
+++ b/kexi/kexi.desktop
@@ -94,7 +94,7 @@ Comment[uk]=Розробка програм для баз даних
Comment[uz]=Maʼlumot bazasi asosida dasturlarni tuzish
Comment[uz@cyrillic]=Маълумот базаси асосида дастурларни тузиш
Comment[zh_TW]=開發桌面資料庫應用程式
-DocPath=kexi/index.html
+X-DocPath=kexi/index.html
X-TDE-NativeMimeType=application/x-kexiproject-sqlite
X-TDE-NOTKoDocumentEmbeddable=true
Categories=Qt;TDE;Office;
diff --git a/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop b/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
index 70984d29..45168a4f 100644
--- a/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
+++ b/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop
@@ -3,9 +3,9 @@ Name=MySQL
Name[ne]=मेरो एसक्यूएल
Name[sk]=mySQL
X-TDE-Library=kexidb_mysqldriver
-ServiceTypes=Kexi/DBDriver
+X-TDE-ServiceTypes=Kexi/DBDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-DriverName=MySQL
X-Kexi-DriverType=Network
X-Kexi-KexiDBVersion=1.8
diff --git a/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop b/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
index 717b9540..a3cd6b52 100644
--- a/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
+++ b/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop
@@ -46,9 +46,9 @@ Comment[uk]=Драйвер з'єднання Kexi Open Database
Comment[zh_CN]=Kexi 开放数据库连接驱动
Comment[zh_TW]=Kexi 開放資料庫連線驅動程式
X-TDE-Library=kexidb_odbcdriver
-ServiceTypes=Kexi/DBDriver
+X-TDE-ServiceTypes=Kexi/DBDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
MimeType=text/plain
X-Kexi-DriverType=Network
X-Kexi-DriverName=ODBC
diff --git a/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop b/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
index eb4292cb..f9a1774f 100644
--- a/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
+++ b/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
@@ -3,9 +3,9 @@ Name=PostgreSQL
Name[hi]=पोस्टग्रे-एसक्यूएल
Name[ne]=पोस्ट ग्रे एसक्यूएल
X-TDE-Library=kexidb_pqxxsqldriver
-ServiceTypes=Kexi/DBDriver
+X-TDE-ServiceTypes=Kexi/DBDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-DriverName=PostgreSQL
X-Kexi-DriverType=Network
X-Kexi-KexiDBVersion=1.8
diff --git a/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop b/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
index d6f23e98..6704e58c 100644
--- a/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
+++ b/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop
@@ -47,9 +47,9 @@ Comment[uk]=SQLite - це типовий рушій SQL вбудований в
Comment[zh_CN]=SQLite 是嵌入 Kexi 的默认 SQL 引擎
Comment[zh_TW]=SQLite 是 Kexi 預設內建的 SQL 引擎
X-TDE-Library=kexidb_sqlite3driver
-ServiceTypes=Kexi/DBDriver
+X-TDE-ServiceTypes=Kexi/DBDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-DriverName=SQLite3
X-Kexi-DriverType=File
X-Kexi-FileDBDriverMimeList=application/x-sqlite3,application/x-kexiproject-sqlite3,application/x-hk_classes-sqlite3
diff --git a/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop b/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
index 1691d3ed..6044ead1 100644
--- a/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
+++ b/kexi/kexidb/drivers/sqlite2/kexidb_sqlite2driver.desktop
@@ -47,9 +47,9 @@ Comment[uk]=SQLite - це типовий рушій SQL вбудований в
Comment[zh_CN]=SQLite 是嵌入 Kexi 的默认 SQL 引擎
Comment[zh_TW]=SQLite 是 Kexi 預設內建的 SQL 引擎
X-TDE-Library=kexidb_sqlite2driver
-ServiceTypes=Kexi/DBDriver
+X-TDE-ServiceTypes=Kexi/DBDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-DriverName=SQLite2
X-Kexi-DriverType=File
X-Kexi-FileDBDriverMimeList=application/x-sqlite2,application/x-kexiproject-sqlite2,application/x-kexiproject-sqlite,application/x-hk_classes-sqlite2
diff --git a/kexi/migration/mysql/keximigrate_mysql.desktop b/kexi/migration/mysql/keximigrate_mysql.desktop
index ef0ec6e8..1b23e2cf 100644
--- a/kexi/migration/mysql/keximigrate_mysql.desktop
+++ b/kexi/migration/mysql/keximigrate_mysql.desktop
@@ -46,9 +46,9 @@ Comment[uz@cyrillic]=Kexi учун MySQL миграция драйвери
Comment[zh_CN]=Kexi MySQL 升迁驱动程序
Comment[zh_TW]=Kexi 的 MySQL 轉移驅動程式
X-TDE-Library=keximigrate_mysql
-ServiceTypes=Kexi/MigrationDriver
+X-TDE-ServiceTypes=Kexi/MigrationDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-MigrationDriverName=MySQL
X-Kexi-MigrationDriverType=Network
X-Kexi-KexiMigrationVersion=1.1
diff --git a/kexi/migration/pqxx/keximigrate_pqxx.desktop b/kexi/migration/pqxx/keximigrate_pqxx.desktop
index 9da00214..93c38c7c 100644
--- a/kexi/migration/pqxx/keximigrate_pqxx.desktop
+++ b/kexi/migration/pqxx/keximigrate_pqxx.desktop
@@ -45,9 +45,9 @@ Comment[uz@cyrillic]=Kexi учун PostgreSQL миграция драйвери
Comment[zh_CN]=Kexi PostgreSQL 升迁驱动程序
Comment[zh_TW]=Kexi 的 PostgreSQL 轉移驅動程式
X-TDE-Library=keximigrate_pqxx
-ServiceTypes=Kexi/MigrationDriver
+X-TDE-ServiceTypes=Kexi/MigrationDriver
Type=Service
-InitialPreference=8
+X-TDE-InitialPreference=8
X-Kexi-MigrationDriverName=PostgreSQL
X-Kexi-MigrationDriverType=Network
X-Kexi-KexiMigrationVersion=1.1
diff --git a/kexi/plugins/forms/kexiformhandler.desktop b/kexi/plugins/forms/kexiformhandler.desktop
index 7f60695d..03a15c91 100644
--- a/kexi/plugins/forms/kexiformhandler.desktop
+++ b/kexi/plugins/forms/kexiformhandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Forms
GenericName[bg]=Формуляри
diff --git a/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop b/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
index f7534930..7bf73cdc 100644
--- a/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
+++ b/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KFormDesigner/WidgetFactory
+X-TDE-ServiceTypes=KFormDesigner/WidgetFactory
Name=Kexi DB Widgets
Name[bg]=Графични обекти на Kexi за бази данни
diff --git a/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop b/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
index 16777d1c..d98aa616 100644
--- a/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
+++ b/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
Name=Kexi CSV Data Import/Export Plugin
Name[bg]=Приставка за импортиране/експортиране от CSV в Kexi
diff --git a/kexi/plugins/macros/kexipart/keximacrohandler.desktop b/kexi/plugins/macros/kexipart/keximacrohandler.desktop
index 19af4e77..4d951d5b 100644
--- a/kexi/plugins/macros/kexipart/keximacrohandler.desktop
+++ b/kexi/plugins/macros/kexipart/keximacrohandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Macros
GenericName[bg]=Макроси
diff --git a/kexi/plugins/migration/keximigrationhandler.desktop b/kexi/plugins/migration/keximigrationhandler.desktop
index b2d0d479..d46884d6 100644
--- a/kexi/plugins/migration/keximigrationhandler.desktop
+++ b/kexi/plugins/migration/keximigrationhandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Migration Plugin
GenericName[bg]=Приставка за мигриране
diff --git a/kexi/plugins/queries/kexiqueryhandler.desktop b/kexi/plugins/queries/kexiqueryhandler.desktop
index 8e003e8d..1d95c4f4 100644
--- a/kexi/plugins/queries/kexiqueryhandler.desktop
+++ b/kexi/plugins/queries/kexiqueryhandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Queries
GenericName[bg]=Заявки
diff --git a/kexi/plugins/relations/kexirelationhandler.desktop b/kexi/plugins/relations/kexirelationhandler.desktop
index 22894410..9aece7fc 100644
--- a/kexi/plugins/relations/kexirelationhandler.desktop
+++ b/kexi/plugins/relations/kexirelationhandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Relationships
GenericName[bg]=Релации
diff --git a/kexi/plugins/reports/kexireporthandler.desktop b/kexi/plugins/reports/kexireporthandler.desktop
index f94a8dda..fe2fad33 100644
--- a/kexi/plugins/reports/kexireporthandler.desktop
+++ b/kexi/plugins/reports/kexireporthandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Reports
GenericName[bg]=Отчети
diff --git a/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop b/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
index 63de4638..db103452 100644
--- a/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
+++ b/kexi/plugins/reports/kformdesigner_kexireportfactory.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KFormDesigner/WidgetFactory
+X-TDE-ServiceTypes=KFormDesigner/WidgetFactory
Name=Kexi Report Widgets
Name[bg]=Графични елементи за отчети на Kexi
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop b/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
index 8eef01af..4968e0b3 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Scripts
GenericName[bg]=Скриптове
diff --git a/kexi/plugins/tables/kexitablehandler.desktop b/kexi/plugins/tables/kexitablehandler.desktop
index 79fdf47a..cf52f9fd 100644
--- a/kexi/plugins/tables/kexitablehandler.desktop
+++ b/kexi/plugins/tables/kexitablehandler.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kexi/Handler
+X-TDE-ServiceTypes=Kexi/Handler
GenericName=Tables
GenericName[bg]=Таблици
diff --git a/kformula/kformula.desktop b/kformula/kformula.desktop
index 3742883e..2a074ad3 100644
--- a/kformula/kformula.desktop
+++ b/kformula/kformula.desktop
@@ -78,5 +78,5 @@ Type=Application
Icon=kformula
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.formula
X-DCOP-ServiceType=Multi
-DocPath=kformula/index.html
+X-DocPath=kformula/index.html
Categories=Qt;TDE;Office;
diff --git a/kformula/kformulapart.desktop b/kformula/kformulapart.desktop
index 74d9ba06..6293f04f 100644
--- a/kformula/kformulapart.desktop
+++ b/kformula/kformulapart.desktop
@@ -50,7 +50,7 @@ Name[zh_TW]=KOffice Formula 元件
X-TDE-Library=libkformulapart
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/x-kformula;application/mathml+xml
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.formula
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.formula
X-TDE-ExtraNativeMimeTypes=application/x-kformula,application/vnd.oasis.opendocument.formula-template,application/mathml+xml
diff --git a/kivio/kiviopart/kivio.desktop b/kivio/kiviopart/kivio.desktop
index 20759017..a34a983e 100644
--- a/kivio/kiviopart/kivio.desktop
+++ b/kivio/kiviopart/kivio.desktop
@@ -61,6 +61,6 @@ MimeType=application/x-kivio
Type=Application
Icon=kivio
X-TDE-NativeMimeType=application/x-kivio
-DocPath=kivio/index.html
+X-DocPath=kivio/index.html
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Graphics;
diff --git a/kivio/kiviopart/kiviopart.desktop b/kivio/kiviopart/kiviopart.desktop
index a5da2d93..6784512b 100644
--- a/kivio/kiviopart/kiviopart.desktop
+++ b/kivio/kiviopart/kiviopart.desktop
@@ -48,7 +48,7 @@ Name[zh_TW]=KOffice 流程圖 & 圖表編輯元件
X-TDE-Library=libkiviopart
MimeType=application/x-kivio
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/x-kivio
Categories=Qt;TDE;Office;
GenericName=Flowchart & Diagram
diff --git a/koshell/koshell.desktop b/koshell/koshell.desktop
index b07e5cc5..781ec455 100644
--- a/koshell/koshell.desktop
+++ b/koshell/koshell.desktop
@@ -65,7 +65,7 @@ Name[xh]=Isithuba somsebenzi se KOffice
Name[zh_CN]=KOffice 工作空间
Name[zh_TW]=KOffice 工作空間
Name[zu]=Isikhala somsebenzi se KOffice
-DocPath=koshell/index.html
+X-DocPath=koshell/index.html
Exec=koshell
GenericName=Office Suite
GenericName[af]=Kantoor Paket
diff --git a/kounavail/kounavail.desktop b/kounavail/kounavail.desktop
index 85905feb..21068eb5 100644
--- a/kounavail/kounavail.desktop
+++ b/kounavail/kounavail.desktop
@@ -59,4 +59,4 @@ Name[zh_CN]=不可用的 KOffice 文档
Name[zh_TW]=無法取得的 KOffice 文件
X-TDE-Library=libkounavailpart
Type=Service
-ServiceTypes=KOfficePart
+X-TDE-ServiceTypes=KOfficePart
diff --git a/kplato/kplato.desktop b/kplato/kplato.desktop
index 6163103d..f55731bc 100644
--- a/kplato/kplato.desktop
+++ b/kplato/kplato.desktop
@@ -59,6 +59,6 @@ MimeType=application/x-vnd.kde.kplato
Type=Application
Icon=kplato
X-TDE-NativeMimeType=application/x-vnd.kde.kplato
-DocPath=kplato/index.html
+X-DocPath=kplato/index.html
Categories=Qt;TDE;Office;
X-TDE-StartupNotify=true
diff --git a/kplato/kplatopart.desktop b/kplato/kplatopart.desktop
index 357494eb..20a23e0e 100644
--- a/kplato/kplatopart.desktop
+++ b/kplato/kplatopart.desktop
@@ -51,7 +51,7 @@ Name[zh_TW]=KOffice 專案管理元件
X-TDE-Library=libkplatopart
MimeType=application/x-vnd.kde.kplato
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/x-vnd.kde.kplato
GenericName=Project Management
GenericName[bg]=Управление на проекти
diff --git a/kpresenter/kpresenter.desktop b/kpresenter/kpresenter.desktop
index c2111247..25e99c09 100644
--- a/kpresenter/kpresenter.desktop
+++ b/kpresenter/kpresenter.desktop
@@ -80,6 +80,6 @@ Icon=kpresenter
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
#X-TDE-NativeMimeType=application/x-kpresenter
X-DCOP-ServiceType=multi
-DocPath=kpresenter/index.html
+X-DocPath=kpresenter/index.html
X-TDE-StartupNotify=true
Categories=Qt;TDE;Office;
diff --git a/kpresenter/kpresenterpart.desktop b/kpresenter/kpresenterpart.desktop
index ed84b1d6..43089506 100644
--- a/kpresenter/kpresenterpart.desktop
+++ b/kpresenter/kpresenterpart.desktop
@@ -16,7 +16,7 @@ Name[zu]=Umbonikeleli we K
X-TDE-Library=libkpresenterpart
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/x-kpresenter;application/mspowerpoint
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.presentation
X-TDE-ExtraNativeMimeTypes=application/x-kpresenter,application/vnd.oasis.opendocument.presentation-template
diff --git a/kspread/kspread.desktop b/kspread/kspread.desktop
index dc1ab456..1aa397cb 100644
--- a/kspread/kspread.desktop
+++ b/kspread/kspread.desktop
@@ -75,6 +75,6 @@ Type=Application
Icon=kspread
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
X-DCOP-ServiceType=multi
-DocPath=kspread/index.html
+X-DocPath=kspread/index.html
X-TDE-StartupNotify=true
Categories=Qt;TDE;Office;
diff --git a/kspread/kspreadpart.desktop b/kspread/kspreadpart.desktop
index 530e15cd..d5c9824e 100644
--- a/kspread/kspreadpart.desktop
+++ b/kspread/kspreadpart.desktop
@@ -50,7 +50,7 @@ Name[zh_TW]=KOffice 工作表元件
X-TDE-Library=libkspreadpart
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro
Type=Service
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.spreadsheet
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.spreadsheet-template,application/x-kspread
diff --git a/kugar/kudesigner/kudesigner.desktop b/kugar/kudesigner/kudesigner.desktop
index 5affbe2a..0409310c 100644
--- a/kugar/kudesigner/kudesigner.desktop
+++ b/kugar/kudesigner/kudesigner.desktop
@@ -2,7 +2,7 @@
Type=Application
Exec=kudesigner %u
Icon=kudesigner
-DocPath=kugar/index.html
+X-DocPath=kugar/index.html
Terminal=false
Name=Kugar Designer
Name[af]=Kugar Ontwerper
@@ -153,6 +153,6 @@ Comment[zh_TW]=簡報設計家
MimeType=application/x-kudesigner
X-TDE-NativeMimeType=application/x-kudesigner
X-TDE-Library=libkudesignerpart
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
Categories=Qt;TDE;Office;
diff --git a/kugar/part/kugar.desktop b/kugar/part/kugar.desktop
index b115a09c..b682837e 100644
--- a/kugar/part/kugar.desktop
+++ b/kugar/part/kugar.desktop
@@ -8,7 +8,7 @@ Exec=kugar %u
Icon=kugar
MimeType=application/x-kugar;application/x-vnd.kde.kugar.mixed
Type=Application
-DocPath=kugar/index.html
+X-DocPath=kugar/index.html
GenericName=Report Generator
GenericName[af]=Raporteer Genereerder
GenericName[ar]=مُوَلِّد التَّقارير
diff --git a/kugar/part/kugarpart.desktop b/kugar/part/kugarpart.desktop
index 1ad592fa..61ffadb7 100644
--- a/kugar/part/kugarpart.desktop
+++ b/kugar/part/kugarpart.desktop
@@ -49,7 +49,7 @@ Name[zh_TW]=KOffice 報告產生元件
MimeType=application/x-kugar;application/x-vnd.kde.kugar.mixed
Type=Service
Terminal=false
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
X-TDE-Library=libkugarpart
X-TDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
GenericName=Report Generator
diff --git a/kword/kword.desktop b/kword/kword.desktop
index ab37b818..37680f46 100644
--- a/kword/kword.desktop
+++ b/kword/kword.desktop
@@ -74,8 +74,8 @@ MimeType=application/vnd.oasis.opendocument.text;application/x-kword;application
Icon=kword
X-TDE-NativeMimeType=application/vnd.oasis.opendocument.text
#X-TDE-NativeMimeType=application/x-kword
-DocPath=kword/index.html
+X-DocPath=kword/index.html
X-TDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Qt;TDE;Office;
-InitialPreference=3
+X-TDE-InitialPreference=3
diff --git a/kword/kwordpart.desktop b/kword/kwordpart.desktop
index 9ba69367..c883bc66 100644
--- a/kword/kwordpart.desktop
+++ b/kword/kwordpart.desktop
@@ -52,7 +52,7 @@ X-TDE-NativeMimeType=application/vnd.oasis.opendocument.text
X-TDE-NativeOasisMimeType=application/vnd.oasis.opendocument.text
X-TDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.text-template,application/x-kword
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/x-kword;application/msword;text/rtf;text/plain;application/x-mswrite
-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
GenericName=Text Documents
GenericName[ar]=مُستندات نصيّة
GenericName[bg]=Текстови документи
@@ -99,4 +99,4 @@ GenericName[uz@cyrillic]=Матн ҳужжатлари
GenericName[zh_CN]=文本文档
GenericName[zh_TW]=文字文件
Icon=kword
-InitialPreference=3
+X-TDE-InitialPreference=3
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.desktop b/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
index 536ca79c..cebc6df0 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KWord/MailMergePlugin
+X-TDE-ServiceTypes=KWord/MailMergePlugin
Name=KSpread Table Source
Name[bg]=Източник на данни от KSpread
diff --git a/kword/mailmerge/kwserialletter_classic.desktop b/kword/mailmerge/kwserialletter_classic.desktop
index cacf6bd8..38d09d4d 100644
--- a/kword/mailmerge/kwserialletter_classic.desktop
+++ b/kword/mailmerge/kwserialletter_classic.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KWord/MailMergePlugin
+X-TDE-ServiceTypes=KWord/MailMergePlugin
Name=Internal Storage
Name[af]=Intern Stoorplek
diff --git a/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop b/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
index 6d107ade..6a40ae3e 100644
--- a/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
+++ b/kword/mailmerge/sql/kwserialletter_qtsqldb.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KWord/MailMergePlugin
+X-TDE-ServiceTypes=KWord/MailMergePlugin
Name=Qt-SQL Source (single table)
Name[bg]=Източник Qt-SQL (една таблица)
diff --git a/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop b/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
index 74c6bd7c..c3dbf4e2 100644
--- a/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
+++ b/kword/mailmerge/sql/kwserialletter_qtsqldb_power.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KWord/MailMergePlugin
+X-TDE-ServiceTypes=KWord/MailMergePlugin
Name=Qt-SQL Source (power user)
Name[bg]=Източник Qt-SQL (за напреднали)
diff --git a/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop
index 924d6516..6f3765a5 100644
--- a/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop
+++ b/kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=KWord/MailMergePlugin
+X-TDE-ServiceTypes=KWord/MailMergePlugin
Name=TDE Addressbook Plugin
Name[bg]=Приставка за адресника на TDE
diff --git a/lib/kofficecore/kodocinfopropspage.desktop b/lib/kofficecore/kodocinfopropspage.desktop
index 8ca84a12..fc5df3e3 100644
--- a/lib/kofficecore/kodocinfopropspage.desktop
+++ b/lib/kofficecore/kodocinfopropspage.desktop
@@ -65,4 +65,4 @@ Name[zh_CN]=KOffice 文档基本信息和属性
Name[zh_TW]=KOffice 文件資訊和屬性
Name[zu]=KOffice iphepha ledokhumenti Iphepha Eliqukethe Ulwazi
X-TDE-Library=kodocinfopropspage
-ServiceTypes=KPropsDlg/Plugin,application/x-kspread,application/x-kword,application/x-kpresenter,application/x-kchart
+X-TDE-ServiceTypes=KPropsDlg/Plugin,application/x-kspread,application/x-kword,application/x-kpresenter,application/x-kchart
diff --git a/tools/kthesaurus/KThesaurus.desktop b/tools/kthesaurus/KThesaurus.desktop
index d612041c..7c0746e9 100644
--- a/tools/kthesaurus/KThesaurus.desktop
+++ b/tools/kthesaurus/KThesaurus.desktop
@@ -76,4 +76,4 @@ GenericName[zh_CN]=相关单词
GenericName[zh_TW]=相關單字
X-TDE-StartupNotify=true
Categories=Qt;TDE;Office;
-DocPath=thesaurus/index.html
+X-DocPath=thesaurus/index.html
diff --git a/tools/quickprint/chalk_konqi.desktop b/tools/quickprint/chalk_konqi.desktop
index 720103bd..6ae72f1b 100644
--- a/tools/quickprint/chalk_konqi.desktop
+++ b/tools/quickprint/chalk_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-chalk
+X-TDE-ServiceTypes=application/x-chalk
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/karbon_konqi.desktop b/tools/quickprint/karbon_konqi.desktop
index 43864ffd..e73d3273 100644
--- a/tools/quickprint/karbon_konqi.desktop
+++ b/tools/quickprint/karbon_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-karbon
+X-TDE-ServiceTypes=application/x-karbon
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kchart_konqi.desktop b/tools/quickprint/kchart_konqi.desktop
index c4b60c85..f77d0c72 100644
--- a/tools/quickprint/kchart_konqi.desktop
+++ b/tools/quickprint/kchart_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kchart
+X-TDE-ServiceTypes=application/x-kchart
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kexi_konqi.desktop b/tools/quickprint/kexi_konqi.desktop
index 8fd75dc0..34f0b73f 100644
--- a/tools/quickprint/kexi_konqi.desktop
+++ b/tools/quickprint/kexi_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kexi
+X-TDE-ServiceTypes=application/x-kexi
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kformula_konqi.desktop b/tools/quickprint/kformula_konqi.desktop
index e7c6266b..8869826c 100644
--- a/tools/quickprint/kformula_konqi.desktop
+++ b/tools/quickprint/kformula_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kformula
+X-TDE-ServiceTypes=application/x-kformula
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kivio_konqi.desktop b/tools/quickprint/kivio_konqi.desktop
index 26fa5c13..0a933680 100644
--- a/tools/quickprint/kivio_konqi.desktop
+++ b/tools/quickprint/kivio_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kivio
+X-TDE-ServiceTypes=application/x-kivio
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kpresenter_konqi.desktop b/tools/quickprint/kpresenter_konqi.desktop
index 41815308..cd6054de 100644
--- a/tools/quickprint/kpresenter_konqi.desktop
+++ b/tools/quickprint/kpresenter_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kpresenter
+X-TDE-ServiceTypes=application/x-kpresenter
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kspread_konqi.desktop b/tools/quickprint/kspread_konqi.desktop
index 302118ee..115f76a8 100644
--- a/tools/quickprint/kspread_konqi.desktop
+++ b/tools/quickprint/kspread_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kspread
+X-TDE-ServiceTypes=application/x-kspread
Actions=Print;
[Desktop Action Print]
diff --git a/tools/quickprint/kword_konqi.desktop b/tools/quickprint/kword_konqi.desktop
index a4fcb203..9cd50dfb 100644
--- a/tools/quickprint/kword_konqi.desktop
+++ b/tools/quickprint/kword_konqi.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-ServiceTypes=application/x-kword
+X-TDE-ServiceTypes=application/x-kword
Actions=Print;
[Desktop Action Print]
diff --git a/tools/spell/tdespelltool.desktop b/tools/spell/tdespelltool.desktop
index 8770c87a..e4f648fc 100644
--- a/tools/spell/tdespelltool.desktop
+++ b/tools/spell/tdespelltool.desktop
@@ -128,7 +128,7 @@ Comment[wa]=Coridjî l' ortografeye di ç' mot ci...
Comment[xh]=Khangela olu Pelo Magama
Comment[zh_CN]=检查该词拼写
Comment[zh_TW]=拼字檢查
-ServiceTypes=KDataTool
+X-TDE-ServiceTypes=KDataTool
Icon=spellcheck
# This tool should only appear for single words.
DataType=TQString
diff --git a/tools/tdefile-plugins/abiword/tdefile_abiword.desktop b/tools/tdefile-plugins/abiword/tdefile_abiword.desktop
index eb22207d..1211ce93 100644
--- a/tools/tdefile-plugins/abiword/tdefile_abiword.desktop
+++ b/tools/tdefile-plugins/abiword/tdefile_abiword.desktop
@@ -42,7 +42,7 @@ Name[uz]=Abiword hujjati haqida maʼlumot
Name[uz@cyrillic]=Abiword ҳужжати ҳақида маълумот
Name[zh_CN]=Abiword 信息
Name[zh_TW]=Abiword 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_abiword
MimeType=application/x-abiword
PreferredGroups=DocumentInfo
diff --git a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop
index d4e83866..4ccd4968 100644
--- a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop
+++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop
@@ -42,7 +42,7 @@ Name[uz]=Gnumeric hujjati haqida maʼlumot
Name[uz@cyrillic]=Gnumeric ҳужжати ҳақида маълумот
Name[zh_CN]=Gnumeric 信息
Name[zh_TW]=Gnumeric 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_gnumeric
MimeType=application/x-gnumeric
PreferredGroups=DocumentInfo
diff --git a/tools/tdefile-plugins/koffice/tdefile_koffice.desktop b/tools/tdefile-plugins/koffice/tdefile_koffice.desktop
index 02a0502d..3db9ffd1 100644
--- a/tools/tdefile-plugins/koffice/tdefile_koffice.desktop
+++ b/tools/tdefile-plugins/koffice/tdefile_koffice.desktop
@@ -59,7 +59,7 @@ Name[wa]=Informåcion KOffice
Name[xh]=Ulwazi lwe KOffice
Name[zh_CN]=KOffice 信息
Name[zh_TW]=KOffice 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_koffice
MimeType=application/x-kword;application/x-kpresenter;application/x-kspread;application/x-karbon
PreferredGroups=DocumentInfo
diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.desktop b/tools/tdefile-plugins/ooo/tdefile_ooo.desktop
index 94866b74..6c050d4a 100644
--- a/tools/tdefile-plugins/ooo/tdefile_ooo.desktop
+++ b/tools/tdefile-plugins/ooo/tdefile_ooo.desktop
@@ -50,7 +50,7 @@ Name[uz@cyrillic]=OpenOffice.org маълумот
Name[wa]=Informåcion OpenOffice.org
Name[zh_CN]=OpenOffice.org 信息
Name[zh_TW]=OpenOffice.org 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_ooo
MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.math;application/vnd.sun.xml.writer.template;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.oasis.opendocument.image;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template
PreferredGroups=DocumentInfo
diff --git a/tools/thesaurus/thesaurustool.desktop b/tools/thesaurus/thesaurustool.desktop
index 8c6ff95a..fe9b8842 100644
--- a/tools/thesaurus/thesaurustool.desktop
+++ b/tools/thesaurus/thesaurustool.desktop
@@ -121,6 +121,6 @@ Comment[wa]=Mostrer les mots k' ont-st a vey avou
Comment[xh]=Bonisa Amagama Ahlobeneyo
Comment[zh_CN]=显示相关单词
Comment[zh_TW]=顯示相關單字
-ServiceTypes=KDataTool
+X-TDE-ServiceTypes=KDataTool
DataType=TQString
DataMimeTypes=text/plain
diff --git a/tools/thumbnail/clipartthumbnail.desktop b/tools/thumbnail/clipartthumbnail.desktop
index 6f88b869..0820b34f 100644
--- a/tools/thumbnail/clipartthumbnail.desktop
+++ b/tools/thumbnail/clipartthumbnail.desktop
@@ -39,7 +39,7 @@ Name[uz]=Klipart
Name[uz@cyrillic]=Клипарт
Name[zh_CN]=剪贴画
Name[zh_TW]=剪貼板
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
MimeTypes=image/wmf
X-TDE-Library=clipartthumbnail
CacheThumbnail=true
diff --git a/tools/thumbnail/kofficethumbnail.desktop b/tools/thumbnail/kofficethumbnail.desktop
index 5721735a..4248b7a9 100644
--- a/tools/thumbnail/kofficethumbnail.desktop
+++ b/tools/thumbnail/kofficethumbnail.desktop
@@ -64,7 +64,7 @@ Name[wa]=Fitchîs KOffice
Name[xh]=Iifayile ze KOffice
Name[zh_CN]=KOffice 文件
Name[zh_TW]=KOffice 檔案
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
MimeTypes=application/x-kword,application/x-kspread,application/x-kpresenter,application/x-karbon,application/x-chalk,application/x-kchart,application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.chart,application/vnd.oasis.opendocument.chart-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.formula-template
X-TDE-Library=kofficethumbnail
CacheThumbnail=true
diff --git a/tools/thumbnail/otherofficethumbnail.desktop b/tools/thumbnail/otherofficethumbnail.desktop
index d9a22824..47b59f72 100644
--- a/tools/thumbnail/otherofficethumbnail.desktop
+++ b/tools/thumbnail/otherofficethumbnail.desktop
@@ -63,7 +63,7 @@ Name[wa]=Ôtes fitchîs di buro
Name[xh]=Ezinye Iifayile ze Office
Name[zh_CN]=其它 Office 文件
Name[zh_TW]=其他 Office 檔案
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
MimeTypes=application/illustrator,application/msexcel,application/mspowerpoint,application/msword,application/vnd.palm,application/wordperfect,application/x-abiword,application/x-amipro,application/x-applixgraphics,application/x-applixspread,application/x-applixword,application/x-gnumeric,application/x-quattropro,image/x-msod,text/rtf,text/vnd.wap.wml
X-TDE-Library=kofficethumbnail
CacheThumbnail=true