Branch: master

24db8551 2014-10-11 17:19:22 Timothy Pearson 
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M applnk/compat/email.desktop
M applnk/compat/passwords.desktop
M applnk/compat/userinfo.desktop
M kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
M kappfinder/apps/Internet/btdownloadgui.desktop
M kappfinder/apps/Internet/javaws.desktop
M kappfinder/apps/Multimedia/XMovie.desktop
M kappfinder/apps/Multimedia/aviplay.desktop
M kappfinder/apps/Multimedia/gtv.desktop
M kappfinder/apps/Multimedia/mplayer.desktop
M kappfinder/apps/Multimedia/ogle.desktop
M kappfinder/apps/Multimedia/oqtplayer.desktop
M kappfinder/apps/Multimedia/xine.desktop
M kappfinder/apps/Office/Applix.desktop
M kappfinder/apps/Office/WordPerfect.desktop
M kappfinder/apps/Office/WordPerfect2000.desktop
M kappfinder/apps/Office/XAcc.desktop
M kappfinder/apps/Office/XsLite.desktop
M kappfinder/apps/Office/acroread.desktop
M kappfinder/apps/Office/gnucash.desktop
M kappfinder/apps/Office/mrproject.desktop
M kappfinder/apps/Office/plan.desktop
M kappfinder/apps/Office/pybliographic.desktop
M kate/data/kate.desktop
M kate/data/kwrite.desktop
M kcontrol/access/kaccess.desktop
M kcontrol/access/kcmaccess.desktop
M kcontrol/arts/arts.desktop
M kcontrol/background/background.desktop
M kcontrol/bell/bell.desktop
M kcontrol/clock/clock.desktop
M kcontrol/colors/colors.desktop
M kcontrol/componentchooser/componentchooser.desktop
M kcontrol/crypto/crypto.desktop
M kcontrol/css/kcmcss.desktop
M kcontrol/display/display.desktop
M kcontrol/displayconfig/displayconfig.desktop
M kcontrol/dnssd/kcm_tdednssd.desktop
M kcontrol/ebrowsing/ebrowsing.desktop
M kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop
M kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_movie.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/qt3.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/technorati.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop
M kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop
M kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop
M kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
M kcontrol/energy/energy.desktop
M kcontrol/filetypes/filetypes.desktop
M kcontrol/fonts/fonts.desktop
M kcontrol/hwmanager/hwmanager.desktop
M kcontrol/iccconfig/iccconfig.desktop
M kcontrol/icons/icons.desktop
M kcontrol/info/cdinfo.desktop
M kcontrol/info/devices.desktop
M kcontrol/info/dma.desktop
M kcontrol/info/interrupts.desktop
M kcontrol/info/ioports.desktop
M kcontrol/info/memory.desktop
M kcontrol/info/opengl.desktop
M kcontrol/info/partitions.desktop
M kcontrol/info/pci.desktop
M kcontrol/info/processor.desktop
M kcontrol/info/scsi.desktop
M kcontrol/info/sound.desktop
M kcontrol/info/xserver.desktop
M kcontrol/input/mouse.desktop
M kcontrol/joystick/joystick.desktop
M kcontrol/kcontrol/KControl.desktop
M kcontrol/kcontrol/KControl_NoDisplay.desktop
M kcontrol/kcontrol/tde-kcontrol.desktop
M kcontrol/kded/kcmkded.desktop
M kcontrol/keys/keys.desktop
M kcontrol/kicker/kicker_config.desktop
M kcontrol/kicker/kicker_config_appearance.desktop
M kcontrol/kicker/kicker_config_arrangement.desktop
M kcontrol/kicker/kicker_config_hiding.desktop
M kcontrol/kicker/kicker_config_menus.desktop
M kcontrol/kicker/panel.desktop
M kcontrol/knotify/kcmnotify.desktop
M kcontrol/konq/desktop.desktop
M kcontrol/konq/desktopbehavior.desktop
M kcontrol/konq/desktoppath.desktop
M kcontrol/konq/fileappearance.desktop
M kcontrol/konq/filebehavior.desktop
M kcontrol/konq/filebrowser.desktop
M kcontrol/konq/filepreviews.desktop
M kcontrol/konq/webappearance.desktop
M kcontrol/konq/webbehavior.desktop
M kcontrol/konqhtml/tdehtml_behavior.desktop
M kcontrol/konqhtml/tdehtml_filter.desktop
M kcontrol/konqhtml/tdehtml_fonts.desktop
M kcontrol/konqhtml/tdehtml_java_js.desktop
M kcontrol/konqhtml/tdehtml_userinterface.desktop
M kcontrol/konsole/kcmkonsole.desktop
M kcontrol/kthememanager/kthememanager.desktop
M kcontrol/launch/kcmlaunch.desktop
M kcontrol/locale/language.desktop
M kcontrol/nics/nic.desktop
M kcontrol/performance/kcmkonqyperformance.desktop
M kcontrol/performance/kcmperformance.desktop
M kcontrol/privacy/privacy.desktop
M kcontrol/randr/tderandrtray.desktop
M kcontrol/samba/smbstatus.desktop
M kcontrol/screensaver/screensaver.desktop
M kcontrol/smartcard/smartcard.desktop
M kcontrol/smserver/kcmsmserver.desktop
M kcontrol/spellchecking/spellchecking.desktop
M kcontrol/style/style.desktop
M kcontrol/taskbar/kcmtaskbar.desktop
M kcontrol/tdefontinst/installfont.desktop
M kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
M kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
M kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
M kcontrol/tdefontinst/viewpart/tdefontview.desktop
M kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
M kcontrol/tdeio/cache.desktop
M kcontrol/tdeio/cookies.desktop
M kcontrol/tdeio/lanbrowser.desktop
M kcontrol/tdeio/netpref.desktop
M kcontrol/tdeio/proxy.desktop
M kcontrol/tdeio/smb.desktop
M kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
M kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
M kcontrol/tdeio/uasproviders/ie55onwin98.desktop
M kcontrol/tdeio/uasproviders/op75oncurrent.desktop
M kcontrol/tdeio/useragent.desktop
M kcontrol/tdm/tdm.desktop
M kcontrol/usbview/kcmusb.desktop
M kcontrol/view1394/kcmview1394.desktop
M kcontrol/xinerama/xinerama.desktop
M kdesktop/kdesktopSetAsBackground.desktop
M kfind/Kfind.desktop
M kfind/kfindpart.desktop
M khelpcenter/Help.desktop
M khelpcenter/htmlsearch/htmlsearch.desktop
M khelpcenter/khelpcenter.desktop
M khelpcenter/plugins/Manpages/man1.desktop
M khelpcenter/plugins/Manpages/man2.desktop
M khelpcenter/plugins/Manpages/man3.desktop
M khelpcenter/plugins/Manpages/man4.desktop
M khelpcenter/plugins/Manpages/man5.desktop
M khelpcenter/plugins/Manpages/man6.desktop
M khelpcenter/plugins/Manpages/man7.desktop
M khelpcenter/plugins/Manpages/man8.desktop
M khelpcenter/plugins/Manpages/man9.desktop
M khelpcenter/plugins/Manpages/mann.desktop
M khelpcenter/plugins/adminguide.desktop
M khelpcenter/plugins/contact.desktop
M khelpcenter/plugins/faq.desktop
M khelpcenter/plugins/info.desktop
M khelpcenter/plugins/links.desktop
M khelpcenter/plugins/quickstart.desktop
M khelpcenter/plugins/support.desktop
M khelpcenter/plugins/userguide.desktop
M khelpcenter/plugins/visualdict.desktop
M khelpcenter/plugins/welcome.desktop
M khotkeys/app/khotkeys.desktop
M khotkeys/kcontrol/khotkeys.desktop
M kicker/kicker/kcmkicker.desktop
M kicker/kicker/panel.desktop
M kicker/kicker/plugins/kickoffsearch_beagle.desktop
M kicker/menuext/find/kfind.desktop
M klipper/klipper.desktop
M kmenuedit/kmenuedit.desktop
M knetattach/knetattach.desktop
M konqueror/about/konq_aboutpage.desktop
M konqueror/iconview/konq_iconview.desktop
M konqueror/iconview/konq_multicolumnview.desktop
M konqueror/kfmclient.desktop
M konqueror/kfmclient_dir.desktop
M konqueror/kfmclient_html.desktop
M konqueror/kfmclient_war.desktop
M konqueror/konqbrowser.desktop
M konqueror/konqfilemgr.desktop
M konqueror/konquerorsu.desktop
M konqueror/listview/konq_detailedlistview.desktop
M konqueror/listview/konq_infolistview.desktop
M konqueror/listview/konq_textview.desktop
M konqueror/listview/konq_treeview.desktop
M konqueror/preloader/konqy_preloader.desktop
M konqueror/quickprint/text-ada-print.desktop
M konqueror/quickprint/text-c++-print.desktop
M konqueror/quickprint/text-c++h-print.desktop
M konqueror/quickprint/text-c-print.desktop
M konqueror/quickprint/text-ch-print.desktop
M konqueror/quickprint/text-css-print.desktop
M konqueror/quickprint/text-diff-print.desktop
M konqueror/quickprint/text-html-print.desktop
M konqueror/quickprint/text-java-print.desktop
M konqueror/quickprint/text-log-print.desktop
M konqueror/quickprint/text-makefile-print.desktop
M konqueror/quickprint/text-pas-print.desktop
M konqueror/quickprint/text-perl-print.desktop
M konqueror/quickprint/text-print.desktop
M konqueror/quickprint/text-python-print.desktop
M konqueror/quickprint/text-tcl-print.desktop
M konqueror/quickprint/text-tex-print.desktop
M konqueror/quickprint/text-xml-print.desktop
M konqueror/quickprint/text-xslt-print.desktop
M konqueror/sidebar/konq_sidebartng.desktop
M konqueror/sidebar/trees/history_module/kcmhistory.desktop
M konsole/konsole-script.desktop
M konsole/konsole.desktop
M konsole/konsolehere.desktop
M konsole/konsolepart.desktop
M konsole/konsolesu.desktop
M konsole/kwrited.desktop
M kpager/kpager.desktop
M ksplashml/kcmksplash/ksplashthememgr.desktop
M ksplashml/themeengine/default/ksplashdefault.desktop
M ksplashml/themeengine/redmond/ksplashredmond.desktop
M ksplashml/themeengine/standard/ksplashstandard.desktop
M ksplashml/themeengine/unified/ksplashunified.desktop
M ksysguard/gui/ksysguard.desktop
M kxkb/keyboard.desktop
M kxkb/keyboard_layout.desktop
M libkonq/favicons/favicons.desktop
M libkonq/servicemenus/edit-as-root.desktop
M nsplugins/tdehtml_plugins.desktop
M tdeioslave/cgi/kcmcgi/kcmcgi.desktop
M tdeioslave/home/kdedmodule/homedirnotify.desktop
M tdeioslave/man/kmanpart.desktop
M tdeioslave/media/mediamanager/mediamanager.desktop
M tdeioslave/media/medianotifier/medianotifier.desktop
M tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
M tdeioslave/media/services/media_decrypt.desktop
M tdeioslave/media/services/media_eject.desktop
M tdeioslave/media/services/media_mount.desktop
M tdeioslave/media/services/media_safelyremove.desktop
M tdeioslave/media/services/media_unmount.desktop
M tdeioslave/media/tdecmodule/media.desktop
M tdeioslave/media/tdefile-plugin/tdefile_media.desktop
M tdeioslave/remote/kdedmodule/remotedirnotify.desktop
M tdeioslave/system/kdedmodule/systemdirnotify.desktop
M tdeioslave/thumbnail/cursorthumbnail.desktop
M tdeioslave/thumbnail/djvuthumbnail.desktop
M tdeioslave/thumbnail/exrthumbnail.desktop
M tdeioslave/thumbnail/htmlthumbnail.desktop
M tdeioslave/thumbnail/imagethumbnail.desktop
M tdeioslave/thumbnail/textthumbnail.desktop
M tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
M tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
M tdepasswd/kcm/kcm_useraccount.desktop
M tdeprint/kjobviewer/kjobviewer.desktop
M tdeprint/kprinter/kprinter.desktop
M tdeprint/printmgr/printers.desktop
M tdeprint/tdeprint_part/tdeprint_part.desktop
M tqt3integration/module/kdeintegration.desktop
M twin/kcmtwin/twindecoration/twindecoration.desktop
M twin/kcmtwin/twinoptions/twinactions.desktop
M twin/kcmtwin/twinoptions/twinadvanced.desktop
M twin/kcmtwin/twinoptions/twinfocus.desktop
M twin/kcmtwin/twinoptions/twinmoving.desktop
M twin/kcmtwin/twinoptions/twinoptions.desktop
M twin/kcmtwin/twinoptions/twintranslucency.desktop
M twin/kcmtwin/twinrules/twinrules.desktop
 
