Branch: master

8d323d59 2014-10-11 17:19:23 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M akregator/src/akregator.desktop
M akregator/src/akregator_part.desktop
M akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
M certmanager/conf/kleopatra_config_appear.desktop
M certmanager/conf/kleopatra_config_dirserv.desktop
M certmanager/conf/kleopatra_config_dnorder.desktop
M certmanager/kleopatra.desktop
M kaddressbook/editors/cryptosettings.desktop
M kaddressbook/editors/imaddresseditor.desktop
M kaddressbook/editors/protocols/aimprotocol.desktop
M kaddressbook/editors/protocols/gaduprotocol.desktop
M kaddressbook/editors/protocols/groupwiseprotocol.desktop
M kaddressbook/editors/protocols/icqprotocol.desktop
M kaddressbook/editors/protocols/ircprotocol.desktop
M kaddressbook/editors/protocols/jabberprotocol.desktop
M kaddressbook/editors/protocols/meanwhileprotocol.desktop
M kaddressbook/editors/protocols/msnprotocol.desktop
M kaddressbook/editors/protocols/skypeprotocol.desktop
M kaddressbook/editors/protocols/smsprotocol.desktop
M kaddressbook/editors/protocols/yahooprotocol.desktop
M kaddressbook/features/distributionlist.desktop
M kaddressbook/features/distributionlistng.desktop
M kaddressbook/features/resourceselection.desktop
M kaddressbook/kaddressbook.desktop
M kaddressbook/kcmconfigs/kabconfig.desktop
M kaddressbook/kcmconfigs/kabcustomfields.desktop
M kaddressbook/kcmconfigs/kabldapconfig.desktop
M kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
M kaddressbook/views/cardview.desktop
M kaddressbook/views/iconview.desktop
M kaddressbook/views/tableview.desktop
M kaddressbook/xxport/bookmark_xxport.desktop
M kaddressbook/xxport/csv_xxport.desktop
M kaddressbook/xxport/eudora_xxport.desktop
M kaddressbook/xxport/gnokii_xxport.desktop
M kaddressbook/xxport/kde2_xxport.desktop
M kaddressbook/xxport/ldif_xxport.desktop
M kaddressbook/xxport/opera_xxport.desktop
M kaddressbook/xxport/pab_xxport.desktop
M kaddressbook/xxport/vcard_xxport.desktop
M kalarm/kalarm.desktop
M kalarm/kalarm.tray.desktop
M kandy/src/kandy.desktop
M karm/karm_part.desktop
M karm/support/karm.desktop
M kitchensync/src/kitchensync.desktop
M kmail/KMail.desktop
M kmail/kmail_config_accounts.desktop
M kmail/kmail_config_appearance.desktop
M kmail/kmail_config_composer.desktop
M kmail/kmail_config_identity.desktop
M kmail/kmail_config_misc.desktop
M kmail/kmail_config_security.desktop
M kmail/kmail_view.desktop
M kmail/konqueror/servicemenus/email.desktop
M kmobile/devices/digicam/libkmobile_digicam.desktop
M kmobile/devices/gammu/libkmobile_gammu.desktop
M kmobile/devices/gnokii/libkmobile_gnokii.desktop
M kmobile/devices/skeleton/libkmobile_skeleton.desktop
M kmobile/kmobile.desktop
M knode/KNode.desktop
M knode/knode_config_accounts.desktop
M knode/knode_config_appearance.desktop
M knode/knode_config_cleanup.desktop
M knode/knode_config_identity.desktop
M knode/knode_config_post_news.desktop
M knode/knode_config_privacy.desktop
M knode/knode_config_read_news.desktop
M knotes/knotes.desktop
M knotes/knotes_manager.desktop
M knotes/local.desktop
M konsolekalendar/konsolekalendar.desktop
M kontact/plugins/akregator/akregatorplugin.desktop
M kontact/plugins/akregator/akregatorplugin3.2.desktop
M kontact/plugins/kaddressbook/kaddressbookplugin.desktop
M kontact/plugins/karm/karmplugin.desktop
M kontact/plugins/kitchensync/kitchensync.desktop
M kontact/plugins/kmail/kcmkmailsummary.desktop
M kontact/plugins/kmail/kmailplugin.desktop
M kontact/plugins/knode/knodeplugin.desktop
M kontact/plugins/knotes/knotesplugin.desktop
M kontact/plugins/korganizer/journalplugin.desktop
M kontact/plugins/korganizer/kcmkorgsummary.desktop
M kontact/plugins/korganizer/korganizerplugin.desktop
M kontact/plugins/korganizer/todoplugin.desktop
M kontact/plugins/kpilot/kpilotplugin.desktop
M kontact/plugins/newsticker/kcmkontactknt.desktop
M kontact/plugins/newsticker/newstickerplugin.desktop
M kontact/plugins/specialdates/kcmsdsummary.desktop
M kontact/plugins/specialdates/specialdatesplugin.desktop
M kontact/plugins/summary/kcmkontactsummary.desktop
M kontact/plugins/summary/summaryplugin.desktop
M kontact/plugins/test/kptestplugin.desktop
M kontact/plugins/weather/weatherplugin.desktop
M kontact/src/Kontact.desktop
M kontact/src/kontactconfig.desktop
M kontact/src/kontactdcop.desktop
M korganizer/korganizer.desktop
M korganizer/korganizer_configcolors.desktop
M korganizer/korganizer_configdesignerfields.desktop
M korganizer/korganizer_configfonts.desktop
M korganizer/korganizer_configfreebusy.desktop
M korganizer/korganizer_configgroupautomation.desktop
M korganizer/korganizer_configgroupscheduling.desktop
M korganizer/korganizer_configmain.desktop
M korganizer/korganizer_configplugins.desktop
M korganizer/korganizer_configtime.desktop
M korganizer/korganizer_configviews.desktop
M korganizer/plugins/datenums/datenums.desktop
M korganizer/plugins/exchange/exchange.desktop
M korganizer/plugins/hebrew/hebrew.desktop
M korganizer/plugins/printing/journal/journalprint.desktop
M korganizer/plugins/printing/list/listprint.desktop
M korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
M korganizer/plugins/printing/year/yearprint.desktop
M korganizer/plugins/projectview/projectview.desktop
M korganizer/plugins/timespanview/timespanview.desktop
M korn/KOrn.desktop
M ktnef/gui/ktnef.desktop
M libkcal/kcal_manager.desktop
M libkcal/local.desktop
M libkcal/localdir.desktop
M libtdepim/komposer/plugins/default/defaulteditor.desktop
M tdefile-plugins/ics/tdefile_ics.desktop
M tdefile-plugins/palm-databases/tdefile_palm.desktop
M tdefile-plugins/rfc822/tdefile_rfc822.desktop
M tdefile-plugins/vcf/tdefile_vcf.desktop
M tderesources/birthdays/tdeabc.desktop
M tderesources/blogging/blogging.desktop
M tderesources/caldav/kcal_caldav.desktop
M tderesources/carddav/tdeabc_carddav.desktop
M tderesources/egroupware/kcal_xmlrpc.desktop
M tderesources/egroupware/knotes_xmlrpc.desktop
M tderesources/egroupware/tdeabc_xmlrpc.desktop
M tderesources/exchange/exchange.desktop
M tderesources/featureplan/kcal_resourcefeatureplan.desktop
M tderesources/groupdav/kcal_groupdav.desktop
M tderesources/groupdav/tdeabc_groupdav.desktop
M tderesources/groupware/kcal_groupware.desktop
M tderesources/groupware/tdeabc_groupware.desktop
M tderesources/groupwise/kcal_groupwise.desktop
M tderesources/groupwise/tdeabc_groupwise.desktop
M tderesources/kolab/kcal/kolab.desktop
M tderesources/kolab/knotes/kolabresource.desktop
M tderesources/kolab/tdeabc/kolab.desktop
M tderesources/newexchange/kcal_newexchange.desktop
M tderesources/newexchange/tdeabc_newexchange.desktop
M tderesources/remote/remote.desktop
M tderesources/scalix/kcal/scalix.desktop
M tderesources/scalix/knotes/scalix.desktop
M tderesources/scalix/tdeabc/scalix.desktop
M tderesources/slox/kcal_ox.desktop
M tderesources/slox/kcal_slox.desktop
M tderesources/slox/tdeabc_ox.desktop
M tderesources/slox/tdeabc_slox.desktop
M tderesources/tvanytime/kcal_tvanytime.desktop
diff --git a/akregator/src/akregator.desktop b/akregator/src/akregator.desktop
index 0c8d051..5b29285 100644
--- a/akregator/src/akregator.desktop
+++ b/akregator/src/akregator.desktop
@@ -4,7 +4,7 @@
 Exec=akregator %i %m -caption "%c"
 Icon=akregator
 Type=Application
