Branch: master

d89a7e4c 2014-10-26 16:10:27 Timothy Pearson
Fix another incorrect renaming from the previous mimetype compliance patches
M mimetypes/application/mathml+xml.desktop
M mimetypes/application/relaxng.desktop
M mimetypes/application/xhtml+xml.desktop
M mimetypes/application/xml-dtd.desktop
M mimetypes/application/xml.desktop
M mimetypes/application/xsd.desktop
M mimetypes/text/html.desktop
M mimetypes/text/rtf.desktop
M mimetypes/text/vnd.wap.wml.desktop
M mimetypes/text/x-mswinurl.desktop
M mimetypes/text/x-xslfo.desktop
M mimetypes/text/x-xslt.desktop
M mimetypes/text/xml.desktop
diff --git a/mimetypes/application/mathml+xml.desktop b/mimetypes/application/mathml+xml.desktop
index 364dd69..18ad51d 100644
--- a/mimetypes/application/mathml+xml.desktop
+++ b/mimetypes/application/mathml+xml.desktop
@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=application/mathml+xml
 Patterns=*.mml;*.MML
-Icon=text-x-text-html
+Icon=text-html
 Hidden=false
 X-TDE-IsAlso=text/xml
 Comment=MathML Document
diff --git a/mimetypes/application/relaxng.desktop b/mimetypes/application/relaxng.desktop
index 3df8f41..b605e97 100644
--- a/mimetypes/application/relaxng.desktop
+++ b/mimetypes/application/relaxng.desktop
@@ -3,7 +3,7 @@
 Comment[af]=Ontspannende NG
 Comment[hi]=��������������������� ������������
 Comment[te]=������������������������ NG
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=application/xml
 X-TDE-IsAlso=text/xml
diff --git a/mimetypes/application/xhtml+xml.desktop b/mimetypes/application/xhtml+xml.desktop
index 58a5650..ab31172 100644
--- a/mimetypes/application/xhtml+xml.desktop
+++ b/mimetypes/application/xhtml+xml.desktop
@@ -77,7 +77,7 @@
 Comment[zh_HK]=XHTML ������������
 Comment[zh_TW]=XHTML Family ������
 Type=MimeType
-Icon=text-x-text-html
+Icon=text-html
 MimeType=application/xhtml+xml
 X-TDE-IsAlso=text/xml
 Patterns=*.xhtml
diff --git a/mimetypes/application/xml-dtd.desktop b/mimetypes/application/xml-dtd.desktop
index dbb0558..dde38f6 100644
--- a/mimetypes/application/xml-dtd.desktop
+++ b/mimetypes/application/xml-dtd.desktop
@@ -64,7 +64,7 @@
 Comment[zh_CN]=XML DTD ������
 Comment[zh_HK]=XML DTD ������
 Comment[zh_TW]=XML DTD ������
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 # RFC 3023
 MimeType=application/xml-dtd
diff --git a/mimetypes/application/xml.desktop b/mimetypes/application/xml.desktop
index 9b4f57e..dd403a6 100644
--- a/mimetypes/application/xml.desktop
+++ b/mimetypes/application/xml.desktop
@@ -76,7 +76,7 @@
 Comment[zh_CN]=XML ������
 Comment[zh_HK]=XML ������
 Comment[zh_TW]=XML ������
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=application/xml
 # This mimetype is an alias for text/xml. Both are referenced by the W3C.
diff --git a/mimetypes/application/xsd.desktop b/mimetypes/application/xsd.desktop
index f572222..831660a 100644
--- a/mimetypes/application/xsd.desktop
+++ b/mimetypes/application/xsd.desktop
@@ -64,7 +64,7 @@
 Comment[uz@cyrillic]=W3C XML ��������������
 Comment[vi]=Gi���n ����� XML W3C
 Comment[zh_CN]=W3C WML ������
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=application/xsd
 X-TDE-IsAlso=text/xml
