- Revert r41880 and r41881 since they resulted in loss of semantic

  information

Pointed out by:	hrs

1 files changed, 97 insertions, 97 deletions

diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 52df757b36..ca4ee1b91b 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -16,78 +16,78 @@
 <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
   trademarks of 3Com Corporation.</para>">
 <!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "3Com&reg;">
+<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
 
 <!ENTITY tm-attrib.3ware "<para>3ware is a registered
   trademarks of 3ware Inc.</para>">
-<!ENTITY tm.3ware "3ware&reg;">
+<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
 <!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
   Adaptec, Inc.</para>">
-<!ENTITY adaptec "Adaptec&reg;">
+<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
 
 <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and
   PostScript are either registered trademarks or trademarks of Adobe
   Systems Incorporated in the United States and/or other
   countries.</para>">
-<!ENTITY acrobat "Acrobat&reg;">
-<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
-<!ENTITY adobe "Adobe&reg;">
-<!ENTITY postscript "PostScript&reg;">
+<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
+<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat&nbsp;Reader</trademark>">
+<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
+<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
   AMD Opteron, Athlon, Élan, Opteron, and PCnet are
   trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
-<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
-<!ENTITY athlon "Athlon&trade;">
-<!ENTITY elan "Élan&trade;">
-<!ENTITY opteron "Opteron&trade;">
+<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
+<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
+<!ENTITY athlon "<trademark>Athlon</trademark>">
+<!ENTITY elan "<trademark>Élan</trademark>">
+<!ENTITY opteron "<trademark>Opteron</trademark>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
 <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
   Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
   registered in the United States and other countries.</para>">
-<!ENTITY airport "AirPort&reg;">
-<!ENTITY apple "Apple&reg;">
-<!ENTITY firewire "FireWire&reg;">
-<!ENTITY imac "iMac&reg;">
-<!ENTITY mac "Mac&reg;">
-<!ENTITY macintosh "Macintosh&reg;">
-<!ENTITY macos "Mac&nbsp;OS&reg;">
-<!ENTITY quicktime "Quicktime&reg;">
-<!ENTITY truetype "TrueType&reg;">
+<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
+<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
+<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
+<!ENTITY imac "<trademark class='registered'>iMac</trademark>">
+<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
+<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
+<!ENTITY macos "<trademark class='registered'>Mac&nbsp;OS</trademark>">
+<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
+<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
 
 <!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
   Limited.</para>">
-<!ENTITY arm "ARM&reg;">
+<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
 <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are
   registered trademarks of Cisco Systems, Inc. and/or its affiliates
   in the United States and certain other countries.</para>">
-<!ENTITY catalyst "Catalyst&reg;">
-<!ENTITY ios "IOS&reg;">
+<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
+<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
 
 <!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
   or registered trademarks of Corel Corporation and/or its
   subsidiaries in Canada, the United States and/or other
   countries.</para>">
-<!ENTITY wordperfect "WordPerfect&reg;">
+<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
 
 <!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
 <!ENTITY tm-attrib.coverity "<para>Coverity is a registered trademark;
 Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of
 Coverity, Inc.</para>">
-<!ENTITY coverity "Coverity&reg;">
-<!ENTITY coverity.prevent "Coverity Prevent&reg;">
+<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
+<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
 
 <!-- http://www.creative.com/legal.asp -->
 <!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of
   Creative Technology Ltd. in the United States and/or other
   countries.</para>">
-<!ENTITY soundblaster "SoundBlaster&reg;">
+<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
 
 <!-- http://www.cvsup.org/ -->
 <!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
@@ -106,32 +106,32 @@ Coverity, Inc.</para>">
   PowerPC, PS/2, S/390, and ThinkPad are
   trademarks of International Business Machines Corporation in the
   United States, other countries, or both.</para>">
-<!ENTITY aix "AIX&reg;">
-<!ENTITY os2 "OS/2&reg;">
-<!ENTITY powerpc "PowerPC&reg;">
-<!ENTITY ps2 "PS/2&reg;">
-<!ENTITY s390 "S/390&reg;">
-<!ENTITY thinkpad "ThinkPad&reg;">
+<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
+<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
+<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
+<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
+<!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
+<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
 
 <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered
   trademarks of Institute of Electrical and Electronics Engineers,
   Inc. in the United States.</para>">
-<!ENTITY posix "POSIX&reg;">
+<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
 
 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
 <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
   trademarks of Intel Corporation or its subsidiaries in the United
   States and other countries.</para>">