diff --git a/applnk/compat/email.desktop b/applnk/compat/email.desktop
index 016b0ee..1791ecd 100644
--- a/applnk/compat/email.desktop
+++ b/applnk/compat/email.desktop
@@ -2,7 +2,7 @@
 Icon=email
 Type=Application
 Exec=tdecmshell kcm_useraccount
-DocPath=kcontrol/email/index.html
+X-DocPath=kcontrol/email/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
 X-TDE-ParentApp=kcontrol
diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop
index 7d90765..82e040f 100644
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=password
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 NoDisplay=true
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop
index 3764635..3a2f971 100644
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
index f442933..0332232 100644
--- a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+++ b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
@@ -52,7 +52,7 @@
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent ���������������������
 Icon=xapp
-InitialPreference=1
+X-TDE-InitialPreference=1
 MimeType=application/x-bittorrent
 Name=BitTorrent Python Curses GUI
 Name[be]=���������������� ������������ BitTorrent ���� �������� Python
@@ -101,6 +101,6 @@
 Name[vi]=Con tr��� Giao di���n Python BitTorrent
 Name[wa]=Eterface grafike e python po BitTorrent
 Name[zh_TW]=BitTorrent Python Curses ���������������������
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=true
 Type=Application
diff --git a/kappfinder/apps/Internet/btdownloadgui.desktop b/kappfinder/apps/Internet/btdownloadgui.desktop
index 66bff95..671879b 100644
--- a/kappfinder/apps/Internet/btdownloadgui.desktop
+++ b/kappfinder/apps/Internet/btdownloadgui.desktop
@@ -52,7 +52,7 @@
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent ���������������������
 Icon=xapp
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=application/x-bittorrent
 Name=BitTorrent Python wxGTK GUI
 Name[be]=���������������� ������������ BitTorrent ���� �������� Python ������ wxGTK
@@ -100,6 +100,6 @@
 Name[vi]=Giao di���n wxGTK Python BitTorrent
 Name[wa]=Eterface grafike e python wxGTK po BitTorrent
 Name[zh_TW]=BitTorrent Python wxGTK ���������������������
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
diff --git a/kappfinder/apps/Internet/javaws.desktop b/kappfinder/apps/Internet/javaws.desktop
index bed9f6f..fada724 100644
--- a/kappfinder/apps/Internet/javaws.desktop
+++ b/kappfinder/apps/Internet/javaws.desktop
@@ -27,7 +27,7 @@
 Name[uk]=������������ �������������� Java �� ������������
 Name[vi]=Kh���i �����ng Java M���ng
 Name[wa]=Enondaedje di Java sol daegntoele
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
 Icon=java
diff --git a/kappfinder/apps/Multimedia/XMovie.desktop b/kappfinder/apps/Multimedia/XMovie.desktop
index 594a2f9..25a1a9e 100644
--- a/kappfinder/apps/Multimedia/XMovie.desktop
+++ b/kappfinder/apps/Multimedia/XMovie.desktop
@@ -96,5 +96,5 @@
 Terminal=false
 Icon=xmovie
 MimeType=video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg;
-InitialPreference=10
+X-TDE-InitialPreference=10
 Type=Application
diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop
index 058a898..a19f9d7 100644
--- a/kappfinder/apps/Multimedia/aviplay.desktop
+++ b/kappfinder/apps/Multimedia/aviplay.desktop
@@ -93,6 +93,6 @@
 Name[vi]=Ch��i Avi
 Name[xh]=Umdlalo we Avi
 Name[zu]=Umdlali we-Avi
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop
index cac8984..2a7eb0c 100644
--- a/kappfinder/apps/Multimedia/gtv.desktop
+++ b/kappfinder/apps/Multimedia/gtv.desktop
@@ -88,5 +88,5 @@
 Name[hi]=������������������
 Name[te]=������������������
 Name[th]=GTV 
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop
index 0dc6a15..e08dbc8 100644
--- a/kappfinder/apps/Multimedia/mplayer.desktop
+++ b/kappfinder/apps/Multimedia/mplayer.desktop
@@ -95,7 +95,7 @@
 Name[ta]=M������������������
 Name[te]=���������������������������
 Name[ven]=Tshitambisi tsha M
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-Protocols=http
 
diff --git a/kappfinder/apps/Multimedia/ogle.desktop b/kappfinder/apps/Multimedia/ogle.desktop
index 18a6503..e50b28a 100644
--- a/kappfinder/apps/Multimedia/ogle.desktop
+++ b/kappfinder/apps/Multimedia/ogle.desktop
@@ -91,7 +91,7 @@
 Name[te]=���������������
 Name[th]=Ogel
 Name[ven]=Zondolola
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/oqtplayer.desktop b/kappfinder/apps/Multimedia/oqtplayer.desktop
index 8002acf..d511da2 100644
--- a/kappfinder/apps/Multimedia/oqtplayer.desktop
+++ b/kappfinder/apps/Multimedia/oqtplayer.desktop
@@ -98,7 +98,7 @@
 Name[xh]=Umdlali we OQT
 Name[zh_TW]=OQT ���������
 Name[zu]=Umdlali we-OQT
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/xine.desktop b/kappfinder/apps/Multimedia/xine.desktop
index 2340371..3944dbe 100644
--- a/kappfinder/apps/Multimedia/xine.desktop
+++ b/kappfinder/apps/Multimedia/xine.desktop
@@ -88,6 +88,6 @@
 Name[hi]=���������������������
 Name[lo]=������������������������
 Name[te]=������������������
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Office/Applix.desktop b/kappfinder/apps/Office/Applix.desktop
index 0b0da80..e803360 100644
--- a/kappfinder/apps/Office/Applix.desktop
+++ b/kappfinder/apps/Office/Applix.desktop
@@ -10,7 +10,7 @@
 Exec=applix
 Icon=applixware
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Office Suite
diff --git a/kappfinder/apps/Office/WordPerfect.desktop b/kappfinder/apps/Office/WordPerfect.desktop
index 8870b18..26ea758 100644
--- a/kappfinder/apps/Office/WordPerfect.desktop
+++ b/kappfinder/apps/Office/WordPerfect.desktop
@@ -19,7 +19,7 @@
 Exec=xwp
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/WordPerfect2000.desktop b/kappfinder/apps/Office/WordPerfect2000.desktop
index 15ad77a..ed733f7 100644
--- a/kappfinder/apps/Office/WordPerfect2000.desktop
+++ b/kappfinder/apps/Office/WordPerfect2000.desktop
@@ -19,7 +19,7 @@
 Exec=wordperfect
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/XAcc.desktop b/kappfinder/apps/Office/XAcc.desktop
index ba50dd7..9169d45 100644
--- a/kappfinder/apps/Office/XAcc.desktop
+++ b/kappfinder/apps/Office/XAcc.desktop
@@ -9,7 +9,7 @@
 Exec=xacc
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Personal Accounting Tool
diff --git a/kappfinder/apps/Office/XsLite.desktop b/kappfinder/apps/Office/XsLite.desktop
index 27bf3c4..6cd0fb1 100644
--- a/kappfinder/apps/Office/XsLite.desktop
+++ b/kappfinder/apps/Office/XsLite.desktop
@@ -11,7 +11,7 @@
 Exec=xslite
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Spread Sheet
diff --git a/kappfinder/apps/Office/acroread.desktop b/kappfinder/apps/Office/acroread.desktop
index 827c4ae..3a94f34 100644
--- a/kappfinder/apps/Office/acroread.desktop
+++ b/kappfinder/apps/Office/acroread.desktop
@@ -29,7 +29,7 @@
 MimeType=application/pdf;
 ** Diff limit reached (max: 250 lines) **