From 5b1f358aad613d6b5de7e02efffefe5d6e7bc883 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 11 Oct 2014 17:19:16 -0500
Subject: Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file
 entries to match XDG specifications

---
 src/d3lphin.desktop                              | 2 +-
 src/dolphincontextmenu.cpp                       | 4 ++--
 src/infosidebarpage.cpp                          | 4 ++--
 src/servicemenus/amarok_addaspodcast.desktop     | 2 +-
 src/servicemenus/amarok_append.desktop           | 2 +-
 src/servicemenus/amarok_play_audiocd.desktop     | 2 +-
 src/servicemenus/ark_compress.desktop            | 2 +-
 src/servicemenus/ark_extract.desktop             | 2 +-
 src/servicemenus/ark_extract_subdir.desktop      | 2 +-
 src/servicemenus/compress.desktop                | 2 +-
 src/servicemenus/d3lphin_su.desktop              | 4 ++--
 src/servicemenus/edit_as_root.desktop            | 2 +-
 src/servicemenus/encryptfile.desktop             | 4 ++--
 src/servicemenus/encryptfolder.desktop           | 2 +-
 src/servicemenus/floppy_format.desktop           | 2 +-
 src/servicemenus/imageconverter.desktop          | 2 +-
 src/servicemenus/installfont.desktop             | 2 +-
 src/servicemenus/isoservice.desktop              | 2 +-
 src/servicemenus/jpegorient.desktop              | 2 +-
 src/servicemenus/k3b_audiocd_rip.desktop         | 2 +-
 src/servicemenus/k3b_cd_copy.desktop             | 2 +-
 src/servicemenus/k3b_create_audio_cd.desktop     | 2 +-
 src/servicemenus/k3b_create_video_cd.desktop     | 2 +-
 src/servicemenus/k3b_dvd_copy.desktop            | 2 +-
 src/servicemenus/k3b_handle_empty_cd.desktop     | 2 +-
 src/servicemenus/k3b_handle_empty_dvd.desktop    | 2 +-
 src/servicemenus/k3b_videodvd_rip.desktop        | 2 +-
 src/servicemenus/k3b_write_bin_image.desktop     | 2 +-
 src/servicemenus/k3b_write_iso_image.desktop     | 2 +-
 src/servicemenus/kdesktopSetAsBackground.desktop | 2 +-
 src/servicemenus/konqgwenview.desktop            | 2 +-
 src/servicemenus/konsolehere.desktop             | 2 +-
 src/servicemenus/mail_as_attachment.desktop      | 2 +-
 src/servicemenus/media_eject.desktop             | 2 +-
 src/servicemenus/media_mount.desktop             | 2 +-
 src/servicemenus/media_realfolder.desktop        | 2 +-
 src/servicemenus/media_safelyremove.desktop      | 2 +-
 src/servicemenus/media_unmount.desktop           | 2 +-
 src/servicemenus/open_in_digikam.desktop         | 2 +-
 src/servicemenus/run_as_root.desktop             | 2 +-
 src/servicemenus/smb2rdc.desktop                 | 2 +-
 src/servicemenus/text-ada-print.desktop          | 2 +-
 src/servicemenus/text-c++-print.desktop          | 2 +-
 src/servicemenus/text-c++h-print.desktop         | 2 +-
 src/servicemenus/text-ch-print.desktop           | 2 +-
 src/servicemenus/text-css-print.desktop          | 2 +-
 src/servicemenus/text-diff-print.desktop         | 2 +-
 src/servicemenus/text-html-print.desktop         | 2 +-
 src/servicemenus/text-java-print.desktop         | 2 +-
 src/servicemenus/text-log-print.desktop          | 2 +-
 src/servicemenus/text-makefile-print.desktop     | 2 +-
 src/servicemenus/text-pas-print.desktop          | 2 +-
 src/servicemenus/text-perl-print.desktop         | 2 +-
 src/servicemenus/text-print.desktop              | 2 +-
 src/servicemenus/text-python-print.desktop       | 2 +-
 src/servicemenus/text-tcl-print.desktop          | 2 +-
 src/servicemenus/text-tex-print.desktop          | 2 +-
 src/servicemenus/text-xml-print.desktop          | 2 +-
 src/servicemenus/text-xslt-print.desktop         | 2 +-
 59 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/d3lphin.desktop b/src/d3lphin.desktop
