aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--el_GR.ISO8859-7/share/xml/trademarks.ent206
-rw-r--r--es_ES.ISO8859-1/share/xml/trademarks.ent194
-rw-r--r--fr_FR.ISO8859-1/share/xml/trademarks.ent180
-rw-r--r--hu_HU.ISO8859-2/share/xml/trademarks.ent206
-rw-r--r--mn_MN.UTF-8/share/xml/trademarks.ent202
-rw-r--r--nl_NL.ISO8859-1/share/xml/trademarks.ent206
-rw-r--r--ru_RU.KOI8-R/share/xml/trademarks.ent186
-rw-r--r--share/xml/trademarks.ent212
-rw-r--r--zh_CN.GB2312/share/xml/trademarks.ent206
-rw-r--r--zh_TW.Big5/share/xml/trademarks.ent194
10 files changed, 999 insertions, 993 deletions
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index 5c31a29e54..b07e0897be 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -25,80 +25,80 @@
<!ENTITY tm-attrib.3com "<para> 3Com HomeConnect
3Com Corporation.</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para> 3ware Escalade
3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para> Adaptec
Adaptec, Inc.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para> Adobe, Acrobat, Acrobat
Reader, PostScript
Adobe Systems Incorporated /
.</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para> AMD, AMD
Athlon, AMD Opteron, &Eacute;lan, PCnet
Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!ENTITY tm-attrib.apple "<para> Apple, AirPort, FireWire, Mac,
Macintosh, Mac OS, Quicktime, TrueType Apple
Computer, Inc.,
.</para>">
-<!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 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 tm-attrib.arm "<para> ARM
ARM Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para> Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para> Corel WordPerfect
Corel Corporation /
, /
.</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para> Coverity
. Coverity Extend,
Coverity Prevent Coverity Prevent SQS
Coverity, Inc.</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para> Sound Blaster
Creative Technology Ltd. /
.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para> CVSup
@@ -107,7 +107,7 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.freebsd "<para> FreeBSD
FreeBSD Foundation.</para>">
-<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
+<!ENTITY fujitsu "Fujitsu&reg;">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para> Heidelberg,
@@ -119,32 +119,32 @@ Coverity, Inc.</para>">
OS/2, PowerPC, PS/2, S/390, ThinkPad
International Business Machines Corporation ,
, .</para>">
-<!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 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 tm-attrib.ieee "<para> IEEE, POSIX, 802
Institute of Electrical and Electronics
Engineers, Inc. .</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!ENTITY tm-attrib.intel "<para> Intel, Celeron, EtherExpress,
i386, i486, Itanium, Pentium, Xeon
Intel Corporation
.</para>">
-<!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 core "<trademark>Core</trademark>">
-<!ENTITY xeon "<trademark>Xeon</trademark>">
+<!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 core "Core&trade;">
+<!ENTITY xeon "Xeon&trade;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para> Intuit Quicken
@@ -155,60 +155,60 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.iomega "<para> Iomega, Zip, Jaz
Iomega
Corporation / .</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para> Lantronix EasyIO
Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para> Linux
Linus Torvalds .</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para> LSI Logic, AcceleRAID,
eXtremeRAID, MegaRAID Mylex
LSI Logic Corp.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para> Macromedia, Flash,
Shockwave
Macromedia, Inc. / .</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para> Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, Windows NT
Microsoft Corporation
/ .</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para> MIPS R4000
MIPS Technologies, Inc.
.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para> M-Systems DiskOnChip
M-Systems Flash Disk
Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para> NetBSD
@@ -217,14 +217,14 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.netscape "<para> Netscape Netscape Navigator
Netscape Communications Corporation
.. .</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para> GateD NextHop
NextHop
... .</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para> Motif, OSF/1, UNIX
IT
@@ -233,31 +233,31 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.unix "<para> UNIX
Open Group
.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para> Oracle
Oracle Corporation.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para> PowerQuest PartitionMagic
PowerQuest Corporation
/ .</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para> QUALCOMM Eudora
QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para> RealNetworks, RealPlayer
RealAudio RealNetworks,
Inc.</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -268,23 +268,23 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.sap "<para> SAP, R/3, mySAP
SAP AG
.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para> Silicon Graphics, SGI,
OpenGL Silicon Graphics, Inc.
/ .</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para> SPARC, SPARC64,
UltraSPARC SPARC International,
Inc. . SPARC International
Inc. SPARC
, .</para>">
-<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "SPARC&reg;">
+<!ENTITY sparc64 "SPARC64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -293,19 +293,19 @@ Coverity, Inc.</para>">
Solaris, StarOffice, SunOS
VirtualBox Sun
Microsystems, Inc. .</para>">
-<!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 openjdk "<trademark>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark>Solaris</trademark>">
-<!ENTITY staroffice "<trademark>StarOffice</trademark>">
-<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sunos "<trademark>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!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 openjdk "OpenJDK&trade;">
+<!ENTITY solaris "Solaris&trade;">
+<!ENTITY staroffice "StarOffice&trade;">
+<!ENTITY sun "Sun&trade;">
+<!ENTITY sunos "SunOS&trade;">
+<!ENTITY virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para> Symantec Ghost
@@ -315,40 +315,40 @@ Coverity, Inc.</para>">
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para> MATLAB
The MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para> SpeedTouch
Thomson</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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
Sportster U.S. Robotics
Corporation.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para> Waterloo Maple
Maple Waterloo Maple Inc.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para> Mathematica
Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para> VMware
VMware, Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para> XFree86
The XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para> Ogg Vorbis Xiph.Org
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index ca4ee1b91b..52df757b36 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 "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware is a registered
trademarks of 3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- 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 "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!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 "<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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- 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 "<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>">
+<!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;">
<!-- 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 "<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 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 tm-attrib.arm "<para>ARM is a registered trademark of ARM
Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!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 "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY ios "IOS&reg;">
<!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 "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- 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 "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- 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 "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- 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 "<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 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 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 "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY posix "POSIX&reg;">
<!-- 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 "<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>">
+<!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;">
<!-- 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 "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
Linus Torvalds.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- 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 "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!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 "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!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 "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!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 "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- 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 "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- 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 "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- 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 "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!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 "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- 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 "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- 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 "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- 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 "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- 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 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!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 "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!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 "<trademark class='registered'>Sparc</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "Sparc&reg;">
+<!ENTITY sparc64 "Sparc64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- 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 "<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>">
+<!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;">
<!-- 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 "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
Thomson.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- 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 "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
trademark of Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- 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 "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 68c640547d..122c088468 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -19,58 +19,58 @@
<!ENTITY tm-attrib.3com "<para>3Com et HomeConnect sont des marques
dposes de 3Com Corporation.</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques
dposes de 3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- 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 "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!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 "<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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- 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, et PCnet sont
des marques de Advanced Micro Devices, Inc.</para>">
-<!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>">
+<!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;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
Quicktime, et TrueType sont des marques d'Apple Computer, Inc.,
dposes aux Etats Unis et dans d'autres pays.</para>">
-<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
-<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
-<!ENTITY firewire "<trademark class='registered'>FireWire</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 airport "AirPort&reg;">
+<!ENTITY apple "Apple&reg;">
+<!ENTITY firewire "FireWire&reg;">
+<!ENTITY mac "Mac&reg;">
+<!ENTITY macintosh "Macintosh&reg;">
+<!ENTITY macos "Mac&nbsp;OS&reg;">
+<!ENTITY quicktime "Quicktime&reg;">
+<!ENTITY truetype "TrueType&reg;">
<!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM
Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!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 "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks
or registered trademarks of Corel Corporation and/or its
@@ -81,7 +81,7 @@
<!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 "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup est une marque dpose de
@@ -99,30 +99,30 @@
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, 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 "<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 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 tm-attrib.ieee "<para>IEEE, POSIX, et 802 sont des marques dposes de
Institute of Electrical and Electronics Engineers,
Inc. aux Etats Unis.</para>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY posix "POSIX&reg;">
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, et Xeon sont des marques ou des marques
dposes d'Intel Corporation ou de ses filiales aux Etats Unis
et dans d'autres pays.</para>">
-<!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 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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered
@@ -132,60 +132,60 @@
<!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 "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are
trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux est une marque
dpose de Linus Torvalds.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- 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 "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!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 "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, et Windows NT sont soit des marques
soit des marques dposes de Microsoft Corporation aux
Etats Unis ou dans d'autres pays.</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!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 "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- 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 "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSD est une marque
@@ -194,14 +194,14 @@
<!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 "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD et NextHop sont des marques
dposes ou non de NextHop aux Etats Unis et dans d'autres
pays.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, et UNIX
sont des marques dposes et IT DialTone et The Open
@@ -210,25 +210,25 @@
<!ENTITY tm-attrib.unix "<para>UNIX est une marque
dpose de l'Open Group aux Etats Unis et dans d'autres
pays.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- 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 "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- 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 "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and
@@ -244,40 +244,40 @@
<!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 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!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 "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, et
UltraSPARC sont des marques de SPARC International, Inc aux Etats
Unis et dans d'autres pays. Les produits utilisant les marques
SPARC sont bass sur une architecture
dveloppe par Sun Microsystems, Inc.</para>">
-<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "Sparc&reg;">
+<!ENTITY sparc64 "Sparc64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
Virtual Machine, JDK, JRE, JSP, JVM, Netra,
Solaris, StarOffice, et
SunOS sont des marques ou des marques dposes de Sun
Microsystems, Inc. aux Etats Unis et dans d'autres pays.</para>">
-<!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>">
+<!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;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered
@@ -287,29 +287,29 @@
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark
of The MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of
Thomson</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple et Maple sont
des marques ou des marques dposes de Waterloo Maple
Inc.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica est une marque
dpose de Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware est une marque de VMware,
@@ -317,7 +317,7 @@
<!ENTITY tm-attrib.xfree86 "<para>XFree86 est une marque de
XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis et Xiph.Org sont des
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index 818f97117d..3fe69b4c57 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -21,82 +21,82 @@
<!ENTITY tm-attrib.3com "<para>A 3Com s HomeConnect a 3Com Corporation
bejegyzett vdjegyei.</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>A 3ware a 3ware Inc.
bejegyzett vdjegyei.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>A Adaptec az Adaptec, Inc. bejegyzett
vdjegye.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Az Adobe, Acrobat, Acrobat Reader, s
PostScript az Adobe Systems Incorporated bejegyzett vdjegyei, vagy
vdjegyei az Egyeslt llamokban s/vagy ms
orszgokban.</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>Az AMD, AMD Athlon,
AMD Opteron, Athlon, lan, Opteron s PCnet
az Advanced Micro Devices, Inc. vdjegyei.</para>">
-<!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>">
+<!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;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Az Apple, AirPort, FireWire, Mac, Macintosh,
Mac OS, Quicktime, s TrueType az Apple Computer, Inc.,
bejegyzett vdjegyei az Egyeslt llamokban
s ms orszgokban.</para>">
-<!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 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 tm-attrib.arm "<para>Az ARM az ARM Limited bejegyzett
vdjegye.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>A Cisco, Catalyst s IOS
a Cisco Systems, Inc. s/vagy trsvllalatainak
bejegyzett vdjegyei az Egyeslt llamokban s
nhny ms orszgban.</para>">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>A Corel s WordPerfect a
Corel Corporation s/vagy lenyvllalatainak
bejegyzett vdjegye Kanadban, az Egyeslt
llamokban s/vagy ms orszgokban.</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para>A Coverity bejegyzett
vdjegye, a Coverity Extend, Coverity Prevent s Coverity
Prevent SQS pedig vdjegyei a Coverity, Inc.-nek.</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>A Sound Blaster a Creative Technology Ltd.
vdjegye az Egyeslt llamokban s/vagy ms
orszgokban.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>A CVSup John D. Polstra bejegyzett
@@ -105,7 +105,7 @@
<!ENTITY tm-attrib.freebsd "<para>A FreeBSD a FreeBSD Foundation
bejegyzett vdjegye.</para>">
-<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
+<!ENTITY fujitsu "Fujitsu&reg;">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para>A Heidelberg, Helvetica,
@@ -117,18 +117,18 @@
PowerPC, PS/2, S/390 s ThinkPad az International Business Machines
Corporation vdjegyei az Egyeslt llamokban,
ms orszgokban, vagy mindkettben.</para>">
-<!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 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 tm-attrib.ieee "<para>Az IEEE, POSIX s 802 az
Institute of Electrical and Electronics Engineers, Inc. bejegyzett
vdjegyei az Egyeslt llamokban.</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Az Intel, Celeron, EtherExpress, i386,
@@ -136,15 +136,15 @@
lenyvllalatainak vdjegyei vagy bejegyzett
vdjegyei az Egyeslt llamokban s ms
orszgokban.</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Az Intuit s Quicken az Intuit Inc.,
@@ -156,61 +156,61 @@
<!ENTITY tm-attrib.iomega "<para>Az Iomega, Zip s Jaz az Iomega
bejegyzett vdjegyei vagy vdjegyei az Egyeslt
llamokban s/vagy ms orszgokban.</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>A Lantronix s EasyIO a Lantronix
Corporation vdjegyei.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>A Linux Linus Torvalds bejegyzett
vdjegye.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>Az LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID s Mylex az LSI Logic Corp. vdjegyei vagy bejegyzett
vdjegyei.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>A Macromedia, Flash s Shockwave
a Macromedia, Inc. vdjegyei s/vagy bejegyzett
vdjegyei az Egyeslt llamokban s/vagy ms
orszgokban.</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>A Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media s Windows NT a Microsoft Corporation
bejegyzett veacute;djegyei, vagy vdjegyei az Egyeslt
llamokban s/vagy ms orszgokban.</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para>A MIPS s R4000 a MIPS Technologies, Inc.
bejegyzett vdjegyei az Egyeslt llamokban s
ms orszgokban.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>Az M-Systems s DiskOnChip az
M-Systems Flash Disk Pioneers, Ltd. vdjegyei vagy bejegyzett
vdjegyei.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>A NetBSD a NetBSD Foundation bejegyzett
@@ -220,14 +220,14 @@
a Netscape Communications Corporation bejegyzett vdjegyei az
Egyeslt llamokban s ms
orszgokban.</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>A GateD s NextHopa NextHop
bejegyzett s nem bejegyzett vdjegyei az Egyeslt
llamokban s ms orszgokban.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>A Motif, OSF/1 s UNIX a
The Open Group bejegyzett vdjegyei, az IT DialTone s
@@ -236,30 +236,30 @@
<!ENTITY tm-attrib.unix "<para>A UNIX a The Open Group bejegyzett
vdjegye az Egyeslt llamokban s ms
orszgokban.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Az Oracle az Oracle Corporation bejegyzett
vdjegye.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>A PowerQuest s PartitionMagic
a PowerQuest Corporation bejegyzett vdjegyei az Egyeslt
llamokban s/vagy ms orszgokban.</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>A QUALCOMM s Eudora a
QUALCOMM Incorporated bejegyzett vdjegyei.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>A RealNetworks, RealPlayer s
RealAudio a RealNetworks, Inc. bejegyzett vdjegyei.</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -271,15 +271,15 @@
vdjegyei vagy bejegyzett vdjegyei
Nmetorszgban sok ms orszgban is
vilgszerte.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para>A Silicon Graphics, SGI s OpenGL
a Silicon Graphics, Inc. bejegyzett vdjegyei az Egyeslt
llamokban s/vagy ms orszgokban
vilgszerte.</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para>A SPARC, SPARC64, s
UltraSPARC a SPARC International, Inc vdjegyei az
@@ -289,9 +289,9 @@
kztt teszi azok megfelel hasznlatt
elrhetv a licencelsi megegyezsek
alapjn.</para>">
-<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "SPARC&reg;">
+<!ENTITY sparc64 "SPARC64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -301,19 +301,19 @@
s VirtualBox a Sun Microsystems, Inc. vdjegyei vagy bejegyzett
vdjegyei az Egyeslt llamokban s ms
orszgokban.</para>">
-<!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 openjdk "<trademark>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark>Solaris</trademark>">
-<!ENTITY staroffice "<trademark>StarOffice</trademark>">
-<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sunos "<trademark>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!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 openjdk "OpenJDK&trade;">
+<!ENTITY solaris "Solaris&trade;">
+<!ENTITY staroffice "StarOffice&trade;">
+<!ENTITY sun "Sun&trade;">
+<!ENTITY sunos "SunOS&trade;">
+<!ENTITY virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>A Symantec s Ghost a
@@ -323,39 +323,39 @@
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>A MATLAB a The MathWorks, Inc.
bejegyzett vdjegye.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>A SpeedTouch a Thomson
vdjegye.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
<!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
<!ENTITY tm-attrib.usrobotics "<para>A U.S. Robotics s Sportster
a U.S. Robotics Corporation. bejegyzett vdjegyei.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>A Waterloo Maple s Maple
a Waterloo Maple Inc. vdjegyei vagy bejegyzett
vdjegyei.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>A Mathematica a Wolfram Research,
Inc. vdjegye.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>A VMware a VMware, Inc.
vdjegye.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>Az XFree86 az XFree86 Project, Inc.
vdjegye.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Az Ogg Vorbis s Xiph.Org a Xiph.Org
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index 0bacc3ffce..af41dc9230 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -19,79 +19,79 @@
<!ENTITY tm-attrib.3com "<para>3Com болон HomeConnect нь
3Com Корпорацийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware болон Escalade нь 3ware Inc-ийн
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec нь Adaptec, Inc-ийн
бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, болон
PostScript нь бүртгэгдсэн худалдааны тэмдэгнүүд эсвэл Adobe
Systems Incorporated-ийн Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд
дахь худалдааны тэмдэгнүүд юм.</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, болон PCnet
нь Advanced Micro Devices, Inc-ийн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
Quicktime, болон TrueType нь Америкийн Нэгдсэн Улс ба/эсвэл бусад улсуудад
бүртгэгдсэн Apple Computer, Inc.-ийн худалдааны тэмдэгнүүд юм.</para>">
-<!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 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 tm-attrib.arm "<para>ARM нь ARM
Limited-ийн бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ба IOS нь
Америкийн Нэгдсэн Улс болон зарим нэг улсууд дахь Cisco Systems, Inc.
ба/эсвэл түүний гишүүдийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel болон WordPerfect нь Канад,
Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь Corel корпораци ба/эсвэл
түүний салбаруудын бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para>Coverity нь бүртгэгдсэн худалдааны тэмдэг бөгөөд
Coverity Extend, Coverity Prevent болон Coverity Prevent SQS нь Coverity Inc-ийн
худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster нь Америкийн Нэгдсэн
Улс ба/эсвэл бусад улсууд дахь Creative Technology Ltd.-ийн худалдааны
тэмдэгнүүд юм.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup нь Жон Д. Полстрагийн бүртгэгдсэн худалдааны
@@ -110,34 +110,34 @@
PowerPC, PS/2, S/390, болон ThinkPad нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь
International Business Machines корпорацийн худалдааны тэмдэгнүүд юм.</para>">
-<!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 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 tm-attrib.ieee "<para>IEEE, POSIX, болон 802 нь
Америкийн Нэгдсэн Улс дахь Institute of Electrical and Electronics Engineers
буюу Цахилгаан ба Электроны Инженерүүдийн Сургуулийн бүртгэгдсэн худалдааны тэмдэгнүүд
юм.</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, болон Xeon нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь
Intel корпораци эсвэл түүний салбаруудын худалдааны тэмдэгнүүд эсвэл
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit болон Quicken нь
@@ -148,60 +148,60 @@
<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, болон Jaz нь
Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь Iomega корпорацийн
бүртгэгдсэн худалдааны тэмдэгнүүд эсвэл худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix болон EasyIO нь
Lantronix корпорацийн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Линукс нь Линус Торвалдсын бүртгэгдсэн худалдааны
тэмдэг юм.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID болон Mylex нь LSI
Logic Corp-ийн худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, болон Shockwave
Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь Macromedia Inc-ийн худалдааны
тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media болон Windows NT нь
Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь Microsoft корпорацийн
бүртгэгдсэн худалдааны тэмдэгнүүд эсвэл худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para>MIPS болон R4000 нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь MIPS Technologies, Inc-ийн
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems болон DiskOnChip нь
M-Systems Flash Disk Pioneers, Ltd-ийн худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн
худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSD нь NetBSD сангийн бүртгэгдсэн худалдааны
@@ -210,14 +210,14 @@
<!ENTITY tm-attrib.netscape "<para>Netscape болон Netscape Navigator нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь Netscape Communications
корпорацийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD болон NextHop нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь NextHop-ийн бүртгэгдсэн эсвэл
бүртгэгдээгүй худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, болон UNIX нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь The Open Group-ийн
@@ -226,31 +226,31 @@
худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY tm-attrib.unix "<para>UNIX нь АНУ болон бусад улсууд дахь The Open Group-ийн бүртгэгдсэн
худалдааны тэмдэг юм.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Oracle нь Oracle корпорацийн бүртгэгдсэн
худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest болон PartitionMagic
нь Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь PowerQuest корпорацийн
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM болон Eudora нь
QUALCOMM Incorporated-ийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, болон
RealAudio нь RealNetworks,
Inc.-ийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -261,23 +261,23 @@
<!ENTITY tm-attrib.sap "<para>SAP, R/3, болон mySAP нь Герман болон
дэлхий дахины бусад улсууд дахь SAP AG-ийн худалдааны тэмдэгнүүд эсвэл
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, болон OpenGL нь
Америкийн Нэгдсэн Улс ба/эсвэл дэлхий дахины бусад улсууд дахь
Silicon Graphics, Inc.-ийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, болон
UltraSPARC нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь SPARC International, Inc-ийн
худалдааны тэмдэгнүүд юм. SPARC худалдааны тэмдэгнүүдийг зүүсэн
бүтээгдэхүүнүүд нь Sun Microsystems, Inc-ийн хөгжүүлсэн архитектур
дээр суурилсан байдаг.</para>">
-<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "Sparc&reg;">
+<!ENTITY sparc64 "Sparc64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -286,18 +286,18 @@
Solaris, StarOffice, SunOS
болон VirtualBox нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь Sun Microsystems, Inc-ийн
худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!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>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!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 virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec болон Ghost нь
@@ -307,39 +307,39 @@
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB нь The MathWorks, Inc-ийн
бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch нь Thomson-ий худалдааны
тэмдэг юм.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 болон Sportster нь
U.S. Robotics корпорацийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple болон Maple нь
Waterloo Maple Inc-ийн худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны
тэмдэгнүүд юм.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica нь
Wolfram Research, Inc-ийн бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware нь VMware, Inc-ийн худалдааны тэмдэг юм.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 нь XFree86 Project, Inc-ийн
худалдааны тэмдэг юм.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis болон Xiph.Org нь Xiph.Org-ийн
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index 7353848da0..dcb5b2e8e2 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -18,80 +18,80 @@
<!ENTITY tm-attrib.3com "<para>3Com en HomeConnect zijn geregistreerde
handelsmerken van 3Com Corporation.</para>">
<!-- Een XML-entiteit kan niet met een nummer beginnen... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware en Escalade zijn geregistreerde
handelsmerken van 3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec is een geregistreerd
handelsmerk van Adaptec, Inc.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, en
PostScript zijn fwel geregistreerde handelsmerken f
handelsmerken van Adobe Systems Incorporated in de Verenigde Staten
en/of andere landen.</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- 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, en PCnet
zijn handelsmerken van Advanced Micro Devices, Inc.</para>">
-<!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>">
+<!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;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh,
Mac OS, Quicktime, en TrueType zijn handelsmerken van Apple Computer, Inc.,
geregistreerd in de Verenigde Staten en andere landen.</para>">
-<!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 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 tm-attrib.arm "<para>ARM is een geregistreerd handelsmerk van
ARM Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, en IOS zijn
geregistreerde handelsmerken van Cisco Systems, Inc. en/of haar affiliaties
in de Verenigde Staten en zekere andere landen.</para>">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel en WordPerfect zijn handelsmerken
of geregistreerde handelsmerken van Corel Corporation en/of haar
dochterondernemingen in Canada, de Verenigde Staten en/of andere
landen.</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para>Coverity is een geregistreerd
handelsmerk; Coverity Extend, Coverity Prevent en Coverity Prevent SQS
zijn handelsmerken van Coverity, Inc.</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster is een handelsmerk van
Creative Technology Ltd. in de Verenigde Staten en/of andere
landen.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup is een geregistreerd handelsmerk
@@ -100,7 +100,7 @@
<!ENTITY tm-attrib.freebsd "<para>&os; is een geregistreerd
handelsmerk van de &os; Foundation.</para>">
-<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
+<!ENTITY fujitsu "Fujitsu&reg;">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
@@ -113,33 +113,33 @@
PowerPC, PS/2, S/390, en ThinkPad zijn handelsmerken van
International Business Machines Corporation in de
Verenigde Staten, andere landen, of beide.</para>">
-<!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 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 tm-attrib.ieee "<para>IEEE, POSIX, en 802 zijn geregistreerde
handelsmerken van Institute of Electrical and Electronics Engineers,
Inc. in de Verenigde Staten.</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, en Xeon zijn handelsmerken of geregistreerde
handelsmerken van Intel Corporation of haar dochterondernemingen in
de Verenigde Staten en andere landen.</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit en Quicken zijn geregistreerde
@@ -150,60 +150,60 @@
<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, en Jaz zijn fwel
geregistreerde handelsmerken f handelsmerken van Iomega
Corporation in de Verenigde Staten en/of andere landen.</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix en EasyIO zijn
handelsmerken van Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux is een geregistreerd handelsmerk
van Linus Torvalds.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID en Mylex zijn handelsmerken of geregistreerde handelsmerken
van LSI Logic Corp.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, en Shockwave
zijn handelsmerken geregistreerde handelsmerken van Macromedia, Inc.
in de Verenigde Staten en/of andere landen.</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media en Windows NT zijn fwel
geregistreerde handelsmerken f handelsmerken van Microsoft
Corporation in de Verenigde Staten en/of andere landen.</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para>MIPS en R4000 zijn geregistreerde
handelsmerken van MIPS Technologies, Inc. in de Verenigde Staten en
andere landen.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems en DiskOnChip zijn
handelsmerken of geregistreerde handelsmerken van M-Systems Flash Disk
Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd door http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSD is een geregistreerd handelsmerk
@@ -212,14 +212,14 @@
<!ENTITY tm-attrib.netscape "<para>Netscape en de Netscape Navigator
zijn geregistreerde handelsmerken van Netscape Communications
Corporation in de Verenigde Staten en andere landen.</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD en NextHop zijn geregistreerde
en ongeregistreerde handelsmerken van NextHop in de Verenigde Staten
en andere landen.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, en UNIX zijn
geregistreerde handelsmerken en IT DialTone en The Open Group zijn
@@ -227,31 +227,31 @@
landen.</para>">
<!ENTITY tm-attrib.unix "<para>UNIX is een geregistreerd handelsmerk van
The Open Group in de Verenigde Staten en andere landen.</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Oracle is een geregistreerd handelsmerk
van Oracle Corporation.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest en PartitionMagic zijn
geregistreerde handelsmerken van PowerQuest Corporation in de
Verenigde Staten en/of andere landen.</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM en Eudora zijn geregistreerde
handelsmerken van QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, en
RealAudio zijn de geregistreerde handelsmerken van RealNetworks,
Inc.</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Noot: RedHat gebruikt (r)/(tm) niet voor hun eigen handelsmerken -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -262,14 +262,14 @@
<!ENTITY tm-attrib.sap "<para>SAP, R/3, en mySAP zijn handelsmerken of
geregistreerde handelsmerken van SAP AG in Duitsland en in
verschillende andere wereldwijde landen.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, en OpenGL zijn
geregistreerde handelsmerken van Silicon Graphics, Inc., in de
Verenigde Staten en/of andere wereldwijde landen.</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!-- http://www.sparc.org/trademarksListing.html -->
<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, en
@@ -277,9 +277,9 @@
Staten en andere landen. SPARC International, Inc. bezit alle handelsmerken
van SPARC en staat onder licentie het juiste gebruik van deze handelsmerken
toe door zijn leden.</para>">
-<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "SPARC&reg;">
+<!ENTITY sparc64 "SPARC64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
@@ -287,19 +287,19 @@
Solaris, StarOffice, SunOS
en VirtualBox zijn handelsmerken of geregistreerde handelsmerken van
Sun Microsystems, Inc. in de Verenigde Staten en andere landen.</para>">
-<!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 openjdk "<trademark>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark>Solaris</trademark>">
-<!ENTITY staroffice "<trademark>StarOffice</trademark>">
-<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sunos "<trademark>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!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 openjdk "OpenJDK&trade;">
+<!ENTITY solaris "Solaris&trade;">
+<!ENTITY staroffice "StarOffice&trade;">
+<!ENTITY sun "Sun&trade;">
+<!ENTITY sunos "SunOS&trade;">
+<!ENTITY virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec en Ghost zijn geregistreerde
@@ -309,40 +309,40 @@
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB is een geregistreerd
handelsmerk van The MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch is een handelsmerk van
Thomson.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 en Sportster zijn
geregistreerde handelsmerken van U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple en Maple zijn
handelsmerken of geregistreerde handelsmerken van Waterloo Maple
Inc.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is een
geregistreerd handelsmerk van Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware is een handelsmerk van VMware,
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is een handelsmerk van The
XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis en Xiph.Org zijn handelsmerken
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index 17dac5db7a..10f57221d0 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -20,59 +20,59 @@
<!ENTITY tm-attrib.3com "<para>3Com HomeConnect
3Com Corporation.</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware Escalade
3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec
Adaptec, Inc.</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader
PostScript Adobe
Systems Incorporated /
.</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, PCnet
Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
Quicktime TrueType Apple Computer, Inc.,
.</para>">
-<!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 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 tm-attrib.arm "<para>ARM ARM
Limited.</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.</para>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel WordPerfect
Corel Corporation /
@@ -83,7 +83,7 @@
<!ENTITY tm-attrib.creative "<para>Sound Blaster
Creative Technology Ltd. /
.</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup
@@ -102,31 +102,31 @@
PS/2, S/390 ThinkPad International Business Machines
Corporation , ,
.</para>">
-<!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 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 tm-attrib.ieee "<para>IEEE, POSIX 802
Institute of Electrical and Electronics Engineers,
Inc. .</para>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY posix "POSIX&reg;">
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium Xeon
Intel Corporation
.</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit Quicken
@@ -136,60 +136,60 @@
<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, Jaz
Iomega Corporation
/ .</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix EasyIO
Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux
Linus Torvalds.</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID Mylex
LSI Logic Corp.</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash Shockwave
Macromedia, Inc.
/ .</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media Windows NT
Microsoft Corporation
/ .</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para>MIPS R4000
MIPS Technologies, Inc.
.</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems DiskOnChip
M-Systems Flash Disk
Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSD
@@ -198,14 +198,14 @@
<!ENTITY tm-attrib.netscape "<para>Netscape Netscape Navigator
Netscape Communications Corporation
.</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD NextHop
NextHop
.</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1 UNIX
, IT DialTone The Open Group
@@ -213,25 +213,25 @@
.</para>">
<!ENTITY tm-attrib.unix "<para>Unix
Open Group .</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Oracle
Oracle Corporation.</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest PartitionMagic
PowerQuest Corporation
/ .</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM Eudora
QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer
@@ -247,22 +247,22 @@
<!ENTITY tm-attrib.sap "<para>SAP, R/3 mySAP
SAP AG
.</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, OpenGL
Silicon Graphics, Inc.,
/ .</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64,
UltraSPARC SPARC International, Inc
. SPARC
, Sun Microsystems, Inc.</para>">
-<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "Sparc&reg;">
+<!ENTITY sparc64 "Sparc64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -271,17 +271,17 @@
SunOS
Sun Microsystems, Inc.
.</para>">
-<!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>">
+<!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;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec Ghost
@@ -291,39 +291,39 @@
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB
MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch
Thomson.</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 Sportster
U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple Maple
Waterloo Maple Inc.</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica
Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware VMware,
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86
XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis Xiph.Org
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index e5e7253175..1fd9f825d3 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -14,89 +14,95 @@
<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com and HomeConnect are registered
trademarks of 3Com Corporation.</para>">
<!-- An XML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware is a registered
trademark of 3ware Inc.</para>">
-<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para xmlns='http://docbook.org/ns/docbook'>Adaptec is a registered trademark of
Adaptec, Inc.</para>">
-<!ENTITY adaptec "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Acrobat&nbsp;Reader</trademark>">
-<!ENTITY adobe "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Adobe</trademark>">
-<!ENTITY postscript "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PostScript</trademark>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
-<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AirPort</trademark>">
-<!ENTITY apple "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Apple</trademark>">
-<!ENTITY firewire "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>FireWire</trademark>">
-<!ENTITY imac "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>iMac</trademark>">
-<!ENTITY mac "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mac</trademark>">
-<!ENTITY macintosh "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macintosh</trademark>">
-<!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mac&nbsp;OS</trademark>">
-<!ENTITY quicktime "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Quicktime</trademark>">
-<!ENTITY truetype "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>TrueType</trademark>">
+<!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 tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM is a registered trademark of ARM
Limited.</para>">
-<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
+
+<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
+<!ENTITY bluetooth "Bluetooth&reg;">
<!ENTITY tm-attrib.cisco "<para xmlns='http://docbook.org/ns/docbook'>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 cisco "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para xmlns='http://docbook.org/ns/docbook'>Coverity is a registered trademark;
Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of
Coverity, Inc.</para>">
-<!ENTITY coverity "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para xmlns='http://docbook.org/ns/docbook'>Sound Blaster is a trademark of
Creative Technology Ltd. in the United States and/or other
countries.</para>">
-<!ENTITY soundblaster "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
John D. Polstra.</para>">
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY epson.perfection "EPSON Perfection&reg;">
+
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>">
-<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Fujitsu</trademark>">
+<!ENTITY fujitsu "Fujitsu&reg;">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
@@ -108,33 +114,33 @@ 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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AIX</trademark>">
-<!ENTITY os2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OS/2</trademark>">
-<!ENTITY powerpc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PowerPC</trademark>">
-<!ENTITY ps2 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PS/2</trademark>">
-<!ENTITY s390 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>S/390</trademark>">
-<!ENTITY thinkpad "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ThinkPad</trademark>">
+<!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 tm-attrib.ieee "<para xmlns='http://docbook.org/ns/docbook'>IEEE, POSIX, and 802 are registered
trademarks of Institute of Electrical and Electronics Engineers,
Inc. in the United States.</para>">
-<!ENTITY ieee "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Celeron</trademark>">
-<!ENTITY etherexpress "<trademark xmlns='http://docbook.org/ns/docbook'>EtherExpress</trademark>">
-<!ENTITY i386 "<trademark xmlns='http://docbook.org/ns/docbook'>i386</trademark>">
-<!ENTITY i486 "<trademark xmlns='http://docbook.org/ns/docbook'>i486</trademark>">
-<!ENTITY intel "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Intel</trademark>">
-<!ENTITY itanium "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Itanium</trademark>">
-<!ENTITY pentium "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Pentium</trademark>">
-<!ENTITY xeon "<trademark xmlns='http://docbook.org/ns/docbook'>Xeon</trademark>">
-<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit and Quicken are registered
@@ -144,60 +150,60 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.iomega "<para xmlns='http://docbook.org/ns/docbook'>Iomega, Zip, and Jaz are either
registered trademarks or trademarks of Iomega Corporation in the
United States and/or other countries.</para>">
-<!ENTITY iomegazip "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para xmlns='http://docbook.org/ns/docbook'>Lantronix and EasyIO are
trademarks of Lantronix Corporation.</para>">
-<!ENTITY easyio "<trademark xmlns='http://docbook.org/ns/docbook'>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para xmlns='http://docbook.org/ns/docbook'>Linux is a registered trademark of
Linus Torvalds.</para>">
-<!ENTITY linux "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para xmlns='http://docbook.org/ns/docbook'>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID and Mylex are trademarks or registered trademarks of LSI
Logic Corp.</para>">
-<!ENTITY acceleraid "<trademark xmlns='http://docbook.org/ns/docbook'>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para xmlns='http://docbook.org/ns/docbook'>Macromedia, Flash, and Shockwave are
trademarks or registered trademarks of Macromedia, Inc. in the
United States and/or other countries.</para>">
-<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
-<!ENTITY macromedia "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!ENTITY ms-dos "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MS-DOS</trademark>">
-<!ENTITY outlook "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Outlook</trademark>">
-<!ENTITY windows "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows</trademark>">
-<!ENTITY windows.media "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows Media</trademark>">
+<!ENTITY ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para xmlns='http://docbook.org/ns/docbook'>MIPS and R4000 are registered
trademarks of MIPS Technologies, Inc. in the United States and other
countries.</para>">
-<!ENTITY mips "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark xmlns='http://docbook.org/ns/docbook'>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para xmlns='http://docbook.org/ns/docbook'>M-Systems and DiskOnChip are
trademarks or registered trademarks of M-Systems Flash Disk
Pioneers, Ltd.</para>">
-<!ENTITY diskonchip "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para xmlns='http://docbook.org/ns/docbook'>NetBSD is a registered trademark of
@@ -206,14 +212,14 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.netscape "<para xmlns='http://docbook.org/ns/docbook'>Netscape and the Netscape Navigator
are registered trademarks of Netscape Communications Corporation in
the U.S. and other countries.</para>">
-<!ENTITY netscape "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netscape&nbsp;Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape&nbsp;Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para xmlns='http://docbook.org/ns/docbook'>GateD and NextHop are registered and
unregistered trademarks of NextHop in the U.S. and other
countries.</para>">
-<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para xmlns='http://docbook.org/ns/docbook'>Motif, OSF/1, and UNIX are
registered trademarks and IT DialTone and The Open Group are
@@ -221,31 +227,31 @@ Coverity, Inc.</para>">
countries.</para>">
<!ENTITY tm-attrib.unix "<para xmlns='http://docbook.org/ns/docbook'>UNIX is a registered trademark of The
Open Group in the United States and other countries.</para>">
-<!ENTITY motif "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para xmlns='http://docbook.org/ns/docbook'>Oracle is a registered trademark
of Oracle Corporation.</para>">
-<!ENTITY oracle "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para xmlns='http://docbook.org/ns/docbook'>PowerQuest and PartitionMagic are
registered trademarks of PowerQuest Corporation in the United States
and/or other countries.</para>">
-<!ENTITY partitionmagic "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para xmlns='http://docbook.org/ns/docbook'>QUALCOMM and Eudora are registered
trademarks of QUALCOMM Incorporated.</para>">
-<!ENTITY eudora "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para xmlns='http://docbook.org/ns/docbook'>RealNetworks, RealPlayer, and
RealAudio are the registered trademarks of RealNetworks,
Inc.</para>">
-<!ENTITY realplayer "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -256,14 +262,14 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>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 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para xmlns='http://docbook.org/ns/docbook'>Silicon Graphics, SGI, and OpenGL are
registered trademarks of Silicon Graphics, Inc., in the United
States and/or other countries worldwide.</para>">
-<!ENTITY opengl "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!-- http://www.sparc.org/trademarksListing.html -->
<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, and
@@ -271,9 +277,9 @@ Coverity, Inc.</para>">
States and other countries. SPARC International, Inc owns all of the
SPARC trademarks and under licensing agreements allows the proper use
of these trademarks by its members.</para>">
-<!ENTITY sparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC64</trademark>">
-<!ENTITY ultrasparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "SPARC&reg;">
+<!ENTITY sparc64 "SPARC64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -282,19 +288,19 @@ Coverity, Inc.</para>">
Solaris, StarOffice, SunOS
and VirtualBox are trademarks or registered trademarks of
Sun Microsystems, Inc. in the United States and other countries.</para>">
-<!ENTITY java "<trademark xmlns='http://docbook.org/ns/docbook'>Java</trademark>">
-<!ENTITY java.virtual.machine "<trademark xmlns='http://docbook.org/ns/docbook'>Java Virtual Machine</trademark>">
-<!ENTITY jdk "<trademark xmlns='http://docbook.org/ns/docbook'>JDK</trademark>">
-<!ENTITY jre "<trademark xmlns='http://docbook.org/ns/docbook'>JRE</trademark>">
-<!ENTITY jsp "<trademark xmlns='http://docbook.org/ns/docbook'>JSP</trademark>">
-<!ENTITY jvm "<trademark xmlns='http://docbook.org/ns/docbook'>JVM</trademark>">
-<!ENTITY netra "<trademark xmlns='http://docbook.org/ns/docbook'>Netra</trademark>">
-<!ENTITY openjdk "<trademark xmlns='http://docbook.org/ns/docbook'>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark xmlns='http://docbook.org/ns/docbook'>Solaris</trademark>">
-<!ENTITY staroffice "<trademark xmlns='http://docbook.org/ns/docbook'>StarOffice</trademark>">
-<!ENTITY sun "<trademark xmlns='http://docbook.org/ns/docbook'>Sun</trademark>">
-<!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">
+<!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 openjdk "OpenJDK&trade;">
+<!ENTITY solaris "Solaris&trade;">
+<!ENTITY staroffice "StarOffice&trade;">
+<!ENTITY sun "Sun&trade;">
+<!ENTITY sunos "SunOS&trade;">
+<!ENTITY virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para xmlns='http://docbook.org/ns/docbook'>Symantec and Ghost are registered
@@ -304,39 +310,39 @@ Coverity, Inc.</para>">
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para xmlns='http://docbook.org/ns/docbook'>MATLAB is a registered trademark
of The MathWorks, Inc.</para>">
-<!ENTITY matlab "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para xmlns='http://docbook.org/ns/docbook'>SpeedTouch is a trademark of
Thomson.</para>">
-<!ENTITY speedtouch "<trademark xmlns='http://docbook.org/ns/docbook'>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp -->
<!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp -->
<!ENTITY tm-attrib.usrobotics "<para xmlns='http://docbook.org/ns/docbook'>U.S. Robotics and Sportster are
registered trademarks of U.S. Robotics Corporation.</para>">
-<!ENTITY sportster "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para xmlns='http://docbook.org/ns/docbook'>Waterloo Maple and Maple are
trademarks or registered trademarks of Waterloo Maple Inc.</para>">
-<!ENTITY maple "<trademark xmlns='http://docbook.org/ns/docbook'>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para xmlns='http://docbook.org/ns/docbook'>Mathematica is a registered
trademark of Wolfram Research, Inc.</para>">
-<!ENTITY mathematica "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para xmlns='http://docbook.org/ns/docbook'>VMware is a trademark of VMware,
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark xmlns='http://docbook.org/ns/docbook'>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para xmlns='http://docbook.org/ns/docbook'>XFree86 is a trademark of The
XFree86 Project, Inc.</para>">
-<!ENTITY xfree86 "<trademark xmlns='http://docbook.org/ns/docbook'>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para xmlns='http://docbook.org/ns/docbook'>Ogg Vorbis and Xiph.Org are trademarks
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index efefa7eb0f..94208dde9b 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -15,72 +15,72 @@
<!ENTITY tm-attrib.3com "<para>3Com HomeConnect 3Com Corporation ע̱ꡣ</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware Escalade 3ware Inc ע̱ꡣ</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec
Adaptec, Inc. ע̱ꡣ</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, Լ
PostScript Adobe
Systems Incorporated /ҵ̱ע̱ꡣ</para>">
-<!ENTITY acrobat "<trademark class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark class='registered'>Acrobat Reader</trademark>">
-<!ENTITY adobe "<trademark class='registered'>Adobe</trademark>">
-<!ENTITY postscript "<trademark class='registered'>PostScript</trademark>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, PCnet
Advanced Micro Devices, Inc. ̱ꡣ</para>">
-<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
Quicktime, Լ TrueType Apple Computer, Inc. Լҵע̱ꡣ</para>">
-<!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 OS</trademark>">
-<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>">
-<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>">
+<!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 OS&reg;">
+<!ENTITY quicktime "Quicktime&reg;">
+<!ENTITY truetype "TrueType&reg;">
<!ENTITY tm-attrib.arm "<para>ARM ARM
Limited. ע̱ꡣ</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, IOS
Cisco Systems, Inc. /丽һЩҵע̱ꡣ</para>">
-<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY etherchannel "<trademark class='registered'>EtherChannel</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY cisco "Cisco&reg;">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY etherchannel "EtherChannel&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel WordPerfect Corel Corporation /ӹ˾
ڼô/ҵע̱ꡣ</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para>Coverity һע̱;
Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע̱ꡣ</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster
Creative Technology Ltd. /ҵע̱ꡣ</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup
@@ -88,7 +88,7 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.freebsd "<para>FreeBSD FreeBSDע̱</para>">
-<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
+<!ENTITY fujitsu "Fujitsu&reg;">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg Helvetica
@@ -98,31 +98,31 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.ibm "<para>IBM AIX OS/2
PowerPC PS/2 S/390 Լ ThinkPad
ǹû˾ҵע̱̱ꡣ</para>">
-<!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 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 tm-attrib.ieee "<para>IEEE, POSIX, 802 Institute of Electrical and Electronics Engineers,
Inc. ע̱ꡣ</para>">
-<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY ieee "IEEE&reg;">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, Xeon Intel Corporation
֧ҵ̱ע̱ꡣ</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit Quicken Intuit Inc., ӹ˾ҵ̱ע̱ꡣ</para>">
@@ -131,94 +131,94 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, Jaz Iomega Corporation
/ҵ̱ע̱ꡣ</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix EasyIO Lantronix Corporation ̱ꡣ</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux Linus Torvalds ע̱ꡣ</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID Mylex LSI
Logic Corp ̱ע̱ꡣ</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, Լ Shockwave
Macromedia, Inc. /ҵ̱ע̱ꡣ</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, Windows NT Microsoft Corporation
/ҵ̱ע̱ꡣ</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft; &windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows; 2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
+<!ENTITY windowsnt "Windows NT&reg;">
<!ENTITY windowsxp "&windows; XP">
<!ENTITY tm-attrib.mips "<para>MIPS R4000 MIPS Technologies, Inc.
Լҵע̱ꡣ</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems DiskOnChip M-Systems Flash Disk
Pioneers, Ltd. ̱ע̱ꡣ</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSD NetBSD Foundationע̱ꡣ</para>">
<!ENTITY tm-attrib.netscape "<para>Netscape Լ Netscape Navigator
Netscape Communications Corporation ҵע̱ꡣ</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD NextHop NextHop ҵ̱ע̱ꡣ</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, UNIX
The Open Group ҵע̱ꣻ IT DialTone The Open Group
̱ꡣ</para>">
<!ENTITY tm-attrib.unix "<para>UNIX Open Group
ҵע̱ꡣ</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Oracle Oracle Corporation ע̱ꡣ</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest PartitionMagic
PowerQuest Corporation /ҵע̱ꡣ</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM Eudora QUALCOMM Incorporated ע̱ꡣ</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer,
RealAudio RealNetworks, Inc. ע̱ꡣ</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -228,13 +228,13 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.sap "<para>SAP, R/3, mySAP SAP AG
ڵ¹Լҵ̱ע̱ꡣ</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap; &r3;">
<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, OpenGL Silicon Graphics, Inc.
/ҵע̱ꡣ</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!-- http://www.sparc.org/trademarksListing.html -->
<!ENTITY tm-attrib.sparc "<para>SPARC SPARC64 Լ
@@ -242,9 +242,9 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
SPARC International, Inc ӵ
SPARC ̱Ȩ
֤ʽԱʵʽʹЩ̱ꡣ</para>">
-<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "SPARC&reg;">
+<!ENTITY sparc64 "SPARC64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
@@ -253,19 +253,19 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
Solaris StarOffice SunOS
Լ VirtualBox Sun Microsystems,
Inc. ҵ̱ע̱ꡣ</para>">
-<!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 openjdk "<trademark>OpenJDK</trademark>">
-<!ENTITY solaris "<trademark>Solaris</trademark>">
-<!ENTITY staroffice "<trademark>StarOffice</trademark>">
-<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sunos "<trademark>SunOS</trademark>">
-<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
+<!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 openjdk "OpenJDK&trade;">
+<!ENTITY solaris "Solaris&trade;">
+<!ENTITY staroffice "StarOffice&trade;">
+<!ENTITY sun "Sun&trade;">
+<!ENTITY sunos "SunOS&trade;">
+<!ENTITY virtualbox "VirtualBox&trade;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec Ghost
@@ -274,35 +274,35 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB
The MathWorks, Inc. ע̱ꡣ</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch Thomson ̱ꡣ</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 Sportster U.S. Robotics Corporation ע̱ꡣ</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple Maple Waterloo Maple Inc ̱ע̱</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica Wolfram Research, Inc ע̱ꡣ</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware VMware,
Inc. ̱</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 The
XFree86 Project, Inc ̱ꡣ.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis Xiph.Org Xiph.Org ̱ꡣ</para>">
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 5c290061e1..e1e00d4605 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -16,69 +16,69 @@
<!ENTITY tm-attrib.3com "<para>3Com M HomeConnect O 3Com Corporation
UӼСC</para>">
<!-- An SGML entity can't start with a number... -->
-<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
+<!ENTITY tm.3com "3Com&reg;">
<!ENTITY tm-attrib.3ware "<para>3ware M Escalade O 3ware Inc UӼСC
</para>">
-<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
+<!ENTITY tm.3ware "3ware&reg;">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec O Adaptec, Inc. UӼСC</para>">
-<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>">
+<!ENTITY adaptec "Adaptec&reg;">
<!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, H PostScript
O Adobe Systems Incorporated bM/ΨLaӼЩεUӼСC</para>">
-<!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>">
+<!ENTITY acrobat "Acrobat&reg;">
+<!ENTITY acrobat.reader "Acrobat&nbsp;Reader&reg;">
+<!ENTITY adobe "Adobe&reg;">
+<!ENTITY postscript "PostScript&reg;">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
Advanced Micro Devices, Inc. ӼСC</para>">
-<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY athlon "<trademark>Athlon</trademark>">
-<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
-<!ENTITY opteron "<trademark>Opteron</trademark>">
+<!ENTITY amd.athlon "AMD&nbsp;Athlon&trade;">
+<!ENTITY amd.opteron "AMD&nbsp;Opteron&trade;">
+<!ENTITY athlon "Athlon&trade;">
+<!ENTITY elan "&Eacute;lan&trade;">
+<!ENTITY opteron "Opteron&trade;">
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
Quicktime, H TrueType O Apple Computer, Inc. bHΨLaUӼСC</para>">
-<!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 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 tm-attrib.arm "<para>ARM O ARM Limited. UӼСC</para>">
-<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
+<!ENTITY arm "ARM&reg;">
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, M IOS
O Cisco Systems, Inc. M/ΨݾcbM@ǨLaUӼСC</para>">
-<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
-<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
+<!ENTITY catalyst "Catalyst&reg;">
+<!ENTITY ios "IOS&reg;">
<!ENTITY tm-attrib.corel "<para>Corel M WordPerfect O Corel Corporation
M/Ψlqb[jBM/ΨLaUӼСC</para>">
-<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!ENTITY wordperfect "WordPerfect&reg;">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
<!ENTITY tm-attrib.coverity "<para>Coverity OUӼСC
Coverity ExtendBCoverity PreventBCoverity Prevent SQS O Coverity, Inc.
UӼСC</para>">
-<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
-<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+<!ENTITY coverity "Coverity&reg;">
+<!ENTITY coverity.prevent "Coverity Prevent&reg;">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster O
Creative Technology Ltd. bM/ΨLaUӼСC</para>">
-<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
+<!ENTITY soundblaster "SoundBlaster&reg;">
<!-- http://www.cvsup.org/ -->
<!ENTITY tm-attrib.cvsup "<para>CVSup O
@@ -94,30 +94,30 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, S/390, M ThinkPad O
ڰӥξqbMLaUӼЩΰӼСC</para>">
-<!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 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 tm-attrib.ieee "<para>IEEE, POSIX, M 802 O Institute of Electrical and Electronics Engineers,
Inc. bꪺUӼСC</para>">
-<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!ENTITY posix "POSIX&reg;">
<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, M Xeon O Intel Corporation
ΨcbMLaӼЩεUӼСC</para>">
-<!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>">
+<!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;">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit M Quicken O Intuit Inc., ΨlqbMLaӼЩεUӼСC</para>">
@@ -126,95 +126,95 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.iomega "<para>Iomega, Zip, M Jaz O Iomega Corporation
bM/ΨLaӼЩεUӼСC</para>">
-<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>">
-<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>">
+<!ENTITY iomegazip "Zip&reg;">
+<!ENTITY jaz "Jaz&reg;">
<!ENTITY tm-attrib.lantronix "<para>Lantronix M EasyIO O Lantronix Corporation ӼСC</para>">
-<!ENTITY easyio "<trademark>EasyIO</trademark>">
+<!ENTITY easyio "EasyIO&trade;">
<!-- http://www.linuxmark.org/ -->
<!ENTITY tm-attrib.linux "<para>Linux O Linus Torvalds UӼСC</para>">
-<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
+<!ENTITY linux "Linux&reg;">
<!-- http://www.lsilogic.com/trademrk.html -->
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
MegaRAID M Mylex O LSI
Logic Corp ӼЩεUӼСC</para>">
-<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>">
-<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>">
-<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>">
+<!ENTITY acceleraid "AcceleRAID&trade;">
+<!ENTITY megaraid "MegaRAID&reg;">
+<!ENTITY mylex "Mylex&reg;">
<!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, H Shockwave
Macromedia, Inc. bM/ΨLaӼЩεUӼСC</para>">
-<!ENTITY flash "<trademark>Flash</trademark>">
-<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
+<!ENTITY flash "Flash&trade;">
+<!ENTITY macromedia "Macromedia&reg;">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, M Windows NT O Microsoft Corporation
bM/ΨLaӼЩεUӼСC</para>">
-<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
-<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
+<!ENTITY intellimouse "IntelliMouse&reg;">
+<!ENTITY microsoft "Microsoft&reg;">
<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
-<!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 ms-dos "MS-DOS&reg;">
+<!ENTITY outlook "Outlook&reg;">
+<!ENTITY windows "Windows&reg;">
+<!ENTITY windows.media "Windows Media&reg;">
<!ENTITY windows2k "&windows;&nbsp;2000">
-<!ENTITY windowsnt "<trademark class='registered'>Windows&nbsp;NT</trademark>">
+<!ENTITY windowsnt "Windows&nbsp;NT&reg;">
<!ENTITY windowsxp "&windows;&nbsp;XP">
<!ENTITY tm-attrib.mips "<para>MIPS M R4000 O MIPS Technologies, Inc.
bHΨLaUӼСC</para>">
-<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
+<!ENTITY mips "MIPS&reg;">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY mysql "<trademark>MySQL</trademark>">
+<!ENTITY mysql "MySQL&trade;">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems M DiskOnChip O M-Systems Flash Disk
Pioneers, Ltd. ӼЩεUӼСC</para>">
-<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
+<!ENTITY diskonchip "DiskOnChip&reg;">
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
<!ENTITY tm-attrib.netbsd "<para>NetBSDO NetBSD FoundationUӼСC</para>">
<!ENTITY tm-attrib.netscape "<para>Netscape H Netscape&nbsp;Navigator
O Netscape Communications Corporation bMLaUӼСC</para>">
-<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
-<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
+<!ENTITY netscape "Netscape&reg;">
+<!ENTITY netscape.navigator "Netscape Navigator&reg;">
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para>GateD M NextHop O NextHop bMLaӼЩεUӼСC</para>">
-<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
+<!ENTITY gated "GateD&reg;">
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, M UNIX
O The Open Group bMLaUӼСF IT DialTone M The Open Group
OӼСC</para>">
<!ENTITY tm-attrib.unix "<para>UNIXO Open Group
bM䥦aUӼСC</para>">
-<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
+<!ENTITY motif "Motif&reg;">
+<!ENTITY unix "UNIX&reg;">
<!-- http://www.oracle.com/html/trademark.html -->
<!-- http://www.oracle.com/html/3party.html -->
<!ENTITY tm-attrib.oracle "<para>Oracle O Oracle Corporation UӼСC</para>">
-<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
+<!ENTITY oracle "Oracle&reg;">
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest M PartitionMagic O
PowerQuest Corporation bM/ΨLaUӼСC</para>">
-<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>">
+<!ENTITY partitionmagic "PartitionMagic&reg;">
<!-- http://www.qualcomm.com/main/legal.html -->
<!ENTITY tm-attrib.qualcomm "<para>QUALCOMM M Eudora O QUALCOMM Incorporated
UӼСC</para>">
-<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>">
+<!ENTITY eudora "Eudora&reg;">
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, M
RealAudio O RealNetworks, Inc. UӼСC</para>">
-<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
+<!ENTITY realplayer "RealPlayer&reg;">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->
@@ -224,36 +224,36 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.sap "<para>SAP, R/3, M mySAP O SAP AG
bwHγ\hLaӼЩεUӼСC</para>">
-<!ENTITY r3 "<trademark class='registered'>R/3</trademark>">
-<!ENTITY sap "<trademark class='registered'>SAP</trademark>">
+<!ENTITY r3 "R/3&reg;">
+<!ENTITY sap "SAP&reg;">
<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, M OpenGL O Silicon
Graphics, Inc. bM/ΨLaUӼСC</para>">
-<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
+<!ENTITY opengl "OpenGL&reg;">
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, H
UltraSPARC O SPARC International, Inc bMLaӼСC
Sun Microsystems, Inc. Ҷ}o[cA]t SPARC ӼЪ~C</para>">
-<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
-<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
+<!ENTITY sparc "Sparc&reg;">
+<!ENTITY sparc64 "Sparc64&reg;">
+<!ENTITY ultrasparc "UltraSPARC&reg;">
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JSP, JVM, Netra, Solaris, StarOffice
M SunOS O
Sun Microsystems, Inc. bMLaӼЩεUӼСC</para>">
-<!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>">
+<!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;">
<!-- http://www.symantec.com/legal/legal_note.html -->
<!ENTITY tm-attrib.symantec "<para>Symantec M Ghost O
@@ -262,35 +262,35 @@ AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
<!-- http://www.mathworks.com/company/trademarks.shtml -->
<!ENTITY tm-attrib.themathworks "<para>MATLAB O
The MathWorks, Inc. UӼСC</para>">
-<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>">
+<!ENTITY matlab "MATLAB&reg;">
<!ENTITY tm-attrib.thomson "<para>SpeedTouch O Thomson ӼСC</para>">
-<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
+<!ENTITY speedtouch "SpeedTouch&trade;">
<!-- 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 M Sportster O U.S. Robotics Corporation UӼСC</para>">
-<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>">
-<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
+<!ENTITY sportster "Sportster&reg;">
+<!ENTITY usrobotics "U.S. Robotics&reg;">
<!-- http://www.maplesoft.com/trademarks.shtml -->
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple M Maple O Waterloo Maple Inc ӼЩεUӼ</para>">
-<!ENTITY maple "<trademark>Maple</trademark>">
+<!ENTITY maple "Maple&trade;">
<!-- http://www.wolfram.com/company/terms.html -->
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica O Wolfram Research, Inc UӼСC</para>">
-<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
+<!ENTITY mathematica "Mathematica&reg;">
<!-- http://www.vmware.com/legal.html -->
<!ENTITY tm-attrib.vmware "<para>VMware O VMware,
Inc. Ӽ</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY xen "<trademark>Xen</trademark>">
+<!ENTITY xen "Xen&trade;">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 O The
XFree86 Project, Inc ӼСC.</para>">
-<!ENTITY xfree86 "<trademark>XFree86</trademark>">
+<!ENTITY xfree86 "XFree86&trade;">
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis M Xiph.Org O Xiph.Org ӼСC</para>">