-<!ENTITY celeron "Celeron&reg;">
-<!ENTITY etherexpress "EtherExpress&trade;">
-<!ENTITY i386 "i386&trade;">
-<!ENTITY i486 "i486&trade;">
-<!ENTITY intel "Intel&reg;">
-<!ENTITY itanium "Itanium&reg;">
-<!ENTITY pentium "Pentium&reg;">
-<!ENTITY xeon "Xeon&trade;">
-<!ENTITY core "Core&trade;">
+<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
+<!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
+<!ENTITY i386 "<trademark>i386</trademark>">
+<!ENTITY i486 "<trademark>i486</trademark>">
+<!ENTITY intel "<trademark class='registered'>Intel</trademark>">
+<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>">
+<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>">
+<!ENTITY xeon "<trademark>Xeon</trademark>">
+<!ENTITY core "<trademark>Core</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
@@ -141,60 +141,60 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either
   registered trademarks or trademarks of Iomega Corporation in the
   United States and/or other countries.</para>">
-<!ENTITY iomegazip "Zip&reg;">
-<!ENTITY jaz "Jaz&reg;">
+<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
+<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
 
 <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
   trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "EasyIO&trade;">
+<!ENTITY easyio "<trademark>EasyIO</trademark>">
 
 <!-- http://www.linuxmark.org/ -->
 <!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
   Linus Torvalds.</para>">
-<!ENTITY linux "Linux&reg;">
+<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
 <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
   MegaRAID and Mylex are trademarks or registered trademarks of LSI
   Logic Corp.</para>">
-<!ENTITY acceleraid "AcceleRAID&trade;">
-<!ENTITY megaraid "MegaRAID&reg;">
-<!ENTITY mylex "Mylex&reg;">
+<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
+<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
+<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
 
 <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are
   trademarks or registered trademarks of Macromedia, Inc. in the
   United States and/or other countries.</para>">
-<!ENTITY flash "Flash&trade;">
-<!ENTITY macromedia "Macromedia&reg;">
+<!ENTITY flash "<trademark>Flash</trademark>">
+<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
 
 <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
   Outlook, Windows, Windows Media and Windows NT are either
   registered trademarks or trademarks of Microsoft Corporation in the
   United States and/or other countries.</para>">
-<!ENTITY intellimouse "IntelliMouse&reg;">
-<!ENTITY microsoft "Microsoft&reg;">
+<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
+<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
 <!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!ENTITY ms-dos "MS-DOS&reg;">
-<!ENTITY outlook "Outlook&reg;">
-<!ENTITY windows "Windows&reg;">
-<!ENTITY windows.media "Windows Media&reg;">
+<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
+<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
+<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
+<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
 <!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
+<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
 <!ENTITY windowsxp "&windows;&nbsp;XP">
 
 <!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
   trademarks of MIPS Technologies, Inc. in the United States and other
   countries.</para>">
-<!ENTITY mips "MIPS&reg;">
+<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
 
 <!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "MySQL&trade;">
+<!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
 <!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are
   trademarks or registered trademarks of M-Systems Flash Disk
   Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "DiskOnChip&reg;">
+<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
 
 <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
 <!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of
@@ -203,14 +203,14 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
   are registered trademarks of Netscape Communications Corporation in
   the U.S. and other countries.</para>">
-<!ENTITY netscape "Netscape&reg;">
-<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
+<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
+<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
 
 <!-- http://www.nexthop.com/legal.shtml -->
 <!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and
   unregistered trademarks of NextHop in the U.S. and other
   countries.</para>">
-<!ENTITY gated "GateD&reg;">
+<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
 
 <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
   registered trademarks and IT DialTone and The Open Group are
@@ -218,31 +218,31 @@ Coverity, Inc.</para>">
   countries.</para>">
 <!ENTITY tm-attrib.unix "<para>UNIX is a registered trademarks of The
   Open Group in the United States and other countries.</para>">
-<!ENTITY motif "Motif&reg;">
-<!ENTITY unix "UNIX&reg;">
+<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
+<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
 
 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
 <!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark
   of Oracle Corporation.</para>">
-<!ENTITY oracle "Oracle&reg;">
+<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
 <!-- http://www.powerquest.com/legal/ -->
 <!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
   registered trademarks of PowerQuest Corporation in the United States
   and/or other countries.</para>">