index 711e943..f25721b 100644
--- a/src/d3lphin.desktop
+++ b/src/d3lphin.desktop
@@ -12,7 +12,7 @@ Name[pa]=ਡਾਲਫਿਨ
 Exec=d3lphin %i -caption "%c" "%u"
 Icon=d3lphin
 Type=Application
-DocPath=d3lphin/index.html
+X-DocPath=d3lphin/index.html
 Categories=Qt;TDE;System;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير الملفات
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7864b9f..1b9dbbf 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -367,8 +367,8 @@ void DolphinContextMenu::insertActionItems(TDEPopupMenu* popup,
         for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
             KSimpleConfig cfg(*dirIt + *entryIt, true);
             cfg.setDesktopGroup();
-            if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
-                const TQStringList types = cfg.readListEntry("ServiceTypes");
+            if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("X-TDE-ServiceTypes")) {
+                const TQStringList types = cfg.readListEntry("X-TDE-ServiceTypes");
                 for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) {
                     // check whether the mime type is equal or whether the
                     // mimegroup (e. g. image/*) is supported
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index cf6f527..5e20c5d 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -443,8 +443,8 @@ void InfoSidebarPage::insertActions()
         for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
             KSimpleConfig cfg(*dirIt + *entryIt, true);
             cfg.setDesktopGroup();
-            if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
-                const TQStringList types = cfg.readListEntry("ServiceTypes");
+            if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("X-TDE-ServiceTypes")) {
+                const TQStringList types = cfg.readListEntry("X-TDE-ServiceTypes");
                 for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) {
                     // check whether the mime type is equal or whether the
                     // mimegroup (e. g. image/*) is supported
diff --git a/src/servicemenus/amarok_addaspodcast.desktop b/src/servicemenus/amarok_addaspodcast.desktop
index 7c61588..cf523e2 100644
--- a/src/servicemenus/amarok_addaspodcast.desktop
+++ b/src/servicemenus/amarok_addaspodcast.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/html,text/xml,application/xml,text/rss
+X-TDE-ServiceTypes=text/html,text/xml,application/xml,text/rss
 Actions=addAsPodcast
 [Desktop Action addAsPodcast]
 Name=Add as podcast to amaroK
diff --git a/src/servicemenus/amarok_append.desktop b/src/servicemenus/amarok_append.desktop
index 590fc6e..7530d5a 100644
--- a/src/servicemenus/amarok_append.desktop
+++ b/src/servicemenus/amarok_append.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/asx,audio/*
+X-TDE-ServiceTypes=application/asx,audio/*
 Actions=appendToPlaylist;appendAndPlay;queueTrack;
 X-TDE-Submenu=Amarok
 X-TDE-Submenu[bn]=আমারক
diff --git a/src/servicemenus/amarok_play_audiocd.desktop b/src/servicemenus/amarok_play_audiocd.desktop
index f59ef77..f838cdf 100644
--- a/src/servicemenus/amarok_play_audiocd.desktop
+++ b/src/servicemenus/amarok_play_audiocd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd
+X-TDE-ServiceTypes=media/audiocd
 Actions=Play;
 Encoding=UTF-8
 X-TDE-Priority=TopLevel
diff --git a/src/servicemenus/ark_compress.desktop b/src/servicemenus/ark_compress.desktop
index b2fcd67..9183dc1 100644
--- a/src/servicemenus/ark_compress.desktop
+++ b/src/servicemenus/ark_compress.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=CompressZip;CompressTarGz;CompressTarBz2
 X-TDE-Priority=TopLevel
 X-TDE-Submenu=Compress
diff --git a/src/servicemenus/ark_extract.desktop b/src/servicemenus/ark_extract.desktop
index 1c54fd6..17fd3f9 100644
--- a/src/servicemenus/ark_extract.desktop
+++ b/src/servicemenus/ark_extract.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 X-SuSE-translate=true
 Encoding=UTF-8
-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+X-TDE-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
 Actions=extractHere
 
 [Desktop Action extractHere]
diff --git a/src/servicemenus/ark_extract_subdir.desktop b/src/servicemenus/ark_extract_subdir.desktop
index 9d52df1..dba80b6 100644
--- a/src/servicemenus/ark_extract_subdir.desktop
+++ b/src/servicemenus/ark_extract_subdir.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 X-SuSE-translate=true
 Encoding=UTF-8
-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
+X-TDE-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak
 Actions=ExtractSubdir
 
 [Desktop Action ExtractSubdir]
diff --git a/src/servicemenus/compress.desktop b/src/servicemenus/compress.desktop
index 1d38617..ac76ade 100644
--- a/src/servicemenus/compress.desktop
+++ b/src/servicemenus/compress.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=all/allfiles
+X-TDE-ServiceTypes=all/allfiles
 Actions=CompressZip;CompressTarGz;CompressTarBz2
 X-TDE-Priority=TopLevel
 X-TDE-Submenu=Compress
diff --git a/src/servicemenus/d3lphin_su.desktop b/src/servicemenus/d3lphin_su.desktop
index f0e2e4c..aa1b3bc 100644
--- a/src/servicemenus/d3lphin_su.desktop
+++ b/src/servicemenus/d3lphin_su.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=D3lphinSU;
 
 [Desktop Action D3lphinSU]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Name=Open as Root
 Name[de]=Öffne als Root
 Name[ru]=Открыть под root
diff --git a/src/servicemenus/edit_as_root.desktop b/src/servicemenus/edit_as_root.desktop
index e3df170..f927ac1 100644
--- a/src/servicemenus/edit_as_root.desktop
+++ b/src/servicemenus/edit_as_root.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/*,application/x-desktop
+X-TDE-ServiceTypes=text/*,application/x-desktop
 Actions=Editassu
 
 [Desktop Action Editassu]
diff --git a/src/servicemenus/encryptfile.desktop b/src/servicemenus/encryptfile.desktop
index 797698e..8e3eb82 100644
--- a/src/servicemenus/encryptfile.desktop
+++ b/src/servicemenus/encryptfile.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-ServiceTypes=all/allfiles
-ExcludeServiceTypes=kdedevice/*
+X-TDE-ServiceTypes=all/allfiles
+X-TDE-ExcludeServiceTypes=kdedevice/*
 Actions=encrypt
 
 [Desktop Action encrypt]
diff --git a/src/servicemenus/encryptfolder.desktop b/src/servicemenus/encryptfolder.desktop
index b322b64..af4309d 100644
--- a/src/servicemenus/encryptfolder.desktop
+++ b/src/servicemenus/encryptfolder.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=encrypt
 
 [Desktop Action encrypt]
diff --git a/src/servicemenus/floppy_format.desktop b/src/servicemenus/floppy_format.desktop
index b64df47..c51a65c 100644
--- a/src/servicemenus/floppy_format.desktop
+++ b/src/servicemenus/floppy_format.desktop
@@ -31,6 +31,6 @@ Name[zh_CN]=格式化
 
 [Desktop Entry]
 Actions=Format;
-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted
+X-TDE-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/imageconverter.desktop b/src/servicemenus/imageconverter.desktop
index 39a8a55..e5c9b36 100644
--- a/src/servicemenus/imageconverter.desktop
+++ b/src/servicemenus/imageconverter.desktop
@@ -3,7 +3,7 @@
 # Released under the same license as the KDE core distribution (GPL 2.0).
 #
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Actions=convToJPEG;convToPNG;convToGIF;convToTIF;
 X-TDE-Submenu=Convert To
 X-TDE-Submenu[bg]=Конвертиране в
diff --git a/src/servicemenus/installfont.desktop b/src/servicemenus/installfont.desktop
index 3ca14fa..bac2509 100644
--- a/src/servicemenus/installfont.desktop
+++ b/src/servicemenus/installfont.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm
+X-TDE-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm
 Actions=installFont;
 
 X-SuSE-translate=true
diff --git a/src/servicemenus/isoservice.desktop b/src/servicemenus/isoservice.desktop
index 4b86111..5e539fe 100644
--- a/src/servicemenus/isoservice.desktop
+++ b/src/servicemenus/isoservice.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Actions=OpenISO
-ServiceTypes=inode/blockdevice,application/x-iso
+X-TDE-ServiceTypes=inode/blockdevice,application/x-iso
 
 [Desktop Action OpenISO]
 Comment=ISO9660 View
diff --git a/src/servicemenus/jpegorient.desktop b/src/servicemenus/jpegorient.desktop
index 98cd73b..6cd2efc 100644
--- a/src/servicemenus/jpegorient.desktop
+++ b/src/servicemenus/jpegorient.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/jpeg
+X-TDE-ServiceTypes=image/jpeg
 Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH;
 X-TDE-Submenu=Transform Image
 X-TDE-Submenu[bg]=Конвертиране на изображението
diff --git a/src/servicemenus/k3b_audiocd_rip.desktop b/src/servicemenus/k3b_audiocd_rip.desktop
index 4f839e2..b733817 100644
--- a/src/servicemenus/k3b_audiocd_rip.desktop
+++ b/src/servicemenus/k3b_audiocd_rip.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd,media/mixedcd
+X-TDE-ServiceTypes=media/audiocd,media/mixedcd
 Actions=K3bRip;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_cd_copy.desktop b/src/servicemenus/k3b_cd_copy.desktop
index 21f419f..421f2f7 100644
--- a/src/servicemenus/k3b_cd_copy.desktop
+++ b/src/servicemenus/k3b_cd_copy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd
+X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd
 Actions=K3bCDCopy;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_create_audio_cd.desktop b/src/servicemenus/k3b_create_audio_cd.desktop
index efc1a79..5c22ec9 100644
--- a/src/servicemenus/k3b_create_audio_cd.desktop
+++ b/src/servicemenus/k3b_create_audio_cd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=CreateK3bAudioProject;
 Encoding=UTF-8
-ServiceTypes=audio/x-mp3,audio/x-vorbis,application/x-ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav,media/blankcd
+X-TDE-ServiceTypes=audio/x-mp3,audio/x-vorbis,application/x-ogg,audio/x-mp2,audio/x-mpegurl,audio/x-wav,media/blankcd
 
 X-SuSE-translate=true
 X-SuSE-translate=true
diff --git a/src/servicemenus/k3b_create_video_cd.desktop b/src/servicemenus/k3b_create_video_cd.desktop
index 45cca6a..9e584e8 100644
--- a/src/servicemenus/k3b_create_video_cd.desktop
+++ b/src/servicemenus/k3b_create_video_cd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=CreateK3bVcdProject;
 Encoding=UTF-8
-ServiceTypes=video/mpeg
+X-TDE-ServiceTypes=video/mpeg
 
 X-SuSE-translate=true
 X-SuSE-translate=true
diff --git a/src/servicemenus/k3b_dvd_copy.desktop b/src/servicemenus/k3b_dvd_copy.desktop
index b03f4d2..bc925f6 100644
--- a/src/servicemenus/k3b_dvd_copy.desktop
+++ b/src/servicemenus/k3b_dvd_copy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/dvdrom_unmounted,media/dvdwriter_unmounted,media/dvdvideo
+X-TDE-ServiceTypes=media/dvdrom_unmounted,media/dvdwriter_unmounted,media/dvdvideo
 Actions=K3bDVDCopy;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_handle_empty_cd.desktop b/src/servicemenus/k3b_handle_empty_cd.desktop
index 2dd2d4d..a3dd0ee 100644
--- a/src/servicemenus/k3b_handle_empty_cd.desktop
+++ b/src/servicemenus/k3b_handle_empty_cd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/blankcd
+X-TDE-ServiceTypes=media/blankcd
 Actions=K3bDataProject;K3bAudioCDProject;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_handle_empty_dvd.desktop b/src/servicemenus/k3b_handle_empty_dvd.desktop
index 2fc331b..b1bc2aa 100644
--- a/src/servicemenus/k3b_handle_empty_dvd.desktop
+++ b/src/servicemenus/k3b_handle_empty_dvd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/blankdvd
+X-TDE-ServiceTypes=media/blankdvd
 Actions=K3bDataProject;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_videodvd_rip.desktop b/src/servicemenus/k3b_videodvd_rip.desktop
index 141d6f2..9172bd6 100644
--- a/src/servicemenus/k3b_videodvd_rip.desktop
+++ b/src/servicemenus/k3b_videodvd_rip.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/dvdvideo
+X-TDE-ServiceTypes=media/dvdvideo
 Actions=K3bRip;
 X-TDE-Priority=TopLevel
 
diff --git a/src/servicemenus/k3b_write_bin_image.desktop b/src/servicemenus/k3b_write_bin_image.desktop
index aaf7967..fca511e 100644
--- a/src/servicemenus/k3b_write_bin_image.desktop
+++ b/src/servicemenus/k3b_write_bin_image.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=WriteCdImage;
 Encoding=UTF-8
-ServiceTypes=application/x-cue
+X-TDE-ServiceTypes=application/x-cue
 
 X-SuSE-translate=true
 X-SuSE-translate=true
diff --git a/src/servicemenus/k3b_write_iso_image.desktop b/src/servicemenus/k3b_write_iso_image.desktop
index 8808f80..7be3f5a 100644
--- a/src/servicemenus/k3b_write_iso_image.desktop
+++ b/src/servicemenus/k3b_write_iso_image.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Actions=WriteCdImage;
 Encoding=UTF-8
-ServiceTypes=application/x-iso,inode/ISO-image
+X-TDE-ServiceTypes=application/x-iso,inode/ISO-image
 
 X-SuSE-translate=true
 X-SuSE-translate=true
diff --git a/src/servicemenus/kdesktopSetAsBackground.desktop b/src/servicemenus/kdesktopSetAsBackground.desktop
index 842b4f8..66409fc 100644
--- a/src/servicemenus/kdesktopSetAsBackground.desktop
+++ b/src/servicemenus/kdesktopSetAsBackground.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Actions=setAsBackground;tileAsBackground;
 X-TDE-Submenu=Set as Background
 X-TDE-Submenu[af]=Stel as agtergrond
diff --git a/src/servicemenus/konqgwenview.desktop b/src/servicemenus/konqgwenview.desktop
index 1354948..410e669 100644
--- a/src/servicemenus/konqgwenview.desktop
+++ b/src/servicemenus/konqgwenview.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=gwenview;
 
 [Desktop Action gwenview]
diff --git a/src/servicemenus/konsolehere.desktop b/src/servicemenus/konsolehere.desktop
index 327f0d7..db7c5f6 100644
--- a/src/servicemenus/konsolehere.desktop
+++ b/src/servicemenus/konsolehere.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=openTerminalHere;
 X-TDE-AuthorizeAction=shell_access
 Encoding=UTF-8
diff --git a/src/servicemenus/mail_as_attachment.desktop b/src/servicemenus/mail_as_attachment.desktop
index f8a7c23..cd95262 100644
--- a/src/servicemenus/mail_as_attachment.desktop
+++ b/src/servicemenus/mail_as_attachment.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=all/allfiles
+X-TDE-ServiceTypes=all/allfiles
 Actions=mail_as_attachment
 
 [Desktop Action mail_as_attachment]
diff --git a/src/servicemenus/media_eject.desktop b/src/servicemenus/media_eject.desktop
index c04fdef..db702a6 100644
--- a/src/servicemenus/media_eject.desktop
+++ b/src/servicemenus/media_eject.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/media_mount.desktop b/src/servicemenus/media_mount.desktop
index e98ba4b..aa8e31d 100644
--- a/src/servicemenus/media_mount.desktop
+++ b/src/servicemenus/media_mount.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
 Actions=MediaMount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/media_realfolder.desktop b/src/servicemenus/media_realfolder.desktop
index cdd2174..b16d4b0 100644
--- a/src/servicemenus/media_realfolder.desktop
+++ b/src/servicemenus/media_realfolder.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/removable_mounted,media/zip_mounted
 Actions=MediaRealFolder
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/media_safelyremove.desktop b/src/servicemenus/media_safelyremove.desktop
index a863c3a..736c12e 100644
--- a/src/servicemenus/media_safelyremove.desktop
+++ b/src/servicemenus/media_safelyremove.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/camera_mounted,media/camera_unmounted
 Actions=MediaSafelyRemove;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/media_unmount.desktop b/src/servicemenus/media_unmount.desktop
index d3e65f7..3d3c96e 100644
--- a/src/servicemenus/media_unmount.desktop
+++ b/src/servicemenus/media_unmount.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdwriter_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
 Actions=MediaUnmount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/src/servicemenus/open_in_digikam.desktop b/src/servicemenus/open_in_digikam.desktop
index 658df91..10c67da 100644
--- a/src/servicemenus/open_in_digikam.desktop
+++ b/src/servicemenus/open_in_digikam.desktop
@@ -24,6 +24,6 @@ Name[zh_CN]=在 Digikam 中打开
 Name[zh_TW]=在 Digikam 中開啟
 [Desktop Entry]
 Actions=OpenDigikam;
-ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted
 
 X-SuSE-translate=true
diff --git a/src/servicemenus/run_as_root.desktop b/src/servicemenus/run_as_root.desktop
index d6107ab..6039053 100644
--- a/src/servicemenus/run_as_root.desktop
+++ b/src/servicemenus/run_as_root.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-executable,application/x-shellscript,application/x-python,application/x-perl
+X-TDE-ServiceTypes=application/x-executable,application/x-shellscript,application/x-python,application/x-perl
 Actions=runassu
 
 [Desktop Action runassu]
diff --git a/src/servicemenus/smb2rdc.desktop b/src/servicemenus/smb2rdc.desktop
index 15a3d32..c96a540 100644
--- a/src/servicemenus/smb2rdc.desktop
+++ b/src/servicemenus/smb2rdc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-smb-server
+X-TDE-ServiceTypes=application/x-smb-server
 Actions=smb2rdc
 
 [Desktop Action smb2rdc]
diff --git a/src/servicemenus/text-ada-print.desktop b/src/servicemenus/text-ada-print.desktop
index c0c04c0..2b7b1ef 100644
--- a/src/servicemenus/text-ada-print.desktop
+++ b/src/servicemenus/text-ada-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-adasrc
+X-TDE-ServiceTypes=text/x-adasrc
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-c++-print.desktop b/src/servicemenus/text-c++-print.desktop
index f34dee4..2c71e26 100644
--- a/src/servicemenus/text-c++-print.desktop
+++ b/src/servicemenus/text-c++-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-c++src
+X-TDE-ServiceTypes=text/x-c++src
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-c++h-print.desktop b/src/servicemenus/text-c++h-print.desktop
index 01a8bfc..bb6361b 100644
--- a/src/servicemenus/text-c++h-print.desktop
+++ b/src/servicemenus/text-c++h-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-c++hdr
+X-TDE-ServiceTypes=text/x-c++hdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-ch-print.desktop b/src/servicemenus/text-ch-print.desktop
index cd3f587..c6dbbf2 100644
--- a/src/servicemenus/text-ch-print.desktop
+++ b/src/servicemenus/text-ch-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-chdr
+X-TDE-ServiceTypes=text/x-chdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-css-print.desktop b/src/servicemenus/text-css-print.desktop
index 3659747..fd8f7f9 100644
--- a/src/servicemenus/text-css-print.desktop
+++ b/src/servicemenus/text-css-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/css
+X-TDE-ServiceTypes=text/css
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-diff-print.desktop b/src/servicemenus/text-diff-print.desktop
index a0c39f0..7da656e 100644
--- a/src/servicemenus/text-diff-print.desktop
+++ b/src/servicemenus/text-diff-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-diff
+X-TDE-ServiceTypes=text/x-diff
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-html-print.desktop b/src/servicemenus/text-html-print.desktop
index edf95e6..c4cb64e 100644
--- a/src/servicemenus/text-html-print.desktop
+++ b/src/servicemenus/text-html-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/html
+X-TDE-ServiceTypes=text/html
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-java-print.desktop b/src/servicemenus/text-java-print.desktop
index 96dd0d6..3fbcb08 100644
--- a/src/servicemenus/text-java-print.desktop
+++ b/src/servicemenus/text-java-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-java
+X-TDE-ServiceTypes=text/x-java
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-log-print.desktop b/src/servicemenus/text-log-print.desktop
index ad44325..eb38485 100644
--- a/src/servicemenus/text-log-print.desktop
+++ b/src/servicemenus/text-log-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-log
+X-TDE-ServiceTypes=text/x-log
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-makefile-print.desktop b/src/servicemenus/text-makefile-print.desktop
index 4f2d679..7b05a9c 100644
--- a/src/servicemenus/text-makefile-print.desktop
+++ b/src/servicemenus/text-makefile-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-makefile
+X-TDE-ServiceTypes=text/x-makefile
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-pas-print.desktop b/src/servicemenus/text-pas-print.desktop
index e9e303b..f1a8cee 100644
--- a/src/servicemenus/text-pas-print.desktop
+++ b/src/servicemenus/text-pas-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-pascal
+X-TDE-ServiceTypes=text/x-pascal
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-perl-print.desktop b/src/servicemenus/text-perl-print.desktop
index effdc4a..c609f7a 100644
--- a/src/servicemenus/text-perl-print.desktop
+++ b/src/servicemenus/text-perl-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-perl
+X-TDE-ServiceTypes=text/x-perl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-print.desktop b/src/servicemenus/text-print.desktop
index 2b72284..defad11 100644
--- a/src/servicemenus/text-print.desktop
+++ b/src/servicemenus/text-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/plain
+X-TDE-ServiceTypes=text/plain
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-python-print.desktop b/src/servicemenus/text-python-print.desktop
index 660f5de..2546f2e 100644
--- a/src/servicemenus/text-python-print.desktop
+++ b/src/servicemenus/text-python-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-python
+X-TDE-ServiceTypes=text/x-python
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-tcl-print.desktop b/src/servicemenus/text-tcl-print.desktop
index ce786d1..cf7d911 100644
--- a/src/servicemenus/text-tcl-print.desktop
+++ b/src/servicemenus/text-tcl-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-tcl
+X-TDE-ServiceTypes=text/x-tcl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-tex-print.desktop b/src/servicemenus/text-tex-print.desktop
index 32e9c3c..3bd7ac2 100644
--- a/src/servicemenus/text-tex-print.desktop
+++ b/src/servicemenus/text-tex-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-tex
+X-TDE-ServiceTypes=text/x-tex
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-xml-print.desktop b/src/servicemenus/text-xml-print.desktop
index ad4e8ed..fff5bab 100644
--- a/src/servicemenus/text-xml-print.desktop
+++ b/src/servicemenus/text-xml-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-xml
+X-TDE-ServiceTypes=text/x-xml
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/src/servicemenus/text-xslt-print.desktop b/src/servicemenus/text-xslt-print.desktop
index c482c0a..afe0c0a 100644
--- a/src/servicemenus/text-xslt-print.desktop
+++ b/src/servicemenus/text-xslt-print.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-ServiceTypes=text/x-xslt
+X-TDE-ServiceTypes=text/x-xslt
 Actions=Print;
 
 [Desktop Action Print]
-- 
cgit v1.2.1