I finally had enough time to sit down and add long descriptions to the
shared-mime-info XML file, as announced under [1]. It's still not
complete, but at least some of the ugly strings were changed/shortened.

Hopefully sb. finds time to commit this, since my account is still not
renewed [2] and it's quiet a huge patch.

[1] http://lists.freedesktop.org/archives/xdg/2005-August/007250.html
[2] https://bugs.freedesktop.org/show_bug.cgi?id=3887
-- 
Christian Neumair <[EMAIL PROTECTED]>
Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.70
diff -u -p -r1.70 freedesktop.org.xml.in
--- freedesktop.org.xml.in	26 Aug 2005 15:35:25 -0000	1.70
+++ freedesktop.org.xml.in	7 Sep 2005 15:38:21 -0000
@@ -9,6 +9,9 @@
   <!ELEMENT comment (#PCDATA)>
   <!ATTLIST comment xml:lang CDATA #IMPLIED>
 
+  <!ELEMENT long-comment (#PCDATA)>
+  <!ATTLIST long-comment xml:lang CDATA #IMPLIED>
+
   <!ELEMENT glob EMPTY>
   <!ATTLIST glob pattern CDATA #REQUIRED>
 
@@ -46,7 +49,7 @@ COPYING.
 
 The latest version is available from:
 
-	http://www.freedesktop.org/standards/shared-mime-info.html
+	http://www.freedesktop.org/wiki/Software_2fshared_2dmime_2dinfo
 
 To extend this database, users and applications should create additional
 XML files in the 'packages' directory and run the update-mime-database
@@ -55,7 +58,8 @@ command to generate the output files.
 
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";>
   <mime-type type="application/andrew-inset">
-    <_comment>Andrew Toolkit inset</_comment>
+    <_comment>ATK inset</_comment>
+    <_long-comment>Andrew Toolkit inset</_long-comment>
     <glob pattern="*.ez"/>
   </mime-type>
   <mime-type type="application/illustrator">
@@ -93,10 +97,12 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/oda">
     <_comment>ODA document</_comment>
+    <_long-comment>Office Document Architecture document</_long-comment>
     <glob pattern="*.oda"/>
   </mime-type>
   <mime-type type="application/pdf">
     <_comment>PDF document</_comment>
+    <_long-comment>Portable Document Format document</_long-comment>
     <magic priority="50">
       <match type="string" value="%PDF-" offset="0"/>
     </magic>
@@ -112,6 +118,7 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/pgp-keys">
     <_comment>PGP keys</_comment>
+    <_long-comment>Pretty Good Privacy keys</_long-comment>
   </mime-type>
   <mime-type type="application/pgp-signature">
     <_comment>detached OpenPGP signature</_comment>
@@ -124,7 +131,8 @@ command to generate the output files.
     <glob pattern="*.p7s"/>
   </mime-type>
   <mime-type type="application/postscript">
-    <_comment>PostScript document</_comment>
+    <_comment>PS document</_comment>
+    <_long-comment>PostScript document</_long-comment>
     <magic priority="50">
       <match type="string" value="\004%!" offset="0"/>
       <match type="string" value="%!" offset="0"/>
@@ -133,7 +141,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/rtf">
     <sub-class-of type="text/plain"/>
-    <_comment>Rich Text Format</_comment>
+    <_comment>RTF document</_comment>
+    <_long-comment>Rich Text Format document</_long-comment>
     <magic priority="50">
       <match type="string" value="{\\rtf" offset="0"/>
     </magic>
@@ -141,7 +150,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/smil">
     <sub-class-of type="text/plain"/>
-    <_comment>Synchronized Multimedia Integration Language</_comment>
+    <_comment>SMIL document</_comment>
+    <_long-comment>Synchronized Multimedia Integration Language document</_long-comment>
     <glob pattern="*.smil"/>
     <glob pattern="*.smi"/>
     <glob pattern="*.sml"/>
@@ -171,11 +181,13 @@ command to generate the output files.
     <glob pattern="*.cdr"/>
   </mime-type>
   <mime-type type="application/vnd.hp-hpgl">
-    <_comment>HP Graphics Language (plotter)</_comment>
+    <_comment>HPGL file</_comment>
+    <_long-comment>HP Graphics Language file</_long-comment>
     <glob pattern="*.hpgl"/>
   </mime-type>
   <mime-type type="application/vnd.hp-pcl">
-    <_comment>HP Printer Control Language file</_comment>
+    <_comment>PCL file</_comment>
+    <_long-comment>HP Printer Control Language file</_long-comment>
     <glob pattern="*.pcl"/>
   </mime-type>
   <mime-type type="application/vnd.lotus-1-2-3">
@@ -191,7 +203,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.mozilla.xul+xml">
     <sub-class-of type="text/xml"/>
-    <_comment>XML User Interface Language document</_comment>
+    <_comment>XUL document</_comment>
+    <_long-comment>XML User Interface Language document</_long-comment>
     <glob pattern="*.xul"/>
   </mime-type>
   <mime-type type="application/vnd.ms-access">
@@ -202,7 +215,8 @@ command to generate the output files.
     <glob pattern="*.mdb" />
  </mime-type>
  <mime-type type="application/vnd.ms-excel">
-    <_comment>Microsoft Excel spreadsheet</_comment>
+    <_comment>Excel spreadsheet</_comment>
+    <_long-comment>Microsoft Excel spreadsheet</_long-comment>
     <magic priority="50">
       <match type="string" value="Microsoft Excel 5.0 Worksheet" offset="2080"/>
     </magic>
@@ -217,7 +231,8 @@ command to generate the output files.
     <alias type="application/msexcel"/>
   </mime-type>
   <mime-type type="application/vnd.ms-powerpoint">
-    <_comment>Microsoft PowerPoint presentation</_comment>
+    <_comment>PowerPoint presentation</_comment>
+    <_long-comment>Microsoft PowerPoint presentation</_long-comment>
     <glob pattern="*.ppz"/>
     <glob pattern="*.ppt"/>
     <glob pattern="*.pps"/>
@@ -278,43 +293,53 @@ command to generate the output files.
     <glob pattern="*.sgl"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc">
-    <_comment>OpenOffice.org Calc spreadsheet</_comment>
+    <_comment>OpenOffice Calc</_comment>
+    <_long-comment>OpenOffice.org Calc spreadsheet</_long-comment>
     <glob pattern="*.sxc"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc.template">
+    <_comment>OpenOffice Calc template</_comment>
     <_comment>OpenOffice.org Calc spreadsheet template</_comment>
     <glob pattern="*.stc"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw">
-    <_comment>OpenOffice.org Draw drawing</_comment>
+    <_comment>OpenOffice Draw</_comment>
+    <_long-comment>OpenOffice.org Draw drawing</_long-comment>
     <glob pattern="*.sxd"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw.template">
-    <_comment>OpenOffice.org Draw drawing template</_comment>
+    <_comment>OpenOffice Draw template</_comment>
+    <_long-comment>OpenOffice.org Draw drawing template</_long-comment>
     <glob pattern="*.std"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress">
-    <_comment>OpenOffice.org Impress presentation</_comment>
+    <_comment>OpenOffice Impress</_comment>
+    <_long-comment>OpenOffice.org Impress presentation</_long-comment>
     <glob pattern="*.sxi"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress.template">
-    <_comment>OpenOffice.org Impress presentation template</_comment>
+    <_comment>OpenOffice Impress template</_comment>
+    <_long-comment>OpenOffice.org Impress presentation template</_long-comment>
     <glob pattern="*.sti"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.math">
-    <_comment>OpenOffice.org Math formula</_comment>
+    <_comment>OpenOffice Math</_comment>
+    <_long-comment>OpenOffice.org Math formula</_long-comment>
     <glob pattern="*.sxm"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer">
-    <_comment>OpenOffice.org Writer document</_comment>
+    <_comment>OpenOffice Writer</_comment>
+    <_long-comment>OpenOffice.org Writer document</_long-comment>
     <glob pattern="*.sxw"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.global">
-    <_comment>OpenOffice.org Writer global document</_comment>
+    <_comment>OpenOffice Writer global</_comment>
+    <_long-comment>OpenOffice.org Writer global document</_long-comment>
     <glob pattern="*.sxg"/>
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.template">
-    <_comment>OpenOffice.org Writer document template</_comment>
+    <_comment>OpenOffice Writer template</_comment>
+    <_long-comment>OpenOffice.org Writer document template</_long-comment>
     <glob pattern="*.stw"/>
   </mime-type>
   <mime-type type="application/vnd.oasis.opendocument.text">
@@ -386,6 +411,7 @@ command to generate the output files.
   <mime-type type="application/x-xbel">
     <sub-class-of type="text/plain"/>
     <_comment>XBEL bookmarks</_comment>
+    <_long-comment>XML Bookmark Exchange Language bookmarks</_long-comment>
     <magic priority="50">
       <match type="string" value="&lt;!DOCTYPE\ xbel" offset="0:64"/>
     </magic>
@@ -461,7 +489,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/x-asp">
     <sub-class-of type="text/plain"/>
-    <_comment>active server page</_comment>
+    <_comment>ASP</_comment>
+    <_long-comment>Active Server Pagee</_long-comment>
     <glob pattern="*.asp"/>
   </mime-type>
   <mime-type type="application/x-awk">
@@ -1859,7 +1888,8 @@ command to generate the output files.
     <glob pattern="*.xcf.bz2"/>
   </mime-type>
   <mime-type type="application/dicom">
-    <_comment>Digital Imaging and Communications in Medicine image</_comment>
+    <_comment>DICOM image</_comment>
+    <_long-comment>Digital Imaging and Communications in Medicine image</_long-comment>
     <glob pattern="*.dcm"/>
     <magic priority="50">
       <match type="string" value="DICM" offset="128"/>
@@ -1904,7 +1934,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="image/x-eps">
     <sub-class-of type="application/postscript"/>
-    <_comment>Encapsulated PostScript image</_comment>
+    <_comment>EPS image</_comment>
+    <_long-comment>Encapsulated PostScript image</_long-comment>
     <magic priority="50">
       <match type="string" value="%!" offset="0">
         <match type="string" value="EPS" offset="15"/>
@@ -1918,7 +1949,8 @@ command to generate the output files.
     <glob pattern="*.epsf"/>
   </mime-type>
   <mime-type type="image/x-fits">
-    <_comment>Flexible Image Transport System</_comment>
+    <_comment>FITS document</_comment>
+    <_long-comment>Flexible Image Transport System document</_long-comment>
     <magic priority="50">
       <match type="string" value="SIMPLE  =" offset="0"/>
     </magic>
@@ -2179,7 +2211,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/css">
     <sub-class-of type="text/plain"/>
-    <_comment>Cascading Style Sheet</_comment>
+    <_comment>CSS stylesheet</_comment>
+    <_long-comment>Cascading Style Sheets stylesheet</_long-comment>
     <glob pattern="*.css"/>
     <glob pattern="*.CSSL"/>
   </mime-type>
@@ -2216,7 +2249,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/rdf">
     <sub-class-of type="text/plain"/>
-    <_comment>Resource Description Framework (RDF) file</_comment>
+    <_comment>RDF file</_comment>
+    <_long-comment>Resource Description Framework file</_long-comment>
     <glob pattern="*.rdf"/>
   </mime-type>
   <mime-type type="text/rfc822-headers">
@@ -2230,10 +2264,12 @@ command to generate the output files.
   <mime-type type="text/rss">
     <sub-class-of type="text/plain"/>
     <_comment>RDF Site Summary</_comment>
+    <_long-comment>Resource Description Framework Site Summary</_long-comment>
     <glob pattern="*.rss"/>
   </mime-type>
   <mime-type type="text/sgml">
     <_comment>SGML document</_comment>
+    <_long-comment>Standard Generalized Markup Language document</_long-comment>
     <glob pattern="*.sgml"/>
     <glob pattern="*.sgm"/>
   </mime-type>
@@ -2247,11 +2283,13 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/tab-separated-values">
     <sub-class-of type="text/plain"/>
-    <_comment>text document (with tab-separated values)</_comment>
+    <_comment>TSV document</_comment>
+    <_long-comment>text document (with tab-separated values)</_long-comment>
     <glob pattern="*.tsv"/>
   </mime-type>
   <mime-type type="text/vnd.wap.wml">
     <_comment>WML document</_comment>
+    <_long-comment>Wireless Markup Language document</_long-comment>
     <glob pattern="*.wml"/>
   </mime-type>
   <mime-type type="text/x-adasrc">
@@ -2267,12 +2305,13 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-bibtex">
     <sub-class-of type="text/plain"/>
-    <_comment>Bibtex bibliographic data</_comment>
+    <_comment>BibTeX document</_comment>
     <glob pattern="*.bib"/>
   </mime-type>
   <mime-type type="text/x-c++hdr">
     <sub-class-of type="text/plain"/>
-    <_comment>C++ source code header</_comment>
+    <_comment>C++ header</_comment>
+    <_long-comment>C++ source code header</_long-comment>
     <glob pattern="*.hh"/>
     <glob pattern="*.hpp"/>
   </mime-type>
@@ -2287,24 +2326,28 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-chdr">
     <sub-class-of type="text/plain"/>
-    <_comment>C source code header</_comment>
+    <_comment>C header</_comment>
+    <_long-comment>C source code header</_long-comment>
     <glob pattern="*.h"/>
     <glob pattern="*.h++"/>
     <glob pattern="*.hp"/>
   </mime-type>
   <mime-type type="text/x-comma-separated-values">
     <sub-class-of type="text/plain"/>
-    <_comment>text document (with comma-separated values)</_comment>
+    <_comment>CSV document</_comment>
+    <_long-comment>text document (with comma-separated values)</_long-comment>
     <glob pattern="*.csv"/>
   </mime-type>
   <mime-type type="text/x-copying">
     <sub-class-of type="text/plain"/>
-    <_comment>software license terms</_comment>
+    <_comment>license terms</_comment>
+    <_long-comment>software license terms</_long-comment>
     <glob pattern="COPYING"/>
   </mime-type>
   <mime-type type="text/x-credits">
     <sub-class-of type="text/plain"/>
-    <_comment>software author credits</_comment>
+    <_comment>author credits</_comment>
+    <_long-comment>software author credits</_long-comment>
     <glob pattern="CREDITS"/>
   </mime-type>
   <mime-type type="text/x-csrc">
@@ -2320,10 +2363,12 @@ command to generate the output files.
   <mime-type type="text/x-dcl">
     <sub-class-of type="text/plain"/>
     <_comment>DCL script</_comment>
+    <_long-comment>Data Conversion Laboratory script</_long-comment>
     <glob pattern="*.dcl"/>
   </mime-type>
   <mime-type type="text/x-dsl">
     <_comment>DSSSL document</_comment>
+    <_long-comment>Document Style Semantics and Specification Language document</_long-comment>
     <glob pattern="*.dsl"/>
   </mime-type>
   <mime-type type="text/x-dsrc">
@@ -2333,7 +2378,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-dtd">
     <sub-class-of type="text/plain"/>
-    <_comment>document type definition</_comment>
+    <_comment>DTD file</_comment>
+    <_long-comment>Document Type Definition file</_long-comment>
     <glob pattern="*.dtd"/>
   </mime-type>
   <mime-type type="text/x-emacs-lisp">
@@ -2354,16 +2400,17 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-gettext-translation">
     <sub-class-of type="text/plain"/>
-    <_comment>translated messages</_comment>
+    <_comment>translation</_comment>
     <glob pattern="*.po"/>
   </mime-type>
   <mime-type type="text/x-gettext-translation-template">
     <sub-class-of type="text/plain"/>
-    <_comment>message translation template</_comment>
+    <_comment>translation template</_comment>
     <glob pattern="*.pot"/>
   </mime-type>
   <mime-type type="text/html">
-    <_comment>HTML page</_comment>
+    <_comment>HTML document</_comment>
+    <_long-comment>HyperText Markup Language Document</_long-comment>
     <magic priority="50">
       <match type="string" value="&lt;!DOCTYPE HTML" offset="0:64"/>
       <match type="string" value="&lt;!doctype html" offset="0:64"/>
@@ -2388,7 +2435,7 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-gtkrc">
     <sub-class-of type="text/plain"/>
-    <_comment>GTK configuration</_comment>
+    <_comment>GTK+ configuration</_comment>
     <glob pattern="gtkrc"/>
     <glob pattern=".gtkrc"/>
   </mime-type>
@@ -2400,11 +2447,13 @@ command to generate the output files.
   <mime-type type="text/x-idl">
     <sub-class-of type="text/plain"/>
     <_comment>IDL document</_comment>
+    <_long-comment>Interface Definition Language document</_long-comment>
     <glob pattern="*.idl"/>
   </mime-type>
   <mime-type type="text/x-install">
     <sub-class-of type="text/plain"/>
-    <_comment>software installation instructions</_comment>
+    <_comment>installation instructions</_comment>
+    <_long-comment>software installation instructions</_long-comment>
     <glob pattern="INSTALL"/>
   </mime-type>
   <mime-type type="text/x-java">
@@ -2420,7 +2469,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-literate-haskell">
     <sub-class-of type="text/plain"/>
-    <_comment>Literate haskell source code</_comment>
+    <_comment>LHS source code</_comment>
+    <_long-comment>Literate Haskell source code</_long-comment>
     <glob pattern="*.lhs"/>
   </mime-type>
   <mime-type type="text/x-log">
@@ -2452,7 +2502,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/x-patch">
     <sub-class-of type="text/plain"/>
-    <_comment>differences between files</_comment>
+    <_comment>Diff file</_comment>
+    <_long-comment>differences between files</_long-comment>
     <magic priority="50">
       <match type="string" value="diff\t" offset="0"/>
       <match type="string" value="diff " offset="0"/>
@@ -2550,11 +2601,13 @@ command to generate the output files.
     <glob pattern="*.url"/>
   </mime-type>
   <mime-type type="text/x-xmi">
-    <_comment>XML Metadata Interchange file</_comment>
+    <_comment>XMI file</_comment>
+    <_long-comment>XML Metadata Interchange file</_long-comment>
     <glob pattern="*.xmi"/>
   </mime-type>
   <mime-type type="text/x-xslfo">
-    <_comment>XSL Formating Object file</_comment>
+    <_comment>XSL FO file</_comment>
+    <_long-comment>XSL Formatting Objects file</_long-comment>
     <glob pattern="*.fo"/>
     <glob pattern="*.xslfo"/>
   </mime-type>
@@ -2562,6 +2615,7 @@ command to generate the output files.
     <sub-class-of type="text/plain"/>
     <sub-class-of type="text/xml"/>
     <_comment>XSLT stylesheet</_comment>
+    <_long-comment>eXtensible Stylesheet Language Transformation stylesheet</_long-comment>
     <glob pattern="*.xslt"/>
     <glob pattern="*.xsl"/>
   </mime-type>
@@ -2572,7 +2626,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="text/xml">
     <sub-class-of type="text/plain"/>
-    <_comment>eXtensible Markup Language document</_comment>
+    <_comment>XML document</_comment>
+    <_long-comment>eXtensible Markup Language document</_long-comment>
     <magic priority="50">
       <match type="string" value="&lt;?xml" offset="0"/>
     </magic>
@@ -2583,6 +2638,7 @@ command to generate the output files.
   </mime-type>
   <mime-type type="video/mpeg">
     <_comment>MPEG video</_comment>
+    <_long-comment>Moving Picture Experts Group video</_long-comment>
     <magic priority="50">
       <match type="string" value="\x47\x3f\xff\x10" offset="0"/>
       <match type="big32" value="0x000001b3" offset="0"/>
@@ -2596,7 +2652,8 @@ command to generate the output files.
     <glob pattern="*.dat"/>
   </mime-type>
   <mime-type type="video/quicktime">
-    <_comment>QuickTime video</_comment>
+    <_comment>QT video</_comment>
+    <_long-comment>QuickTime video</_long-comment>
     <magic priority="50">
       <match type="string" value="mdat" offset="12"/>
       <match type="string" value="mdat" offset="4"/>
@@ -2619,9 +2676,11 @@ command to generate the output files.
   </mime-type>
   <mime-type type="video/x-avi">
     <_comment>AVI video</_comment>
+    <_long-comment>Audio Video Interleave video</_long-comment>
   </mime-type>
   <mime-type type="video/x-flic">
-    <_comment>AutoDesk FLIC animation</_comment>
+    <_comment>FLIC animation</_comment>
+    <_long-comment>AutoDesk FLI/FLC animation</_long-comment>
     <magic priority="50">
       <match type="little16" value="0xAF11" offset="0"/>
       <match type="little16" value="0xAF12" offset="0"/>
@@ -2631,10 +2690,12 @@ command to generate the output files.
   </mime-type>
   <mime-type type="video/x-mng">
     <_comment>MNG animation</_comment>
+    <_long-comment>Multiple-Image Network Graphics animation</_long-comment>
     <glob pattern="*.mng"/>
   </mime-type>
   <mime-type type="video/x-ms-asf">
-    <_comment>Microsoft ASF video</_comment>
+    <_comment>MS ASF video</_comment>
+    <_long-comment>Microsoft Advanced Streaming Format video</_long-comment>
     <glob pattern="*.asf"/>
     <glob pattern="*.asx"/>
     <magic priority="50">
@@ -2643,11 +2704,13 @@ command to generate the output files.
     </magic>
   </mime-type>
   <mime-type type="video/x-ms-wmv">
-    <_comment>Microsoft WMV video</_comment>
+    <_comment>MS WMV video</_comment>
+    <_long-comment>Microsoft Windows Media Video video</_long-comment>
     <glob pattern="*.wmv"/>
   </mime-type>
   <mime-type type="video/x-msvideo">
-    <_comment>Microsoft AVI video</_comment>
+    <_comment>MS AVI video</_comment>
+    <_long-comment>Microsoft Audio Video Interleave video</_long-comment>
     <magic priority="50">
       <match type="string" value="AVI " offset="8"/>
       <match type="string" value="RIFF" offset="0"/>
@@ -2655,7 +2718,8 @@ command to generate the output files.
     <glob pattern="*.avi"/>
   </mime-type>
   <mime-type type="video/x-nsv">
-    <_comment>Nullsoft video</_comment>
+    <_comment>NSV video</_comment>
+    <_long-comment>NullSoft Video video</_long-comment>
     <magic priority="50">
       <match type="string" value="NSVf" offset="0"/>
     </magic>

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
xdg mailing list
xdg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xdg

Reply via email to