-DocPath=akregator/index.html
+X-DocPath=akregator/index.html
 GenericName=RSS Feed Reader
 GenericName[af]=RSS stroom leser
 GenericName[bg]=���������� ���� �������������� RSS
diff --git a/akregator/src/akregator_part.desktop b/akregator/src/akregator_part.desktop
index fa0da1c..8718960 100644
--- a/akregator/src/akregator_part.desktop
+++ b/akregator/src/akregator_part.desktop
@@ -7,7 +7,7 @@
 Name[pt_BR]=Componente do aKregator
 Name[sv]=aKregator-delprogram
 Name[ta]=aKregator���������������
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libakregatorpart
 Type=Service
 Icon=akregator
diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
index 61323a8..4d932dc 100644
--- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
+++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
@@ -94,7 +94,7 @@
 Comment[uz]=Akregator �������� ������������
 Comment[zh_CN]=Akregator ������
 Comment[zh_TW]=Akregator ������������
-ServiceTypes=Akregator/Plugin
+X-TDE-ServiceTypes=Akregator/Plugin
 
 X-TDE-akregator-plugintype=storage
 X-TDE-akregator-name=metakit
diff --git a/certmanager/conf/kleopatra_config_appear.desktop b/certmanager/conf/kleopatra_config_appear.desktop
index c43304f..fe10f66 100644
--- a/certmanager/conf/kleopatra_config_appear.desktop
+++ b/certmanager/conf/kleopatra_config_appear.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration-appearance.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration-appearance.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/conf/kleopatra_config_dirserv.desktop b/certmanager/conf/kleopatra_config_dirserv.desktop
index fed41a7..9232d2d 100644
--- a/certmanager/conf/kleopatra_config_dirserv.desktop
+++ b/certmanager/conf/kleopatra_config_dirserv.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=network
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration.html#configuration-directory-services
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration.html#configuration-directory-services
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/conf/kleopatra_config_dnorder.desktop b/certmanager/conf/kleopatra_config_dnorder.desktop
index 9f0dc41..12e0045 100644
--- a/certmanager/conf/kleopatra_config_dnorder.desktop
+++ b/certmanager/conf/kleopatra_config_dnorder.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
-DocPath=kleopatra/configuration-dn-order.html
+X-TDE-ServiceTypes=TDECModule
+X-DocPath=kleopatra/configuration-dn-order.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kleopatra
diff --git a/certmanager/kleopatra.desktop b/certmanager/kleopatra.desktop
index 710a1ad..2fab4ee 100644
--- a/certmanager/kleopatra.desktop
+++ b/certmanager/kleopatra.desktop
@@ -122,4 +122,4 @@
 GenericName[zh_TW]=���������������������������������
 Terminal=false
 X-TDE-StartupNotify=true