-<!ENTITY partitionmagic "PartitionMagic&reg;">
+<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
 <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
   trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "Eudora&reg;">
+<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
 
 <!-- http://www.realnetworks.com/company/logos/policy.html -->
 <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
   RealAudio are the registered trademarks of RealNetworks,
   Inc.</para>">
-<!ENTITY realplayer "RealPlayer&reg;">
+<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
 
 <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
 <!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -253,22 +253,22 @@ Coverity, Inc.</para>">
 <!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or
   registered trademarks of SAP AG in Germany and in several other
   countries all over the world.</para>">
-<!ENTITY r3 "R/3&reg;">
-<!ENTITY sap "SAP&reg;">
+<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
+<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
 <!ENTITY sap.r3 "&sap;&nbsp;&r3;">
 
 <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are
   registered trademarks of Silicon Graphics, Inc., in the United
   States and/or other countries worldwide.</para>">
-<!ENTITY opengl "OpenGL&reg;">
+<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
 <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, and
   UltraSPARC are trademarks of SPARC International, Inc in the United
   States and other countries.  Products bearing SPARC trademarks are
   based upon architecture developed by Sun Microsystems, Inc.</para>">
-<!ENTITY sparc "Sparc&reg;">
-<!ENTITY sparc64 "Sparc64&reg;">
-<!ENTITY ultrasparc "UltraSPARC&reg;">
+<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
+<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
+<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
 
 <!-- http://www.sun.com/suntrademarks/ -->
 
@@ -277,17 +277,17 @@ Coverity, Inc.</para>">
   Solaris, StarOffice and
   SunOS are trademarks or registered trademarks of Sun Microsystems,
   Inc. in the United States and other countries.</para>">
-<!ENTITY java "Java&trade;">
-<!ENTITY java.virtual.machine "Java Virtual Machine&trade;">
-<!ENTITY jdk "JDK&trade;">
-<!ENTITY jre "JRE&trade;">
-<!ENTITY jsp "JSP&trade;">
-<!ENTITY jvm "JVM&trade;">
-<!ENTITY netra "Netra&trade;">
-<!ENTITY solaris "Solaris&trade;">
-<!ENTITY staroffice "StarOffice&trade;">
-<!ENTITY sun "Sun&trade;">
-<!ENTITY sunos "SunOS&trade;">
+<!ENTITY java "<trademark>Java</trademark>">
+<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
+<!ENTITY jdk "<trademark>JDK</trademark>">
+<!ENTITY jre "<trademark>JRE</trademark>">
+<!ENTITY jsp "<trademark>JSP</trademark>">
+<!ENTITY jvm "<trademark>JVM</trademark>">
+<!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY solaris "<trademark>Solaris</trademark>">
+<!ENTITY staroffice "<trademark>StarOffice</trademark>">
+<!ENTITY sun "<trademark>Sun</trademark>">
+<!ENTITY sunos "<trademark>SunOS</trademark>">
 
 <!-- http://www.symantec.com/legal/legal_note.html -->
 <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
@@ -297,39 +297,39 @@ Coverity, Inc.</para>">
 <!-- http://www.mathworks.com/company/trademarks.shtml -->
 <!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
   of The MathWorks, Inc.</para>">
-<!ENTITY matlab "MATLAB&reg;">
+<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
 
 <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
   Thomson.</para>">
-<!ENTITY speedtouch "SpeedTouch&trade;">
+<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
 
 <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
 <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
 <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are
   registered trademarks of U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "Sportster&reg;">
-<!ENTITY usrobotics "U.S. Robotics&reg;">
+<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
+<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
 
 <!-- http://www.maplesoft.com/trademarks.shtml -->
 <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
   trademarks or registered trademarks of Waterloo Maple Inc.</para>">
-<!ENTITY maple "Maple&trade;">
+<!ENTITY maple "<trademark>Maple</trademark>">
 
 <!-- http://www.wolfram.com/company/terms.html -->
 <!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
   trademark of Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "Mathematica&reg;">
+<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
 
 <!-- http://www.vmware.com/legal.html -->
 <!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
   Inc.</para>">
 
 <!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "Xen&trade;">
+<!ENTITY xen "<trademark>Xen</trademark>">
 
 <!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
   XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "XFree86&trade;">
+<!ENTITY xfree86 "<trademark>XFree86</trademark>">
 
 <!-- http://www.xiph.org/ -->
 <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks