Branch: master

7bcf27e1 2014-10-11 17:19:18 Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M kmyfirewall/compilers/iptables/kmfcompiler_ipt.desktop
M kmyfirewall/compilers/pf/kmfcompiler_pf.desktop
M kmyfirewall/installer/linux/kmfinstaller_linux.desktop
M kmyfirewall/installer/openbsd/kmfinstaller_openbsd.desktop
M kmyfirewall/ipteditor/kmfipteditorpart.desktop
M kmyfirewall/kmyfirewall.desktop
M kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptionedit_custom.desktop
M kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptionedit_interface.desktop
M kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptionedit_ip.desktop
M kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptionedit_limit.desktop
M kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptionedit_log.desktop
M kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptionedit_mac.desktop
M kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptionedit_mark.desktop
M kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptionedit_nat.desktop
M kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptionedit_protocol.desktop
M kmyfirewall/ruleoptionplugins/state_option/kmfruleoptionedit_state.desktop
M kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedit_tos.desktop
M kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedit_tos.desktop
diff --git a/kmyfirewall/compilers/iptables/kmfcompiler_ipt.desktop b/kmyfirewall/compilers/iptables/kmfcompiler_ipt.desktop
index e3e5fe3..360453b 100644
--- a/kmyfirewall/compilers/iptables/kmfcompiler_ipt.desktop
+++ b/kmyfirewall/compilers/iptables/kmfcompiler_ipt.desktop
@@ -60,6 +60,6 @@
 Name[xx]=xxKMyFirewall IPTables Compilerxx
 Name[zh_CN]=KMyFirewall IP ������������������
 X-TDE-Library=libkmfcompiler_ipt
-ServiceTypes=KMyFirewall/Compiler
+X-TDE-ServiceTypes=KMyFirewall/Compiler
 X-KMyFirewall-Platform=linux
 X-KMyFirewall-Language=iptables
diff --git a/kmyfirewall/compilers/pf/kmfcompiler_pf.desktop b/kmyfirewall/compilers/pf/kmfcompiler_pf.desktop
index 8b62539..d699fd3 100644
--- a/kmyfirewall/compilers/pf/kmfcompiler_pf.desktop
+++ b/kmyfirewall/compilers/pf/kmfcompiler_pf.desktop
@@ -56,6 +56,6 @@
 Name[uk]=�������������������� KMyFirewall ������ OpenBSD pf
 Name[xx]=xxKMyFirewall OpenBSD pf Compilerxx
 X-TDE-Library=libkmfcompiler_pf
-ServiceTypes=KMyFirewall/Compiler
+X-TDE-ServiceTypes=KMyFirewall/Compiler
 X-KMyFirewall-Platform=openbsd
 X-KMyFirewall-Language=pf
diff --git a/kmyfirewall/installer/linux/kmfinstaller_linux.desktop b/kmyfirewall/installer/linux/kmfinstaller_linux.desktop
index 31388e7..a5cfec4 100644
--- a/kmyfirewall/installer/linux/kmfinstaller_linux.desktop
+++ b/kmyfirewall/installer/linux/kmfinstaller_linux.desktop
@@ -57,6 +57,6 @@
 Comment[uk]=������������ ������ ������������������������ ���������������������� iptables
 Comment[xx]=xxPlugin for installing an iptables scriptfilexx
 X-TDE-Library=libkmfinstaller_linux
-ServiceTypes=KMyFirewall/Installer
+X-TDE-ServiceTypes=KMyFirewall/Installer
 X-KMyFirewall-Platform=linux
 
diff --git a/kmyfirewall/installer/openbsd/kmfinstaller_openbsd.desktop b/kmyfirewall/installer/openbsd/kmfinstaller_openbsd.desktop
index 3a48633..8c28827 100644
--- a/kmyfirewall/installer/openbsd/kmfinstaller_openbsd.desktop
+++ b/kmyfirewall/installer/openbsd/kmfinstaller_openbsd.desktop
@@ -13,6 +13,6 @@
 Comment[pt_BR]='Plugin' para instalar um ficheiro do 'pf'
 Comment[sv]=Insticksprogram f��r att installera en pf-skriptfil
 X-TDE-Library=libkmfinstaller_openbsd
-ServiceTypes=KMyFirewall/Installer
+X-TDE-ServiceTypes=KMyFirewall/Installer
 X-KMyFirewall-Platform=openbsd
 
diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.desktop b/kmyfirewall/ipteditor/kmfipteditorpart.desktop
index c22c4ee..73b5bbc 100644
--- a/kmyfirewall/ipteditor/kmfipteditorpart.desktop
+++ b/kmyfirewall/ipteditor/kmfipteditorpart.desktop
@@ -11,5 +11,5 @@
 Name[xx]=xxKMFIPTEditorPartxx
 Name[zh_CN]=KMFip ������������������������
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libkkmfipteditoprat
diff --git a/kmyfirewall/kmyfirewall.desktop b/kmyfirewall/kmyfirewall.desktop
index 25f25df..f0e3a10 100644
--- a/kmyfirewall/kmyfirewall.desktop
+++ b/kmyfirewall/kmyfirewall.desktop
@@ -35,4 +35,4 @@
 Comment[sr@Latn]=�������� ���� �������������������� ������������������ ��������
 Comment[sv]=Verktyg f��r inst��llning av brandv��gg
 Comment[xx]=xxFirewall Configuration Toolxx
-DocPath=kmyfirewall/index.html
+X-DocPath=kmyfirewall/index.html
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptionedit_custom.desktop b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptionedit_custom.desktop
index e9bb16f..31c652c 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptionedit_custom.desktop
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptionedit_custom.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=iptables kural�� ��zel se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing iptables rule Custom optionsxx
 X-TDE-Library=libkmfruleoptionedit_custom
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptionedit_interface.desktop b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptionedit_interface.desktop
index 317a584..ef0dd56 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptionedit_interface.desktop
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptionedit_interface.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=Aray��z tabanl�� iptables kural�� se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for edition Interface based iptables rule optionsxx
 X-TDE-Library=libkmfruleoptionedit_interface
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptionedit_ip.desktop b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptionedit_ip.desktop
index 0a8087c..39d4024 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptionedit_ip.desktop
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptionedit_ip.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=IP tabanl�� iptables kural�� se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for edition IP based iptables rule optionsxx
 X-TDE-Library=libkmfruleoptionedit_ip
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptionedit_limit.desktop b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptionedit_limit.desktop
index 7a420df..41911ff 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptionedit_limit.desktop
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptionedit_limit.desktop
@@ -51,5 +51,5 @@
 Comment[tr]=iptables kural�� s��n��r se��ene��ini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing iptables rule Limit optionsxx
 X-TDE-Library=libkmfruleoptionedit_limit
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptionedit_log.desktop b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptionedit_log.desktop
index bfb76e7..6cc993a 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptionedit_log.desktop
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptionedit_log.desktop
@@ -51,5 +51,5 @@
 Comment[tr]=LOG hedef iptables kural se��enekleri yay��n�� i��in eklenti
 Comment[xx]=xxPlugin for edition LOG target iptables rule optionsxx
 X-TDE-Library=libkmfruletargetoptionedit_log
-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptionedit_mac.desktop b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptionedit_mac.desktop
index 34d0f32..0338ec9 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptionedit_mac.desktop
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptionedit_mac.desktop
@@ -51,5 +51,5 @@
 Comment[tr]=MAC adresi tabanl�� iptables kural se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for edition MAC address based iptables rule optionsxx
 X-TDE-Library=libkmfruleoptionedit_mac
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptionedit_mark.desktop b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptionedit_mark.desktop
index c8a3237..b1091b1 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptionedit_mark.desktop
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptionedit_mark.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=MARK tabanl�� iptables kural�� se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing MARK based iptables rule optionsxx
 X-TDE-Library=libkmfruletargetoptionedit_mark
-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptionedit_nat.desktop b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptionedit_nat.desktop
index 0b12966..90655e0 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptionedit_nat.desktop
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptionedit_nat.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=NAT tabanl�� iptables kural�� se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing NAT based iptables rule optionsxx
 X-TDE-Library=libkmfruletargetoptionedit_nat
-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptionedit_protocol.desktop b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptionedit_protocol.desktop
index 94071d7..4644323 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptionedit_protocol.desktop
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptionedit_protocol.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=Protokol tabanl�� iptables kural se��enekleri yay��n��n�� d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for edition Protocol based iptables rule optionsxx
 X-TDE-Library=libkmfruleoptionedit_protocol
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptionedit_state.desktop b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptionedit_state.desktop
index 1ece0ad..ba9594b 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptionedit_state.desktop
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptionedit_state.desktop
@@ -52,5 +52,5 @@
 Comment[tr]=iptables kural durum se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing iptables rule State optionsxx
 X-TDE-Library=libkmfruleoptionedit_state
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedit_tos.desktop b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedit_tos.desktop
index e957c0c..cfe5246 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedit_tos.desktop
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedit_tos.desktop
@@ -53,5 +53,5 @@
 Comment[tr]=iptables kural�� s��n��r se��ene��ini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing iptables rule Limit optionsxx
 X-TDE-Library=libkmfruleoptionedit_tos
-ServiceTypes=KMyFirewall/RuleOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleOptionEdit
 
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedit_tos.desktop b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedit_tos.desktop
index 99020e4..fb85a73 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedit_tos.desktop
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedit_tos.desktop
@@ -53,5 +53,5 @@
 Comment[tr]= TOS (Servis T��r��) tabanl�� iptables kural�� se��eneklerini d��zenlemek i��in eklenti
 Comment[xx]=xxPlugin for editing TOS (Type Of Service) based iptables rule optionsxx
 X-TDE-Library=libkmfruletargetoptionedit_tos
-ServiceTypes=KMyFirewall/RuleTargetOptionEdit
+X-TDE-ServiceTypes=KMyFirewall/RuleTargetOptionEdit