-DocPath=kleopatra/index.html
+X-DocPath=kleopatra/index.html
diff --git a/kaddressbook/editors/cryptosettings.desktop b/kaddressbook/editors/cryptosettings.desktop
index 063613f..cb7270c 100644
--- a/kaddressbook/editors/cryptosettings.desktop
+++ b/kaddressbook/editors/cryptosettings.desktop
@@ -51,5 +51,5 @@
 Name[zh_CN]=���������������
 Name[zh_TW]=������������
 Type=Service
-ServiceTypes=KAddressBook/ContactEditorWidget
+X-TDE-ServiceTypes=KAddressBook/ContactEditorWidget
 X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/imaddresseditor.desktop b/kaddressbook/editors/imaddresseditor.desktop
index 205e0f0..47f0f56 100644
--- a/kaddressbook/editors/imaddresseditor.desktop
+++ b/kaddressbook/editors/imaddresseditor.desktop
@@ -96,6 +96,6 @@
 Comment[uk]=���������������� ���������� ������������������������'��������
 Comment[zh_CN]=���������������������������
 Comment[zh_TW]=���������������������������
-ServiceTypes=KAddressBook/ContactEditorWidget
+X-TDE-ServiceTypes=KAddressBook/ContactEditorWidget
 X-TDE-Library=libkaddrbk_instantmessaging
 X-TDE-KAddressBook-CEWPluginVersion=1