diff --git a/mimetypes/text/html.desktop b/mimetypes/text/html.desktop
index 7b0c221..28f8456 100644
--- a/mimetypes/text/html.desktop
+++ b/mimetypes/text/html.desktop
@@ -76,7 +76,7 @@
 Comment[zh_CN]=HTML ������
 Comment[zh_HK]=HTML ������
 Comment[zh_TW]=HTML ������
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=text/html
 Patterns=*.html;*.HTML;*.htm;*.HTM;*.shtml;
diff --git a/mimetypes/text/rtf.desktop b/mimetypes/text/rtf.desktop
index 3ec971b..1d1ffe3 100644
--- a/mimetypes/text/rtf.desktop
+++ b/mimetypes/text/rtf.desktop
@@ -77,7 +77,7 @@
 Comment[zh_CN]=RTF ������
 Comment[zh_HK]=RTF ������
 Comment[zh_TW]=RTF ������
-Icon=text-x-text-rtf
+Icon=text-rtf
 Type=MimeType
 Patterns=*.rtf;*.RTF;
 [Property::X-TDE-text]
diff --git a/mimetypes/text/vnd.wap.wml.desktop b/mimetypes/text/vnd.wap.wml.desktop
index 8751bc3..4c365d2 100644
--- a/mimetypes/text/vnd.wap.wml.desktop
+++ b/mimetypes/text/vnd.wap.wml.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=text/vnd.wap.wml
 Patterns=*.wml;*.WML;
diff --git a/mimetypes/text/x-mswinurl.desktop b/mimetypes/text/x-mswinurl.desktop
index 63b9bda..0238845 100644
--- a/mimetypes/text/x-mswinurl.desktop
+++ b/mimetypes/text/x-mswinurl.desktop
@@ -2,7 +2,7 @@
 Type=MimeType
 MimeType=text/x-mswinurl
 Patterns=*.url;*.URL;
-Icon=text-x-text-html
+Icon=text-html
 Comment=Internet Shortcut
 Comment[af]=Internet Kortpad
 Comment[ar]=������������ ������������
diff --git a/mimetypes/text/x-xslfo.desktop b/mimetypes/text/x-xslfo.desktop
index 3118c1e..aae479a 100644
--- a/mimetypes/text/x-xslfo.desktop
+++ b/mimetypes/text/x-xslfo.desktop
@@ -78,7 +78,7 @@
 Comment[zh_HK]=XSL ������������������
 Comment[zh_TW]=XSL ������������������
 Comment[zu]=Ifayela Lokubonisa Lesakhiwo se-XSL
-Icon=text-x-text-html
+Icon=text-html
 MimeType=text/x-xslfo
 Patterns=*.fo;*.xslfo
 Type=MimeType
diff --git a/mimetypes/text/x-xslt.desktop b/mimetypes/text/x-xslt.desktop
index 3f68df7..14d1408 100644
--- a/mimetypes/text/x-xslt.desktop
+++ b/mimetypes/text/x-xslt.desktop
@@ -80,7 +80,7 @@
 Comment[zh_HK]=XSLT ������������������
 Comment[zh_TW]=XSLT ������������������
 Comment[zu]=Ifayela Lepheshana lesitayela lika-XSLT
-Icon=text-x-text-html
+Icon=text-html
 MimeType=text/x-xslt
 X-TDE-IsAlso=text/xml
 Patterns=*.xslt;*.xsl;
diff --git a/mimetypes/text/xml.desktop b/mimetypes/text/xml.desktop
index c64f3cf..1025f45 100644
--- a/mimetypes/text/xml.desktop
+++ b/mimetypes/text/xml.desktop
@@ -76,7 +76,7 @@
 Comment[zh_CN]=XML ������
 Comment[zh_HK]=XML ������
 Comment[zh_TW]=XML ������
-Icon=text-x-text-html
+Icon=text-html
 Type=MimeType
 MimeType=text/xml
 Patterns=*.xml;*.XML;