diff --git a/kaddressbook/editors/protocols/aimprotocol.desktop b/kaddressbook/editors/protocols/aimprotocol.desktop
index 05bdad5..ee594e2 100644
--- a/kaddressbook/editors/protocols/aimprotocol.desktop
+++ b/kaddressbook/editors/protocols/aimprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=aim_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/aim
 Comment=AIM Protocol
 Comment[ar]=���������� AIM
diff --git a/kaddressbook/editors/protocols/gaduprotocol.desktop b/kaddressbook/editors/protocols/gaduprotocol.desktop
index 4b73929..15d1a27 100644
--- a/kaddressbook/editors/protocols/gaduprotocol.desktop
+++ b/kaddressbook/editors/protocols/gaduprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=gadu_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/gadu
 Comment=Gadu-Gadu Protocol
 Comment[af]=Gadu-Gadu protokol
diff --git a/kaddressbook/editors/protocols/groupwiseprotocol.desktop b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
index d60c628..fc6ccbd 100644
--- a/kaddressbook/editors/protocols/groupwiseprotocol.desktop
+++ b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=groupwise_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/groupwise
 Comment=Novell GroupWise Messenger
 Comment[af]=Novell GroupWise boodskappe
diff --git a/kaddressbook/editors/protocols/icqprotocol.desktop b/kaddressbook/editors/protocols/icqprotocol.desktop
index 1c578ae..5506aca 100644
--- a/kaddressbook/editors/protocols/icqprotocol.desktop
+++ b/kaddressbook/editors/protocols/icqprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=icq_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/icq
 Comment=ICQ Protocol
 Comment[af]=ICQ protokol
diff --git a/kaddressbook/editors/protocols/ircprotocol.desktop b/kaddressbook/editors/protocols/ircprotocol.desktop
index a0380f2..3158344 100644
--- a/kaddressbook/editors/protocols/ircprotocol.desktop
+++ b/kaddressbook/editors/protocols/ircprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=irc_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/irc
 Comment=Internet Relay Chat
 Comment[bg]=���������������� IRC
diff --git a/kaddressbook/editors/protocols/jabberprotocol.desktop b/kaddressbook/editors/protocols/jabberprotocol.desktop
index f70ffc5..ff47a02 100644
--- a/kaddressbook/editors/protocols/jabberprotocol.desktop
+++ b/kaddressbook/editors/protocols/jabberprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=jabber_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/xmpp
 Comment=Jabber Protocol
 Comment[af]=Jabber protokol
diff --git a/kaddressbook/editors/protocols/meanwhileprotocol.desktop b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
index e011e77..1379762 100644
--- a/kaddressbook/editors/protocols/meanwhileprotocol.desktop
+++ b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=meanwhile_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/meanwhile
 Comment=Meanwhile Protocol
 Comment[af]=Meanwhile protokol
diff --git a/kaddressbook/editors/protocols/msnprotocol.desktop b/kaddressbook/editors/protocols/msnprotocol.desktop
index 1481371..2f3f533 100644
--- a/kaddressbook/editors/protocols/msnprotocol.desktop
+++ b/kaddressbook/editors/protocols/msnprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=msn_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/msn
 Comment=MSN Messenger
 Comment[af]=MSN boodskapper
diff --git a/kaddressbook/editors/protocols/skypeprotocol.desktop b/kaddressbook/editors/protocols/skypeprotocol.desktop
index 79ad339..aea8e75 100644
--- a/kaddressbook/editors/protocols/skypeprotocol.desktop
+++ b/kaddressbook/editors/protocols/skypeprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=skype_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/skype
 Comment=Skype Internet Telephony
 Comment[af]=Skype Internet Telefoon
diff --git a/kaddressbook/editors/protocols/smsprotocol.desktop b/kaddressbook/editors/protocols/smsprotocol.desktop
index 975082e..94c31f8 100644
--- a/kaddressbook/editors/protocols/smsprotocol.desktop
+++ b/kaddressbook/editors/protocols/smsprotocol.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=sms_protocol
-ServiceTypes=KABC/IMProtocol,KPluginInfo
+X-TDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-TDE-InstantMessagingKABCField=messaging/sms
 Comment=SMS Protocol
 Comment[af]=SMS protokol
diff --git a/kaddressbook/editors/protocols/yahooprotocol.desktop b/kaddressbook/editors/protocols/yahooprotocol.desktop
index 9849e14..7909172 100644
--- a/kaddressbook/editors/protocols/yahooprotocol.desktop
 ** Diff limit reached (max: 250 lines) **