diff options
38 files changed, 1034 insertions, 1030 deletions
diff --git a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml index 81f8a9a5f1..96015c2912 100644 --- a/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/de_DE.ISO8859-1/books/handbook/desktop/chapter.xml @@ -1106,7 +1106,7 @@ Arbeitsplatz verwalten wollen, stehen Ihnen verschiedene Anwendungen zur Verfügung. Einige von ihnen unterstützen verbreitete Formate, darunter Dateiformate, die von - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> oder <application>Excel</application> verwendet werden.</para> <para>Dieser Abschnitt behandelt die folgenden Anwendungen:</para> diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml index b2704aa8de..46232bc007 100644 --- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml +++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml @@ -1538,8 +1538,9 @@ Mounting root from ufs:/dev/md0c Die Funktion ist sehr zweckmäßig für Benutzer, die Datensicherungen auf einer zweiten Platte erstellen und dafür Werkzeuge wie - <application>Ghost®</application> - oder <application>xcopy</application> + <application> + <trademark class="registered">Ghost</trademark> + </application> oder <application>xcopy</application> einsetzen. Wenn die erste Platte ausfällt, von einem Virus befallen wird oder durch einen Fehler des Betriebssystems verunstaltet wird, können die diff --git a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml index 7ed5a09134..6c69393afa 100644 --- a/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml +++ b/el_GR.ISO8859-7/books/handbook/desktop/chapter.xml @@ -1096,7 +1096,7 @@ éó÷õñÝò êáé åýêïëåò óôç ÷ñÞóç åöáñìïãÝò, Ýôïéìåò ðñïò åãêáôÜóôáóç. ÏñéóìÝíåò áðü áõôÝò åßíáé óõìâáôÝò ìå äéáäåäïìÝíåò ìïñöÝò áñ÷åßùí, üðùò áõôÝò ðïõ ÷ñçóéìïðïéïýíôáé óôá Ýããñáöá ôïõ - <application>Quicken®</application> Þ ôïõ <application>Excel</application>.</para> + <application><trademark class="registered">Quicken</trademark></application> Þ ôïõ <application>Excel</application>.</para> <para>Ôï ôìÞìá áõôü êáëýðôåé ôéò åöáñìïãÝò:</para> diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml index 915714b9e6..8af797331d 100644 --- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml +++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml @@ -1467,7 +1467,7 @@ Mounting root from ufs:/dev/md0c áãïñÜóïõí Ýíá äåýôåñï üìïéï óêëçñü äßóêï, êáé íá áíôéãñÜöïõí áíÜ ôáêôÜ äéáóôÞìáôá ôïí ðñþôï ôïõò äßóêï óôï äåýôåñï ÷ñçóéìïðïéþíôáò ðñïãñÜììáôá üðùò ôï - <application>Ghost®</application> Þ ôï <application>XCOPY</application>. + <application><trademark class="registered">Ghost</trademark></application> Þ ôï <application>XCOPY</application>. ¸ôóé, áí ï ðñþôïò äßóêïò ÷áëÜóåé, Þ äå÷èåß åðßèåóç áðü éü, Þ ðáñïõóéÜóåé ðñüâëçìá åîáéôßáò êÜðïéïõ åëáôôþìáôïò ôïõ ëåéôïõñãéêïý óõóôÞìáôïò, ï ÷ñÞóôçò ìðïñåß åýêïëá íá åðáíáöÝñåé ôï óýóôçìá diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent index b07e0897be..5c31a29e54 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>Ïé ëÝîåéò 3ware êáé Escalade åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Ç ëÝîç Adaptec åßíáé êáôï÷õñùìÝíï åìðïñéêü óýìâïëï ôçò Adaptec, Inc.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Ïé ëÝîåéò Þ öñÜóåéò Adobe, Acrobat, Acrobat Reader, êáé PostScript åßíáé åßôå êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ óýìâïëá ôçò Adobe Systems Incorporated óôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>Ïé ëÝîåéò Þ öñÜóåéò AMD, AMD Athlon, AMD Opteron, Élan, êáé PCnet åßíáé åìðïñéêÜ óýìâïëá ôçò Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!ENTITY tm-attrib.apple "<para>Ïé ëÝîåéò Þ öñÜóåéò Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, êáé TrueType åßíáé åìðïñéêÜ óýìâïëá ôçò Apple Computer, Inc., êáôï÷õñùìÝíá óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>Ç ëÝîç ARM åßíáé êáôï÷õñùìÝíï åìðïñéêü óýìâïëï ôçò ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Ïé ëÝîåéò Þ öñÜóåéò Cisco, Catalyst, êáé IOS åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Cisco Systems, Inc. Þ/êáé ôùí óõíåñãáôþí ôçò óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå ïñéóìÝíåò Üëëåò ÷þñåò."> -<!ENTITY cisco "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 tm-attrib.corel "<para>Ïé ëÝîåéò Corel êáé WordPerfect åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Corel Corporation Þ/êáé ôùí èõãáôñéêþí ôçò óôïí ÊáíáäÜ, ôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- 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 "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Ç öñÜóç Sound Blaster åßíáé åìðïñéêü óýìâïëï ôçò Creative Technology Ltd. óôéò ÇíùìÝíåò Ðïëéôåßåò Þ/êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "Fujitsu®"> +<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>Ïé ëÝîåéò IEEE, POSIX, êáé 802 åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôïõ Institute of Electrical and Electronics Engineers, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò.</para>"> -<!ENTITY ieee "IEEE®"> -<!ENTITY posix "POSIX®"> +<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!ENTITY tm-attrib.intel "<para>Ïé ëÝîåéò Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, êáé Xeon åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Intel Corporation êáé ôùí èõãáôñéêþí ôçò óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY core "Core™"> -<!ENTITY xeon "Xeon™"> +<!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>"> <!-- 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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Ïé ëÝîåéò Lantronix êáé EasyIO åßíáé åìðïñéêÜ óýìâïëá ôçò Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Ôï Linux åßíáé Ýíá êáôï÷õñùìÝíá åìðïñéêü óýìâïëï ôïõ Linus Torvalds óôéò ÇíùìÝíåò Ðïëéôåßåò.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>Ïé ëÝîåéò LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID êáé Mylex åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò LSI Logic Corp.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Ïé ëÝîåéò Macromedia, Flash, êáé Shockwave åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Macromedia, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Ïé ëÝîåéò Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, êáé Windows NT åßíáé åßôå êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá Þ åìðïñéêÜ óýìâïëá ôçò Microsoft Corporation óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>Ïé ëÝîåéò MIPS êáé R4000 åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò MIPS Technologies, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>Ç ëÝîç NetBSD åßíáé Ýíá êáôï÷õñùìÝíï åìðïñéêü @@ -217,14 +217,14 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.netscape "<para>Ïé ëÝîåéò Netscape êáé Netscape Navigator åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Netscape Communications Corporation óôéò Ç.Ð.Á êáé Üëëåò ÷þñåò.</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>Ïé ëÝîåéò GateD êáé NextHop åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá êáé åìðïñéêÜ óýìâïëá ôçò NextHop óôéò Ç.Ð.Á. êáé Üëëåò ÷þñåò.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Ç ëÝîç Oracle åßíáé êáôï÷õñùìÝíï åìðïñéêü óýìâïëï ôçò Oracle Corporation.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>Ïé ëÝîåéò PowerQuest êáé PartitionMagic åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò PowerQuest Corporation óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>Ïé ëÝîåéò QUALCOMM êáé Eudora åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>Ïé ëÝîåéò RealNetworks, RealPlayer êáé RealAudio åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò RealNetworks, Inc.</para>"> -<!ENTITY realplayer "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -268,23 +268,23 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.sap "<para>Ïé ëÝîåéò SAP, R/3, êáé mySAP åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò SAP AG óôç Ãåñìáíßá êáé óå ðïëëÝò Üëëåò ÷þñåò ôïõ êüóìïõ.</para>"> -<!ENTITY r3 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Ïé ëÝîåéò ïé öñÜóåéò Silicon Graphics, SGI, êáé OpenGL åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Silicon Graphics, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé/Þ óå Üëëåò ÷þñåò óôïí êüóìï.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Ïé ëÝîåéò Þ öñÜóåéò SPARC, SPARC64, êáé UltraSPARC åßíáé åìðïñéêÜ óýìâïëá ôçò SPARC International, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò. Ç SPARC International Inc. êáôÝ÷åé üëá ôá åìðïñéêÜ äéêáéþìáôá ôùí óõìâüëùí SPARC êáé åðéôñÝðåé ôçí ïñèÞ ÷ñÞóç ôïõò áðü üëá ôá ìÝëç ôçò, êáôüðéí ó÷åôéêÞò Üäåéáò.</para>"> -<!ENTITY sparc "SPARC®"> -<!ENTITY sparc64 "SPARC64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -293,19 +293,19 @@ Coverity, Inc.</para>"> Solaris, StarOffice, SunOS êáé VirtualBox åßíáé åìðïñéêÜ óýìâïëá Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Sun Microsystems, Inc. óôéò ÇíùìÝíåò Ðïëéôåßåò êáé óå Üëëåò ÷þñåò.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY openjdk "OpenJDK™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- 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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>Ç ëÝîç SpeedTouch åßíáé Ýíá åìðïñéêü óýìâïëï ôçò Thomson</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>Ïé ëÝîåéò Þ öñÜóåéò U.S. Robotics êáé Sportster åßíáé êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Ïé ëÝîåéò Þ öñÜóåéò Waterloo Maple êáé Maple åßíáé åìðïñéêÜ Þ êáôï÷õñùìÝíá åìðïñéêÜ óýìâïëá ôçò Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Ç ëÝîç Mathematica åßíáé êáôï÷õñùìÝíï åìðïñéêü óýìâïëï ôçò Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>Ç ëÝîç XFree86 åßíáé Ýíá åìðïñéêü óýìâïëï ôïõ The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ïé ëÝîåéò Þ öñÜóåéò Ogg Vorbis êáé Xiph.Org diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml index 5d31dd11f0..cf3a14b4e8 100644 --- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml @@ -1146,7 +1146,8 @@ <para>For managing personal finances on a &os; desktop, some powerful and easy-to-use applications can be installed. Some are compatible with widespread file formats, such as the formats - used by <application>Quicken®</application> and + used by <application><trademark + class="registered">Quicken</trademark></application> and <application>Excel</application>.</para> <para>This section covers these programs:</para> diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml index 7bef07317e..499bff5f43 100644 --- a/en_US.ISO8859-1/books/handbook/install/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml @@ -1379,7 +1379,7 @@ Mounting root from ufs:/dev/md0c found that the simplest and cheapest way to keep a system backup is to buy an identical second hard drive, and perform routine copies of the first drive to the second drive using - <application>Ghost®</application> or <application>XCOPY</application> + <application><trademark class="registered">Ghost</trademark></application> or <application>XCOPY</application> . Then, if the first drive fails, or is attacked by a virus, or is scribbled upon by an operating system defect, he can easily recover by instructing the BIOS diff --git a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml index 6e91e143c7..e4316d8b02 100644 --- a/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/es_ES.ISO8859-1/books/handbook/desktop/chapter.xml @@ -844,7 +844,8 @@ personales en su escritorio &os; hay algunas aplicaciones potentes y sencillas de utilizar que puede instalar. Algunas de ellas son compatibles con formatos muy extendidos - como documentos de <application>Quicken®</application> o + como documentos de <application><trademark + class="registered">Quicken</trademark></application> o <application>Excel</application>.</para> <para>Esta sección cubre las siguientes aplicaciones:</para> diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml index f04b5dd8bb..d2676e4993 100755 --- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml +++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml @@ -1552,7 +1552,7 @@ Mounting root from ufs:/dev/md0c usuarios que tienen el «backup» del sistema más barato que existe, comprar un disco duro idéntico al primero y copiar periódicamente la primera unidad en la segunda mediante - <application>Ghost®</application> o <application>XCOPY</application>. + <application><trademark class="registered">Ghost</trademark></application> o <application>XCOPY</application>. De este modo si la primera unidad falla, sufre el ataque de un virus o sufre las consecuencias de un fallo del sistema operativo sólo hay que decirle a la BIOS que interpole lógicamente las unidades. Es diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent index 52df757b36..ca4ee1b91b 100644 --- a/es_ES.ISO8859-1/share/xml/trademarks.ent +++ b/es_ES.ISO8859-1/share/xml/trademarks.ent @@ -16,78 +16,78 @@ <!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered trademarks of 3Com Corporation.</para>"> <!-- An SGML entity can't start with a number... --> -<!ENTITY tm.3com "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware is a registered trademarks of 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of Adaptec, Inc.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon, AMD Opteron, Athlon, Élan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Computer, Inc., registered in the United States and other countries.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries.</para>"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY ios "IOS®"> +<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>"> +<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> <!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks or registered trademarks of Corel Corporation and/or its subsidiaries in Canada, the United States and/or other countries.</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>Coverity is a registered trademark; Coverity Extend, Coverity Prevent and Coverity Prevent SQS are trademarks of Coverity, Inc.</para>"> -<!ENTITY coverity "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Sound Blaster is a trademark of Creative Technology Ltd. in the United States and/or other countries.</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of @@ -106,32 +106,32 @@ Coverity, Inc.</para>"> PowerPC, PS/2, S/390, and ThinkPad are trademarks of International Business Machines Corporation in the United States, other countries, or both.</para>"> -<!ENTITY aix "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, and 802 are registered trademarks of Institute of Electrical and Electronics Engineers, Inc. in the United States.</para>"> -<!ENTITY posix "POSIX®"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit and Quicken are registered @@ -141,60 +141,60 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, and Jaz are either registered trademarks or trademarks of Iomega Corporation in the United States and/or other countries.</para>"> -<!ENTITY iomegazip "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are trademarks of Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of Linus Torvalds.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID and Mylex are trademarks or registered trademarks of LSI Logic Corp.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media and Windows NT are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered trademarks of MIPS Technologies, Inc. in the United States and other countries.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- http://www.m-sys.com/content/LegalTerms.asp --> <!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are trademarks or registered trademarks of M-Systems Flash Disk Pioneers, Ltd.</para>"> -<!ENTITY diskonchip "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSD is a registered trademark of @@ -203,14 +203,14 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator are registered trademarks of Netscape Communications Corporation in the U.S. and other countries.</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD and NextHop are registered and unregistered trademarks of NextHop in the U.S. and other countries.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Group are @@ -218,31 +218,31 @@ Coverity, Inc.</para>"> countries.</para>"> <!ENTITY tm-attrib.unix "<para>UNIX is a registered trademarks of The Open Group in the United States and other countries.</para>"> -<!ENTITY motif "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark of Oracle Corporation.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are registered trademarks of PowerQuest Corporation in the United States and/or other countries.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered trademarks of QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, and RealAudio are the registered trademarks of RealNetworks, Inc.</para>"> -<!ENTITY realplayer "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -253,22 +253,22 @@ Coverity, Inc.</para>"> <!ENTITY tm-attrib.sap "<para>SAP, R/3, and mySAP are trademarks or registered trademarks of SAP AG in Germany and in several other countries all over the world.</para>"> -<!ENTITY r3 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are registered trademarks of Silicon Graphics, Inc., in the United States and/or other countries worldwide.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. Products bearing SPARC trademarks are based upon architecture developed by Sun Microsystems, Inc.</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -277,17 +277,17 @@ Coverity, Inc.</para>"> Solaris, StarOffice and SunOS are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> +<!ENTITY java "<trademark>Java</trademark>"> +<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> +<!ENTITY jdk "<trademark>JDK</trademark>"> +<!ENTITY jre "<trademark>JRE</trademark>"> +<!ENTITY jsp "<trademark>JSP</trademark>"> +<!ENTITY jvm "<trademark>JVM</trademark>"> +<!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY solaris "<trademark>Solaris</trademark>"> +<!ENTITY staroffice "<trademark>StarOffice</trademark>"> +<!ENTITY sun "<trademark>Sun</trademark>"> +<!ENTITY sunos "<trademark>SunOS</trademark>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered @@ -297,39 +297,39 @@ Coverity, Inc.</para>"> <!-- http://www.mathworks.com/company/trademarks.shtml --> <!ENTITY tm-attrib.themathworks "<para>MATLAB is a registered trademark of The MathWorks, Inc.</para>"> -<!ENTITY matlab "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of Thomson.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are registered trademarks of U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are trademarks or registered trademarks of Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered trademark of Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- http://www.vmware.com/legal.html --> <!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware, Inc.</para>"> <!-- http://www.xensource.com/xen-tm-faq.html --> -<!ENTITY xen "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks diff --git a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml index 6c2c34645b..e9c353f69d 100644 --- a/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/fr_FR.ISO8859-1/books/handbook/desktop/chapter.xml @@ -912,7 +912,7 @@ applications puissantes et simples d'emploi prêtes à être installées. Certaines d'entre elles sont compatibles avec des formats de fichiers très - répandus comme ceux utilisés par <application>Quicken®</application> ou <application>Excel</application> pour stocker des documents.</para> + répandus comme ceux utilisés par <application><trademark class="registered">Quicken</trademark></application> ou <application>Excel</application> pour stocker des documents.</para> <para>Cette section couvre les programmes suivants:</para> diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml index 004974488c..af90cbfd80 100644 --- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml +++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml @@ -1615,7 +1615,7 @@ Mounting root from ufs:/dev/md0c sauvegarder un système est d'acheter un second disque dur identique, et d'exécuter des copies régulières du premier disque - vers le second en utilisant <application>Ghost®</application> ou + vers le second en utilisant <application><trademark class="registered">Ghost</trademark></application> ou <application>XCOPY</application>. Alors, si le premier disque tombe en panne, ou est attaqué par un virus, ou corrompu par un défaut du système d'exploitation, on peut facilement diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent index 122c088468..68c640547d 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 déposées de 3Com Corporation.</para>"> <!-- An SGML entity can't start with a number... --> -<!ENTITY tm.3com "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques déposées de 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of Adaptec, Inc.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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 "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, et TrueType sont des marques d'Apple Computer, Inc., déposées aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 OS</trademark>"> +<!ENTITY quicktime "<trademark class='registered'>Quicktime</trademark>"> +<!ENTITY truetype "<trademark class='registered'>TrueType</trademark>"> <!ENTITY tm-attrib.arm "<para>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, and IOS are registered trademarks of Cisco Systems, Inc. and/or its affiliates in the United States and certain other countries.</para>"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY ios "IOS®"> +<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>"> +<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> <!ENTITY tm-attrib.corel "<para>Corel and WordPerfect are trademarks or registered trademarks of Corel Corporation and/or its @@ -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 "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>CVSup est une marque déposée 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, et 802 sont des marques déposées de Institute of Electrical and Electronics Engineers, Inc. aux Etats Unis.</para>"> -<!ENTITY posix "POSIX®"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, et Xeon sont des marques ou des marques déposées d'Intel Corporation ou de ses filiales aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> +<!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>"> <!-- 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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix and EasyIO are trademarks of Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux est une marque déposée de Linus Torvalds.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID and Mylex are trademarks or registered trademarks of LSI Logic Corp.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, et Windows NT sont soit des marques soit des marques déposées de Microsoft Corporation aux Etats Unis ou dans d'autres pays.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered trademarks of MIPS Technologies, Inc. in the United States and other countries.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- http://www.m-sys.com/content/LegalTerms.asp --> <!ENTITY tm-attrib.m-systems "<para>M-Systems and DiskOnChip are trademarks or registered trademarks of M-Systems Flash Disk Pioneers, Ltd.</para>"> -<!ENTITY diskonchip "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSD 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 "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD et NextHop sont des marques déposées ou non de NextHop aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, et UNIX sont des marques déposées et IT DialTone et The Open @@ -210,25 +210,25 @@ <!ENTITY tm-attrib.unix "<para>UNIX est une marque déposée de l'Open Group aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY motif "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle is a registered trademark of Oracle Corporation.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are registered trademarks of PowerQuest Corporation in the United States and/or other countries.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM and Eudora are registered trademarks of QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- 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 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, and OpenGL are registered trademarks of Silicon Graphics, Inc., in the United States and/or other countries worldwide.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!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 basés sur une architecture développée par Sun Microsystems, Inc.</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!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 déposées de Sun Microsystems, Inc. aux Etats Unis et dans d'autres pays.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> +<!ENTITY java "<trademark>Java</trademark>"> +<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> +<!ENTITY jdk "<trademark>JDK</trademark>"> +<!ENTITY jre "<trademark>JRE</trademark>"> +<!ENTITY jsp "<trademark>JSP</trademark>"> +<!ENTITY jvm "<trademark>JVM</trademark>"> +<!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY solaris "<trademark>Solaris</trademark>"> +<!ENTITY staroffice "<trademark>StarOffice</trademark>"> +<!ENTITY sun "<trademark>Sun</trademark>"> +<!ENTITY sunos "<trademark>SunOS</trademark>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec and Ghost are registered @@ -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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch is a trademark of Thomson</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics and Sportster are registered trademarks of U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple et Maple sont des marques ou des marques déposées de Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica est une marque déposée de Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis et Xiph.Org sont des diff --git a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml index daffa9217f..504547e8b7 100644 --- a/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml +++ b/hu_HU.ISO8859-2/books/handbook/desktop/chapter.xml @@ -1103,7 +1103,8 @@ csak a telepítésükre várnak. Néhány közülük kompatibilis az elterjedtebb állományformátumokkal, mint - például amiben a <application>Quicken®</application> és az + például amiben a <application><trademark + class="registered">Quicken</trademark></application> és az <application>Excel</application> is tárolja az adatait.</para> diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml index 404cf82cc4..99694a019f 100644 --- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml +++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml @@ -1880,7 +1880,8 @@ Mounting root from ufs:/dev/md0c megvásárlásával kialakították a rendszerük egyszerû és egyben a legolcsóbb biztonsági - mentését, amire a <application>Ghost®</application> vagy + mentését, amire a <application><trademark + class="registered">Ghost</trademark></application> vagy <application>XCOPY</application> programokkal tudnak rendszeres másolatokat készíteni. Így, ha az elsõdleges meghajtó tönkremegy vagy diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent index 3fe69b4c57..818f97117d 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 védjegyei.</para>"> <!-- An SGML entity can't start with a number... --> -<!ENTITY tm.3com "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>A 3ware a 3ware Inc. bejegyzett védjegyei.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>A Adaptec az Adaptec, Inc. bejegyzett védjegye.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Az Adobe, Acrobat, Acrobat Reader, és PostScript az Adobe Systems Incorporated bejegyzett védjegyei, vagy védjegyei az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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. védjegyei.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Az Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, és TrueType az Apple Computer, Inc., bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>Az ARM az ARM Limited bejegyzett védjegye.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>A Cisco, Catalyst és IOS a Cisco Systems, Inc. és/vagy társvállalatainak bejegyzett védjegyei az Egyesült Államokban és néhány más országban.</para>"> -<!ENTITY cisco "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 tm-attrib.corel "<para>A Corel és WordPerfect a Corel Corporation és/vagy leányvállalatainak bejegyzett védjegye Kanadában, az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>A Coverity bejegyzett védjegye, a Coverity Extend, Coverity Prevent és Coverity Prevent SQS pedig védjegyei a Coverity, Inc.-nek.</para>"> -<!ENTITY coverity "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>A Sound Blaster a Creative Technology Ltd. védjegye az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 védjegye.</para>"> -<!ENTITY fujitsu "Fujitsu®"> +<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> <!-- 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 védjegyei az Egyesült Államokban, más országokban, vagy mindkettõben.</para>"> -<!ENTITY aix "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>Az IEEE, POSIX és 802 az Institute of Electrical and Electronics Engineers, Inc. bejegyzett védjegyei az Egyesült Államokban.</para>"> -<!ENTITY ieee "IEEE®"> -<!ENTITY posix "POSIX®"> +<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Az Intel, Celeron, EtherExpress, i386, @@ -136,15 +136,15 @@ leányvállalatainak védjegyei vagy bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Az Intuit és Quicken az Intuit Inc., @@ -156,61 +156,61 @@ <!ENTITY tm-attrib.iomega "<para>Az Iomega, Zip és Jaz az Iomega bejegyzett védjegyei vagy védjegyei az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY iomegazip "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>A Lantronix és EasyIO a Lantronix Corporation védjegyei.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>A Linux Linus Torvalds bejegyzett védjegye.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>Az LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID és Mylex az LSI Logic Corp. védjegyei vagy bejegyzett védjegyei.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>A Macromedia, Flash és Shockwave a Macromedia, Inc. védjegyei és/vagy bejegyzett védjegyei az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>A Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media és Windows NT a Microsoft Corporation bejegyzett veacute;djegyei, vagy védjegyei az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>A MIPS és R4000 a MIPS Technologies, Inc. bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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. védjegyei vagy bejegyzett védjegyei.</para>"> -<!ENTITY diskonchip "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>A NetBSD a NetBSD Foundation bejegyzett @@ -220,14 +220,14 @@ a Netscape Communications Corporation bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>A GateD és NextHopa NextHop bejegyzett és nem bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!ENTITY tm-attrib.opengroup "<para>A Motif, OSF/1 és UNIX a The Open Group bejegyzett védjegyei, az IT DialTone és @@ -236,30 +236,30 @@ <!ENTITY tm-attrib.unix "<para>A UNIX a The Open Group bejegyzett védjegye az Egyesült Államokban és más országokban.</para>"> -<!ENTITY motif "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Az Oracle az Oracle Corporation bejegyzett védjegye.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>A PowerQuest és PartitionMagic a PowerQuest Corporation bejegyzett védjegyei az Egyesült Államokban és/vagy más országokban.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>A QUALCOMM és Eudora a QUALCOMM Incorporated bejegyzett védjegyei.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>A RealNetworks, RealPlayer és RealAudio a RealNetworks, Inc. bejegyzett védjegyei.</para>"> -<!ENTITY realplayer "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -271,15 +271,15 @@ védjegyei vagy bejegyzett védjegyei Németországban é sok más országban is világszerte.</para>"> -<!ENTITY r3 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>A Silicon Graphics, SGI és OpenGL a Silicon Graphics, Inc. bejegyzett védjegyei az Egyesült Államokban és/vagy más országokban világszerte.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>A SPARC, SPARC64, és UltraSPARC a SPARC International, Inc védjegyei az @@ -289,9 +289,9 @@ között teszi azok megfelelõ használatát elérhetõvé a licencelési megegyezések alapján.</para>"> -<!ENTITY sparc "SPARC®"> -<!ENTITY sparc64 "SPARC64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -301,19 +301,19 @@ és VirtualBox a Sun Microsystems, Inc. védjegyei vagy bejegyzett védjegyei az Egyesült Államokban és más országokban.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY openjdk "OpenJDK™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- 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 védjegye.</para>"> -<!ENTITY matlab "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>A SpeedTouch a Thomson védjegye.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>A U.S. Robotics és Sportster a U.S. Robotics Corporation. bejegyzett védjegyei.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>A Waterloo Maple és Maple a Waterloo Maple Inc. védjegyei vagy bejegyzett védjegyei.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>A Mathematica a Wolfram Research, Inc. védjegye.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- http://www.vmware.com/legal.html --> <!ENTITY tm-attrib.vmware "<para>A VMware a VMware, Inc. védjegye.</para>"> <!-- http://www.xensource.com/xen-tm-faq.html --> -<!ENTITY xen "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>Az XFree86 az XFree86 Project, Inc. védjegye.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Az Ogg Vorbis és Xiph.Org a Xiph.Org diff --git a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml index 44531d3249..2ea19b4d15 100644 --- a/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml +++ b/it_IT.ISO8859-15/books/handbook/desktop/chapter.xml @@ -915,7 +915,8 @@ personale sul tuo desktop FreeBSD, ci sono alcune applicazioni potenti e facili da usare pronti per essere installate. Alcuni di questi sono compatibili con i formati di file più utilizzati, come ad esempio - i formati usati da <application>Quicken®</application> o + i formati usati da <application><trademark + class="registered">Quicken</trademark></application> o <application>Excel</application> per i documenti.</para> <para>Questa sezione copre questi programmi:</para> diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml index e8442ee9da..3fdb9b38d6 100644 --- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml +++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml @@ -1253,7 +1253,8 @@ Mounting root from ufs:/dev/md0c modo più semplice e conveniente per mantenere un sistema di backup è di comperare un secondo disco identico al primo, e effettuare consuete copie del primo disco sul secondo usando - <application>Ghost®</application> o + <application><trademark + class="registered">Ghost</trademark></application> o <application>XCOPY</application>. Quindi, se il primo disco fa fiasco, è sotto le minacce di un virus, o è scarabocchiato da un'imperfezione del sistema operativo stesso, può essere diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml index 93b12592c3..e453dacc0f 100644 --- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml +++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml @@ -1176,7 +1176,7 @@ <para>&os; ¤Î¥Ç¥¹¥¯¥È¥Ã¥×¤Ç¸Ä¿ÍŪ¤Êºâ̳´ÉÍý¤¬¤Ç¤¤ë¤è¤¦¤Ë¡¢ ¶¯ÎϤǴÊñ¤Ë»È¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ ¤½¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> ¤ä <application>Excel</application> ¤Ê¤É¤Î¹¤¯¹Ô¤ÅϤä¿·Á¼°¤Î¥Õ¥¡¥¤¥ë¤È¸ß´¹À¤¬¤¢¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£</para> diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml index 2dbb6a3bbe..4a788f70cc 100644 --- a/ja_JP.eucJP/books/handbook/install/chapter.xml +++ b/ja_JP.eucJP/books/handbook/install/chapter.xml @@ -1406,7 +1406,7 @@ Mounting root from ufs:/dev/md0c °Ê³°¤Î¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£ ¤³¤Î»ÅÁȤߤòÍѤ¤¤ì¤Ð¥·¥¹¥Æ¥à¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ëºÇ¤â´Êñ¤Ç°Â²Á¤ÊÊýË¡¤ò¹½ÃۤǤ¤Þ¤¹¡£ ¤â¤¦°ì¤ÄƱ¤¸¥Ç¥£¥¹¥¯¤òÇ㤤¡¢ - <application>Ghost®</application> ¤ä + <application><trademark class="registered">Ghost</trademark></application> ¤ä <application>XCOPY</application> ¤òÍѤ¤¤Æ°ì¤ÄÌܤΥǥ£¥¹¥¯¤«¤éÆó¤Ä¤á¤Î¥Ç¥£¥¹¥¯¤Ø¤Î¥³¥Ô¡¼¤òÄê´üŪ¤Ë¼è¤ì¤Ð¤¤¤¤¤Î¤Ç¤¹¡£ ¤½¤·¤Æ¡¢°ì¤ÄÌܤΥǥ£¥¹¥¯¤Ë¾ã³²¤¬µ¯¤¤¿¤ê¡¢¥¦¥£¥ë¥¹¤Ë´¶À÷¤·¤¿¤ê¡¢ diff --git a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml index 519e286021..93df24b3b2 100644 --- a/mn_MN.UTF-8/books/handbook/desktop/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/desktop/chapter.xml @@ -1039,7 +1039,7 @@ $HOME/.mozilla/plugins/</userinput></screen> <para>Ð¥ÑÑ€Ñв Ñмар нÑгÑн шалтгаанаар та өөрийн хувийн Ñанхүүг FreeBSD ширÑÑний компьютер дÑÑÑ€ÑÑ ÑƒÐ´Ð¸Ñ€Ð´Ð°Ñ…Ñ‹Ð³ Ñ…Ò¯ÑÑж байгаа бол хүчирхÑг, ашиглахад Ñ…Ñлбар, Ñуулгахад бÑлÑн зарим нÑг програмууд байдаг. ТÑдгÑÑрийн зарим нÑг нь - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> ÑÑвÑл <application>Excel</application> баримтуудад Ñ…ÑÑ€ÑглÑгддÑгтÑй адил төрөл бүрийн файлын Ñ…ÑлбÑршилтүүдтÑй нийцтÑй байдаг.</para> diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml index 64e8bc3062..f9708964a8 100644 --- a/mn_MN.UTF-8/books/handbook/install/chapter.xml +++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml @@ -1345,8 +1345,9 @@ Mounting root from ufs:/dev/md0c өөрчлөлтийг нь дагаж ажилладаг. ÐÐ½Ñ Ð½ÑŒ <quote>primary master буюу анхны диÑкнÑÑÑ</quote> Ó©Ó©Ñ€ диÑкнÑÑÑ Ò¯Ð¹Ð»Ð´Ð»Ð¸Ð¹Ð½ ÑиÑтем ÑÑ…Ñлж ажиллах боломж өгдөг. ÐÐ½Ñ Ð°Ñ€Ð³Ð° нь - <application>Ghost®</application> - ÑÑвÑл <application>XCOPY</application> зÑÑ€Ñг програм ашиглан + <application> + <trademark class="registered">Ghost</trademark> + </application> ÑÑвÑл <application>XCOPY</application> зÑÑ€Ñг програм ашиглан нÑг диÑкний ерөнхий зургийг хуулж түүнтÑй адилхан хоёр дахь диÑк уруу хуулан ÑиÑтемдÑÑ Ð½Ð°Ð¹Ð´Ð²Ð°Ñ€Ñ‚Ð°Ð¹ хадгалалт хийдÑг хүмүүÑÑ‚ тун Ñ…ÑÑ€ÑгтÑй байдаг. ТÑгÑÑд, Ñ…ÑÑ€Ñв Ñхний диÑк ÑвдрÑÑ…, ÑÑвÑл вируÑтаж гÑмтÑÑ… зÑÑ€Ñг хүндрÑл diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent index af41dc9230..0bacc3ffce 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware болон Escalade нь 3ware Inc-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec нь Adaptec, Inc-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, болон PostScript нь бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл Adobe Systems Incorporated-ийн Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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, болон PCnet нь Advanced Micro Devices, Inc-ийн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, болон TrueType нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑуудад бүртгÑгдÑÑн Apple Computer, Inc.-ийн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM нь ARM Limited-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ба IOS нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ зарим нÑг улÑууд дахь Cisco Systems, Inc. ба/ÑÑвÑл түүний гишүүдийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY cisco "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 tm-attrib.corel "<para>Corel болон WordPerfect нь Канад, Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь Corel корпораци ба/ÑÑвÑл түүний Ñалбаруудын бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- 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 "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Sound Blaster нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь Creative Technology Ltd.-ийн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, болон 802 нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð´Ð°Ñ…ÑŒ Institute of Electrical and Electronics Engineers буюу Цахилгаан ба Ðлектроны Инженерүүдийн Сургуулийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY ieee "IEEE®"> -<!ENTITY posix "POSIX®"> +<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, болон Xeon нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь Intel корпораци ÑÑвÑл түүний Ñалбаруудын худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit болон Quicken нь @@ -148,60 +148,60 @@ <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, болон Jaz нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь Iomega корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY iomegazip "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix болон EasyIO нь Lantronix корпорацийн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Ð›Ð¸Ð½ÑƒÐºÑ Ð½ÑŒ Ð›Ð¸Ð½ÑƒÑ Ð¢Ð¾Ñ€Ð²Ð°Ð»Ð´Ñын бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID болон Mylex нь LSI Logic Corp-ийн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, болон Shockwave Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь Macromedia Inc-ийн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media болон Windows NT нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь Microsoft корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS болон R4000 нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь MIPS Technologies, Inc-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSD нь NetBSD Ñангийн бүртгÑгдÑÑн худалдааны @@ -210,14 +210,14 @@ <!ENTITY tm-attrib.netscape "<para>Netscape болон Netscape Navigator нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь Netscape Communications корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD болон NextHop нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь NextHop-ийн бүртгÑгдÑÑн ÑÑвÑл бүртгÑгдÑÑгүй худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle нь Oracle корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest болон PartitionMagic нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл буÑад улÑууд дахь PowerQuest корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM болон Eudora нь QUALCOMM Incorporated-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, болон RealAudio нь RealNetworks, Inc.-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY realplayer "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -261,23 +261,23 @@ <!ENTITY tm-attrib.sap "<para>SAP, R/3, болон mySAP нь Герман болон дÑлхий дахины буÑад улÑууд дахь SAP AG-ийн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY r3 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, болон OpenGL нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð°/ÑÑвÑл дÑлхий дахины буÑад улÑууд дахь Silicon Graphics, Inc.-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, болон UltraSPARC нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь SPARC International, Inc-ийн худалдааны Ñ‚ÑмдÑгнүүд юм. SPARC худалдааны Ñ‚ÑмдÑгнүүдийг зүүÑÑн бүтÑÑгдÑхүүнүүд нь Sun Microsystems, Inc-ийн хөгжүүлÑÑн архитектур дÑÑÑ€ ÑуурилÑан байдаг.</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -286,18 +286,18 @@ Solaris, StarOffice, SunOS болон VirtualBox нь Ðмерикийн ÐÑгдÑÑн Ð£Ð»Ñ Ð±Ð¾Ð»Ð¾Ð½ буÑад улÑууд дахь Sun Microsystems, Inc-ийн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- 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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch нь Thomson-ий худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics болон Sportster нь U.S. Robotics корпорацийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple болон Maple нь Waterloo Maple Inc-ийн худалдааны Ñ‚ÑмдÑгнүүд ÑÑвÑл бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑгнүүд юм.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica нь Wolfram Research, Inc-ийн бүртгÑгдÑÑн худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 нь XFree86 Project, Inc-ийн худалдааны Ñ‚ÑмдÑг юм.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis болон Xiph.Org нь Xiph.Org-ийн diff --git a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml index 82e445f678..b88e8c9dc2 100644 --- a/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/desktop/chapter.xml @@ -1115,7 +1115,8 @@ krachtige en gemakkelijk te gebruiken applicaties om te installeren. Sommige zijn compatibel met wijdverbreide bestandsformaten, zoals de formaten gebruikt door - <application>Quicken®</application> en + <application><trademark + class="registered">Quicken</trademark></application> en <application>Excel</application> om documenten op te slaan.</para> <para>Dit gedeelte behandelt deze programma's:</para> diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml index 84ab225382..beb8925e23 100644 --- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml +++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml @@ -1467,8 +1467,8 @@ Mounting root from ufs:/dev/md0c manier om een systeemback-up te maken het plaatsen van een identieke tweede harde schijf is en het daarop regelmatig kopieëren van de inhoud van de eerste schijf met - <application>Ghost®</application> - of <application>XCOPY</application>. Als de + <application><trademark class="registered">Ghost</trademark> + </application> of <application>XCOPY</application>. Als de eerste schijf weigert of aangevallen is door een virus of vervuild is door een fout in het besturingssysteem, dan kan eenvoudig overgeschakeld worden door in het BIOS de twee diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent index dcb5b2e8e2..7353848da0 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware en Escalade zijn geregistreerde handelsmerken van 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec is een geregistreerd handelsmerk van Adaptec, Inc.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!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 "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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 "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, en TrueType zijn handelsmerken van Apple Computer, Inc., geregistreerd in de Verenigde Staten en andere landen.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM is een geregistreerd handelsmerk van ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!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 "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 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 "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>Coverity is een geregistreerd handelsmerk; Coverity Extend, Coverity Prevent en Coverity Prevent SQS zijn handelsmerken van Coverity, Inc.</para>"> -<!ENTITY coverity "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Sound Blaster is een handelsmerk van Creative Technology Ltd. in de Verenigde Staten en/of andere landen.</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "Fujitsu®"> +<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, en 802 zijn geregistreerde handelsmerken van Institute of Electrical and Electronics Engineers, Inc. in de Verenigde Staten.</para>"> -<!ENTITY ieee "IEEE®"> -<!ENTITY posix "POSIX®"> +<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, en Xeon zijn handelsmerken of geregistreerde handelsmerken van Intel Corporation of haar dochterondernemingen in de Verenigde Staten en andere landen.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit 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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix en EasyIO zijn handelsmerken van Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux is een geregistreerd handelsmerk van Linus Torvalds.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- 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 "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, en Shockwave zijn handelsmerken geregistreerde handelsmerken van Macromedia, Inc. in de Verenigde Staten en/of andere landen.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media en Windows NT zijn òfwel geregistreerde handelsmerken òf handelsmerken van Microsoft Corporation in de Verenigde Staten en/of andere landen.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; 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 "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- 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 "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- 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 "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle is een geregistreerd handelsmerk van Oracle Corporation.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- 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 "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM en Eudora zijn geregistreerde handelsmerken van QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- 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 "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- 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 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &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 "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!-- 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 "SPARC®"> -<!ENTITY sparc64 "SPARC64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> <!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 "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY openjdk "OpenJDK™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- 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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch is een handelsmerk van Thomson.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics en Sportster zijn geregistreerde handelsmerken van U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple en Maple zijn handelsmerken of geregistreerde handelsmerken van Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica is een geregistreerd handelsmerk van Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 is een handelsmerk van The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis en Xiph.Org zijn handelsmerken diff --git a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml index a9cefed48e..a46516e736 100644 --- a/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml +++ b/pl_PL.ISO8859-2/books/handbook/desktop/chapter.xml @@ -805,7 +805,7 @@ bud¿etem we &os;, dostêpnych mamy kilka rozbudowanych i ³atwych w obs³udze aplikacji. Niektóre z nich s± zgodne z szeroko rozpowszechnionymi formatami plików jak np. dokumenty - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> czy <application>Excel</application>.</para> <para>Sekcja ta omawia nastêpuj±ce aplikacje:</para> diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml index ea4e1ddcf2..d3bac689a7 100644 --- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml +++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml @@ -1246,7 +1246,7 @@ Mounting root from ufs:/dev/md0c szczególnie wygodne dla tych u¿ytkowników, którzy za najprostsz± i najtañsz± metodê tworzenia kopii zapasowej uwa¿aj± kupno identycznego drugiego twardego dysku i kopiowanie zawarto¶ci pierwszego dysku przy - u¿yciu <application>Ghost®</application> + u¿yciu <application><trademark class="registered">Ghost</trademark></application> lub <application>XCOPY</application>. W przypadku uszkodzenia pierwszego dysku, ataku wirusa lub awarii systemu operacyjnego, dane mog± byæ z ³atwo¶ci± odzyskane poprzez zamianê logicznej kolejno¶ci dysków w BIOS-ie. To tak, diff --git a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml index daf01cfabe..443e5b9f3d 100644 --- a/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml +++ b/ru_RU.KOI8-R/books/handbook/desktop/chapter.xml @@ -843,7 +843,7 @@ ÄÅÓËÔÏÐÅ FreeBSD, ÅÓÔØ ÎÅÓËÏÌØËÏ ÍÏÝÎÙÈ É ÐÒÏÓÔÙÈ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÒÉÌÏÖÅÎÉÊ. îÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ ÓÏ×ÍÅÓÔÉÍÙ Ó ÛÉÒÏËÏ ÒÁÓÐÒÏÓÔÒÁÎÅÎÎÙÍÉ ÆÏÒÍÁÔÁÍÉ ÆÁÊÌÏ×, ÔÁËÉÍÉ ËÁË ÄÏËÕÍÅÎÔÙ - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> ÉÌÉ <application>Excel</application>.</para> <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÇÏ×ÏÒÉÔÓÑ Ï ÓÌÅÄÕÀÝÉÈ ÐÒÉÌÏÖÅÎÉÑÈ:</para> diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml index ae82c1c5dd..d66301ddc6 100644 --- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml +++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml @@ -1389,7 +1389,7 @@ Mounting root from ufs:/dev/md0c ÄÅÛÅ×ÙÊ ÐÕÔØ ÄÅÌÁÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ ÓÉÓÔÅÍÙ — ËÕÐÉÔØ ×ÔÏÒÏÊ ÉÄÅÎÔÉÞÎÙÊ ÐÅÒ×ÏÍÕ ÖÅÓÔËÉÊ ÄÉÓË É ÒÅÇÕÌÑÒÎÏ ÄÅÌÁÔØ ËÏÐÉÉ ÐÅÒ×ÏÇÏ ÄÉÓËÁ ÎÁ ×ÔÏÒÏÊ, ÉÓÐÏÌØÚÕÑ - <application>Ghost®</application> + <application><trademark class="registered">Ghost</trademark></application> ÉÌÉ <application>XCOPY</application>. úÁÔÅÍ, ÅÓÌÉ ÐÅÒ×ÙÊ ÄÉÓË ×ÙÊÄÅÔ ÉÚ ÓÔÒÏÑ, ÂÕÄÅÔ ÚÁÒÁÖÅÎ ×ÉÒÕÓÏÍ ÉÌÉ ÐÏ×ÒÅÖÄÅÎ ÉÚ-ÚÁ ÓÂÏÑ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, ÏÎ ÍÏÖÅÔ ÂÙÔØ ÌÅÇËÏ ×ÏÓÓÔÁÎÏ×ÌÅÎ diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent index 10f57221d0..17dac5db7a 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware É Escalade ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ Adaptec, Inc.</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader É PostScript ÜÔÏ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Adobe Systems Incorporated × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html --> <!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon, AMD Opteron, Athlon, Élan, É PCnet ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime É TrueType ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Apple Computer, Inc., ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ ARM Limited.</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, É IOS ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Cisco Systems, Inc. É/ÉÌÉ ÅÅ ËÏÍÐÁÎØÏÎÏ× × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY ios "IOS®"> +<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>"> +<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> <!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 "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX É 802 ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Institute of Electrical and Electronics Engineers, Inc. × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ.</para>"> -<!ENTITY posix "POSIX®"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium É Xeon ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Intel Corporation ÉÌÉ ÅÅ ÄÏÞÅÒÎÉÈ ËÏÍÐÁÎÉÊ × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit É Quicken ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ @@ -136,60 +136,60 @@ <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, É Jaz ÜÔÏ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Iomega Corporation × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY iomegazip "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix É EasyIO ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ Linus Torvalds.</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID É Mylex ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ LSI Logic Corp.</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash É Shockwave ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Macromedia, Inc. × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media É Windows NT ÜÔÏ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Microsoft Corporation × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS É R4000 ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ MIPS Technologies, Inc. × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSD ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ @@ -198,14 +198,14 @@ <!ENTITY tm-attrib.netscape "<para>Netscape É Netscape Navigator ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Netscape Communications Corporation × óûá É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD É NextHop ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ É ÎÅÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ NextHop × óûá É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ Oracle Corporation.</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest É PartitionMagic ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ PowerQuest Corporation × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM É Eudora ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ QUALCOMM Incorporated.</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- 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 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, É OpenGL ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Silicon Graphics, Inc., × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É/ÉÌÉ ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ ÐÏ ×ÓÅÍÕ ÍÉÒÕ.</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, É UltraSPARC ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ SPARC International, Inc × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ. ðÒÏÄÕËÔÙ Ó ÔÏÒÇÏ×ÏÊ ÍÁÒËÏÊ SPARC ÏÓÎÏ×ÁÎÙ ÎÁ ÁÒÈÉÔÅËÔÕÒÅ, ÒÁÚÒÁÂÏÔÁÎÎÏÊ Sun Microsystems, Inc.</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -271,17 +271,17 @@ SunOS ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Sun Microsystems, Inc. × óÏÅÄÉÎÅÎÎÙÈ ûÔÁÔÁÈ É ÄÒÕÇÉÈ ÓÔÒÁÎÁÈ.</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> +<!ENTITY java "<trademark>Java</trademark>"> +<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> +<!ENTITY jdk "<trademark>JDK</trademark>"> +<!ENTITY jre "<trademark>JRE</trademark>"> +<!ENTITY jsp "<trademark>JSP</trademark>"> +<!ENTITY jvm "<trademark>JVM</trademark>"> +<!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY solaris "<trademark>Solaris</trademark>"> +<!ENTITY staroffice "<trademark>StarOffice</trademark>"> +<!ENTITY sun "<trademark>Sun</trademark>"> +<!ENTITY sunos "<trademark>SunOS</trademark>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec É Ghost ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ @@ -291,39 +291,39 @@ <!-- http://www.mathworks.com/company/trademarks.shtml --> <!ENTITY tm-attrib.themathworks "<para>MATLAB ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÉ MathWorks, Inc.</para>"> -<!ENTITY matlab "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch ÜÔÏ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ Thomson.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics É Sportster ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple É Maple ÜÔÏ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ ÉÌÉ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÅ ÔÏÒÇÏ×ÙÅ ÍÁÒËÉ Waterloo Maple Inc.</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica ÜÔÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÁÑ ÔÏÒÇÏ×ÁÑ ÍÁÒËÉ Wolfram Research, Inc.</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 ÜÔÏ ÔÏÒÇÏ×ÁÑ ÍÁÒËÁ XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- 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 1fd9f825d3..e5e7253175 100644 --- a/share/xml/trademarks.ent +++ b/share/xml/trademarks.ent @@ -14,95 +14,89 @@ <!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 "3Com®"> +<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware is a registered trademark of 3ware Inc.</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3ware</trademark>"> <!-- 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 "Adaptec®"> +<!ENTITY adaptec "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Adaptec</trademark>"> <!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 "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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 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>"> <!-- 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, Élan, Opteron, and PCnet are trademarks of Advanced Micro Devices, Inc.</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>"> +<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>Élan</trademark>"> +<!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>"> <!-- 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 "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 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 tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM is a registered trademark of ARM Limited.</para>"> -<!ENTITY arm "ARM®"> - -<!-- http://www.bluetooth.com/sig/trademark.use.asp --> -<!ENTITY bluetooth "Bluetooth®"> +<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ARM</trademark>"> <!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 "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 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 "WordPerfect®"> +<!ENTITY wordperfect "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>WordPerfect</trademark>"> <!-- 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 "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!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>"> <!-- 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 "SoundBlaster®"> +<!ENTITY soundblaster "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SoundBlaster</trademark>"> <!-- 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®"> - <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of the FreeBSD Foundation.</para>"> -<!ENTITY fujitsu "Fujitsu®"> +<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Fujitsu</trademark>"> <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp --> <!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica, @@ -114,33 +108,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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!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 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 "IEEE®"> -<!ENTITY posix "POSIX®"> +<!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>"> <!-- 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 "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!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>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit and Quicken are registered @@ -150,60 +144,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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!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 tm-attrib.lantronix "<para xmlns='http://docbook.org/ns/docbook'>Lantronix and EasyIO are trademarks of Lantronix Corporation.</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark xmlns='http://docbook.org/ns/docbook'>EasyIO</trademark>"> <!-- 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 "Linux®"> +<!ENTITY linux "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Linux</trademark>"> <!-- 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 "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!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 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 "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!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 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 "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!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 microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!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 windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; 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 "MIPS®"> +<!ENTITY mips "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark xmlns='http://docbook.org/ns/docbook'>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>DiskOnChip</trademark>"> <!-- 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 @@ -212,14 +206,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 "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!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 Navigator</trademark>"> <!-- 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 "GateD®"> +<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>GateD</trademark>"> <!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 @@ -227,31 +221,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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!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>"> <!-- 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 "Oracle®"> +<!ENTITY oracle "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Oracle</trademark>"> <!-- 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 "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PartitionMagic</trademark>"> <!-- 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 "Eudora®"> +<!ENTITY eudora "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Eudora</trademark>"> <!-- 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 "RealPlayer®"> +<!ENTITY realplayer "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -262,14 +256,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 "R/3®"> -<!ENTITY sap "SAP®"> +<!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 sap.r3 "&sap; &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 "OpenGL®"> +<!ENTITY opengl "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OpenGL</trademark>"> <!-- http://www.sparc.org/trademarksListing.html --> <!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, and @@ -277,9 +271,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 "SPARC®"> -<!ENTITY sparc64 "SPARC64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!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>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -288,19 +282,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 "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY openjdk "OpenJDK™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para xmlns='http://docbook.org/ns/docbook'>Symantec and Ghost are registered @@ -310,39 +304,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 "MATLAB®"> +<!ENTITY matlab "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para xmlns='http://docbook.org/ns/docbook'>SpeedTouch is a trademark of Thomson.</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark xmlns='http://docbook.org/ns/docbook'>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para xmlns='http://docbook.org/ns/docbook'>U.S. Robotics and Sportster are registered trademarks of U.S. Robotics Corporation.</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!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>"> <!-- 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 "Maple™"> +<!ENTITY maple "<trademark xmlns='http://docbook.org/ns/docbook'>Maple</trademark>"> <!-- 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 "Mathematica®"> +<!ENTITY mathematica "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark xmlns='http://docbook.org/ns/docbook'>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para xmlns='http://docbook.org/ns/docbook'>XFree86 is a trademark of The XFree86 Project, Inc.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark xmlns='http://docbook.org/ns/docbook'>XFree86</trademark>"> <!-- 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/books/handbook/desktop/chapter.xml b/zh_CN.GB2312/books/handbook/desktop/chapter.xml index 500409b9ca..b06e480b45 100644 --- a/zh_CN.GB2312/books/handbook/desktop/chapter.xml +++ b/zh_CN.GB2312/books/handbook/desktop/chapter.xml @@ -893,7 +893,7 @@ <para>¼ÙÈ磬»ùÓÚÈκεÄÀíÓÉ£¬ÄúÏëÒªÔÚ FreeBSD Desktop ¹ÜÀíÄú¸öÈ˵IJÆÕþ£¬ÓÐһЩǿ´ó²¢ÇÒÒ×ÓÚʹÓõÄÈí¼þ¿ÉÒÔ±»ÄúÑ¡Ôñ°²×°¡£ ËüÃÇÖеÄһЩÓëÁ÷ÐеÄÎļþ¸ñʽ¼æÈÝÏó - <application>Quicken®</application> + <application><trademark class="registered">Quicken</trademark></application> ºÍ <application>Excel</application> Îļþ¡£</para> <para>±¾½Úº¸ÇÈçϳÌÐò£º</para> diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml index b3f2b40afc..ae349ee96d 100644 --- a/zh_CN.GB2312/books/handbook/install/chapter.xml +++ b/zh_CN.GB2312/books/handbook/install/chapter.xml @@ -1255,7 +1255,7 @@ Mounting root from ufs:/dev/md0c <quote>primary master</quote> Ó²ÅÌ¿ª»ú¡£ Ðí¶àÈË·¢ÏÖ×î¼òµ¥¶ø±ãÒ˱¸·ÝϵͳµÄ·½Ê½¾ÍÊÇÔÙÈ¥ÂòÒ»¿éһģһÑùµÄÓ²ÅÌ£¬ È»ºó¶¨ÆÚ½«Êý¾Ý´ÓµÚÒ»¿éÓ²Å̸´ÖƵ½µÚ¶þ¸öÓ²ÅÌ£¬Ê¹Óà - <application>Ghost®</application> + <application><trademark class="registered">Ghost</trademark></application> »ò <application>XCOPY</application>¡£ËùÒÔ£¬µ±µÚÒ»¸öÓ²ÅÌËÀÁË£¬ »òÕßÊDZ»²¡¶¾ÆÆ»µ£¬»òÕßÓлµ¹ìµÀ£¬ ËûÃÇ¿ÉÒÔµ÷Õû BIOS ÖеĿª»ú˳Ðò¶øÖ±½ÓÓõڶþ¿éÓ²ÅÌ¿ª»ú¡£ diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent index 94208dde9b..efefa7eb0f 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware ºÍ Escalade ÊÇ 3ware Inc µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec ÊÇ Adaptec, Inc. µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, ÒÔ¼° PostScript ÊÇ Adobe Systems Incorporated ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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, ºÍ PCnet ÊÇ Advanced Micro Devices, Inc. µÄÉ̱ꡣ</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, ÒÔ¼° TrueType ÊÇ Apple Computer, Inc. ÔÚÃÀ¹úÒÔ¼°ÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM ÊÇ ARM Limited. µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ºÍ IOS ÊÇ Cisco Systems, Inc. ºÍ/»òÆ丽Êô»ú¹¹ÔÚÃÀ¹úºÍһЩÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY cisco "Cisco®"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY etherchannel "EtherChannel®"> -<!ENTITY ios "IOS®"> +<!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 tm-attrib.corel "<para>Corel ºÍ WordPerfect ÊÇ Corel Corporation ºÍ/»òÆä×Ó¹«Ë¾ ÔÚ¼ÓÄôó¡¢ÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- 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 "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Sound Blaster ÊÇ Creative Technology Ltd. ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- 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 "Fujitsu®"> +<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>"> <!-- 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 "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, ºÍ 802 ÊÇ Institute of Electrical and Electronics Engineers, Inc. ÔÚÃÀ¹úµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY ieee "IEEE®"> -<!ENTITY posix "POSIX®"> +<!ENTITY ieee "<trademark class='registered'>IEEE</trademark>"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, ºÍ Xeon ÊÇ Intel Corporation ¼°Æä·ÖÖ§»ú¹¹ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit ºÍ 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 "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix ºÍ EasyIO ÊÇ Lantronix Corporation µÄÉ̱ꡣ</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux ÊÇ Linus Torvalds µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- http://www.lsilogic.com/trademrk.html --> <!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID ºÍ Mylex ÊÇ LSI Logic Corp µÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY acceleraid "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, ÒÔ¼° Shockwave Macromedia, Inc. ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, ºÍ Windows NT ÊÇ Microsoft Corporation ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS ºÍ R4000 ÊÇ MIPS Technologies, Inc. ÔÚÃÀ¹úÒÔ¼°ÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSDÊÇ NetBSD FoundationµÄ×¢²áÉ̱ꡣ</para>"> <!ENTITY tm-attrib.netscape "<para>Netscape ÒÔ¼° Netscape Navigator ÊÇ Netscape Communications Corporation ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD ºÍ NextHop ÊÇ NextHop ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!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 "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle ÊÇ Oracle Corporation µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest ºÍ PartitionMagic ÊÇ PowerQuest Corporation ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM ºÍ Eudora ÊÇ QUALCOMM Incorporated µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- http://www.realnetworks.com/company/logos/policy.html --> <!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, ºÍ RealAudio ÊÇ RealNetworks, Inc. µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY realplayer "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -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 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, ºÍ OpenGL ÊÇ Silicon Graphics, Inc. ÔÚÃÀ¹úºÍ/»òÆäËû¹ú¼ÒµÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!-- 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 "SPARC®"> -<!ENTITY sparc64 "SPARC64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> @@ -253,19 +253,19 @@ Coverity Extend£¬ Coverity Prevent ºÍ Coverity Prevent SQS ÊÇ Coverity ¹«Ë¾µÄ×¢² Solaris¡¢ StarOffice¡¢ SunOS ÒÔ¼° VirtualBox ÊÇ Sun Microsystems, Inc. ÔÚÃÀ¹úºÍÆäËû¹ú¼ÒµÄÉ̱ê»ò×¢²áÉ̱ꡣ</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY openjdk "OpenJDK™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> -<!ENTITY virtualbox "VirtualBox™"> +<!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>"> <!-- 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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch ÊÇ Thomson µÄÉ̱ꡣ</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics ºÍ Sportster ÊÇ U.S. Robotics Corporation µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple ºÍ Maple ÊÇ Waterloo Maple Inc µÄÉ̱ê»ò×¢²áÉ̱ê</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica ÊÇ Wolfram Research, Inc µÄ×¢²áÉ̱ꡣ</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 ÊÇ The XFree86 Project, Inc µÄÉ̱ꡣ.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis ºÍ Xiph.Org ÊÇ Xiph.Org µÄÉ̱ꡣ</para>"> diff --git a/zh_TW.Big5/books/handbook/desktop/chapter.xml b/zh_TW.Big5/books/handbook/desktop/chapter.xml index 2c993c2a93..25aa903c5f 100644 --- a/zh_TW.Big5/books/handbook/desktop/chapter.xml +++ b/zh_TW.Big5/books/handbook/desktop/chapter.xml @@ -803,7 +803,7 @@ <para>¦pªG¦³¥ô¦ó²z¥Ñ§A·Qn¦b§Aªº FreeBSD ®à±Àô¹Ò¤WºÞ²z§AªºÓ¤H°]°È¡A ³o¸Ì¦³¤@¨Ç¥\¯à±j¤j¡B¨Ï¥Î²³æªºÀ³¥Îµ{¦¡¥i¨Ñ¦w¸Ë¡C ³o¨Ç°]°ÈºÞ²z³nÅ餧¤¤¦³¨Ç¬O¬Û®e©ó¬y¦æªº - <application>Quicken®</application> ©Î <application>Excel</application> ¤å¥ó¡C</para> + <application><trademark class="registered">Quicken</trademark></application> ©Î <application>Excel</application> ¤å¥ó¡C</para> <para>³o¸`²[»\¤F¤U±³o¨Ç³nÅé¡G</para> diff --git a/zh_TW.Big5/books/handbook/install/chapter.xml b/zh_TW.Big5/books/handbook/install/chapter.xml index 028fb20048..431f1f1215 100644 --- a/zh_TW.Big5/books/handbook/install/chapter.xml +++ b/zh_TW.Big5/books/handbook/install/chapter.xml @@ -1293,7 +1293,8 @@ Mounting root from ufs:/dev/md0c BIOS ¨ºÃä¥i¥H½Õ¾ã¥¿±`ªººÏºÐ¾÷¶¶§Ç¡AµM«á³o¨Ç§@·~¨t²Î·|¸òµÛ BIOS °µ§ïÅÜ¡C ³oÅý¨Ï¥ÎªÌ¤£¤@©w«D±on¥Ñ©Ò¿×ªº <quote>primary master</quote> µwºÐ¶}¾÷¡C ¦³¤Hµo²{³Ì²³æ¡B«K©yªº³Æ¥÷¨t²Î¤è¦¡¡A´N¬O¦A¥h¶R¤@Áû¤@¼Ò¤@¼ËªºµwºÐ¡A - µM«á©w´Á¨Ï¥Î <application>Ghost®</application> ©Î + µM«á©w´Á¨Ï¥Î <application> + <trademark class="registered">Ghost</trademark></application> ©Î <application>XCOPY</application> ¥H±N¸ê®Æ±q²Ä¤@ÁûµwºÐ½Æ»s¨ì²Ä¤GÁûµwºÐ¤W±¥h¡C ©Ò¥H¡A·í²Ä¤@ÁûµwºÐ±¾¤F(¥i¯à¬O¯f¬r©ÎÃay³y¦¨ªº)¡A diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent index e1e00d4605..5c290061e1 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 "3Com®"> +<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>"> <!ENTITY tm-attrib.3ware "<para>3ware ©M Escalade ¬O 3ware Inc ªºµù¥U°Ó¼Ð¡C </para>"> -<!ENTITY tm.3ware "3ware®"> +<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>"> <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright --> <!ENTITY tm-attrib.adaptec "<para>Adaptec ¬O Adaptec, Inc. ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY adaptec "Adaptec®"> +<!ENTITY adaptec "<trademark class='registered'>Adaptec</trademark>"> <!ENTITY tm-attrib.adobe "<para>Adobe, Acrobat, Acrobat Reader, ¥H¤Î PostScript ¬O Adobe Systems Incorporated ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY acrobat "Acrobat®"> -<!ENTITY acrobat.reader "Acrobat Reader®"> -<!ENTITY adobe "Adobe®"> -<!ENTITY postscript "PostScript®"> +<!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>"> <!-- 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, ©M PCnet ¬O Advanced Micro Devices, Inc. ªº°Ó¼Ð¡C</para>"> -<!ENTITY amd.athlon "AMD Athlon™"> -<!ENTITY amd.opteron "AMD Opteron™"> -<!ENTITY athlon "Athlon™"> -<!ENTITY elan "Élan™"> -<!ENTITY opteron "Opteron™"> +<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>"> +<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>"> +<!ENTITY athlon "<trademark>Athlon</trademark>"> +<!ENTITY elan "<trademark>Élan</trademark>"> +<!ENTITY opteron "<trademark>Opteron</trademark>"> <!-- http://www.apple.com/legal/trademark/appletmlist.html --> <!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, Quicktime, ¥H¤Î TrueType ¬O Apple Computer, Inc. ¦b¬ü°ê¥H¤Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY airport "AirPort®"> -<!ENTITY apple "Apple®"> -<!ENTITY firewire "FireWire®"> -<!ENTITY imac "iMac®"> -<!ENTITY mac "Mac®"> -<!ENTITY macintosh "Macintosh®"> -<!ENTITY macos "Mac OS®"> -<!ENTITY quicktime "Quicktime®"> -<!ENTITY truetype "TrueType®"> +<!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 tm-attrib.arm "<para>ARM ¬O ARM Limited. ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY arm "ARM®"> +<!ENTITY arm "<trademark class='registered'>ARM</trademark>"> <!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ©M IOS ¬O Cisco Systems, Inc. ©M/©Î¨äªþÄݾ÷ºc¦b¬ü°ê©M¤@¨Ç¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY catalyst "Catalyst®"> -<!ENTITY ios "IOS®"> +<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>"> +<!ENTITY ios "<trademark class='registered'>IOS</trademark>"> <!ENTITY tm-attrib.corel "<para>Corel ©M WordPerfect ¬O Corel Corporation ©M/©Î¨ä¤l¤½¥q¦b¥[®³¤j¡B¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY wordperfect "WordPerfect®"> +<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>"> <!-- http://www.coverity.com/html/press_story45_07_25_07.html --> <!ENTITY tm-attrib.coverity "<para>Coverity ¬Oµù¥U°Ó¼Ð¡C ¦Ó Coverity Extend¡BCoverity Prevent¡BCoverity Prevent SQS ¬O Coverity, Inc. ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY coverity "Coverity®"> -<!ENTITY coverity.prevent "Coverity Prevent®"> +<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>"> +<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>"> <!-- http://www.creative.com/legal.asp --> <!ENTITY tm-attrib.creative "<para>Sound Blaster ¬O Creative Technology Ltd. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY soundblaster "SoundBlaster®"> +<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>"> <!-- http://www.cvsup.org/ --> <!ENTITY tm-attrib.cvsup "<para>CVSup ¬O @@ -94,30 +94,30 @@ AMD Opteron, Athlon, Élan, Opteron, ©M PCnet ¬O <!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, S/390, ©M ThinkPad ¬O °ê»Ú°Ó¥Î¾÷¾¹¤½¥q¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð©Î°Ó¼Ð¡C</para>"> -<!ENTITY aix "AIX®"> -<!ENTITY os2 "OS/2®"> -<!ENTITY powerpc "PowerPC®"> -<!ENTITY ps2 "PS/2®"> -<!ENTITY s390 "S/390®"> -<!ENTITY thinkpad "ThinkPad®"> +<!ENTITY aix "<trademark class='registered'>AIX</trademark>"> +<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>"> +<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>"> +<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>"> +<!ENTITY s390 "<trademark class='registered'>S/390</trademark>"> +<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>"> <!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, ©M 802 ¬O Institute of Electrical and Electronics Engineers, Inc. ¦b¬ü°êªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY posix "POSIX®"> +<!ENTITY posix "<trademark class='registered'>POSIX</trademark>"> <!-- http://www.intel.com/intel/legal/tmnouns2.htm --> <!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386, i486, Itanium, Pentium, ©M Xeon ¬O Intel Corporation ¤Î¨ä¤À¤ä¾÷ºc¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY celeron "Celeron®"> -<!ENTITY etherexpress "EtherExpress™"> -<!ENTITY i386 "i386™"> -<!ENTITY i486 "i486™"> -<!ENTITY intel "Intel®"> -<!ENTITY itanium "Itanium®"> -<!ENTITY pentium "Pentium®"> -<!ENTITY xeon "Xeon™"> -<!ENTITY core "Core™"> +<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>"> +<!ENTITY etherexpress "<trademark>EtherExpress</trademark>"> +<!ENTITY i386 "<trademark>i386</trademark>"> +<!ENTITY i486 "<trademark>i486</trademark>"> +<!ENTITY intel "<trademark class='registered'>Intel</trademark>"> +<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>"> +<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>"> +<!ENTITY xeon "<trademark>Xeon</trademark>"> +<!ENTITY core "<trademark>Core</trademark>"> <!-- http://www.quicken.com/support/trademark/ --> <!ENTITY tm-attrib.intuit "<para>Intuit ©M Quicken ¬O Intuit Inc., ©Î¨ä¤l¤½¥q¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> @@ -126,95 +126,95 @@ AMD Opteron, Athlon, Élan, Opteron, ©M PCnet ¬O <!ENTITY tm-attrib.iomega "<para>Iomega, Zip, ©M Jaz ¬O Iomega Corporation ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY iomegazip "Zip®"> -<!ENTITY jaz "Jaz®"> +<!ENTITY iomegazip "<trademark class='registered'>Zip</trademark>"> +<!ENTITY jaz "<trademark class='registered'>Jaz</trademark>"> <!ENTITY tm-attrib.lantronix "<para>Lantronix ©M EasyIO ¬O Lantronix Corporation ªº°Ó¼Ð¡C</para>"> -<!ENTITY easyio "EasyIO™"> +<!ENTITY easyio "<trademark>EasyIO</trademark>"> <!-- http://www.linuxmark.org/ --> <!ENTITY tm-attrib.linux "<para>Linux ¬O Linus Torvalds ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY linux "Linux®"> +<!ENTITY linux "<trademark class='registered'>Linux</trademark>"> <!-- 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 "AcceleRAID™"> -<!ENTITY megaraid "MegaRAID®"> -<!ENTITY mylex "Mylex®"> +<!ENTITY acceleraid "<trademark>AcceleRAID</trademark>"> +<!ENTITY megaraid "<trademark class='registered'>MegaRAID</trademark>"> +<!ENTITY mylex "<trademark class='registered'>Mylex</trademark>"> <!ENTITY tm-attrib.macromedia "<para>Macromedia, Flash, ¥H¤Î Shockwave Macromedia, Inc. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY flash "Flash™"> -<!ENTITY macromedia "Macromedia®"> +<!ENTITY flash "<trademark>Flash</trademark>"> +<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>"> <!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media, ©M Windows NT ¬O Microsoft Corporation ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY intellimouse "IntelliMouse®"> -<!ENTITY microsoft "Microsoft®"> +<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>"> +<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>"> <!ENTITY microsoft.windows "µsoft; &windows;"> -<!ENTITY ms-dos "MS-DOS®"> -<!ENTITY outlook "Outlook®"> -<!ENTITY windows "Windows®"> -<!ENTITY windows.media "Windows Media®"> +<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>"> +<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>"> +<!ENTITY windows "<trademark class='registered'>Windows</trademark>"> +<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>"> <!ENTITY windows2k "&windows; 2000"> -<!ENTITY windowsnt "Windows NT®"> +<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>"> <!ENTITY windowsxp "&windows; XP"> <!ENTITY tm-attrib.mips "<para>MIPS ©M R4000 ¬O MIPS Technologies, Inc. ¦b¬ü°ê¥H¤Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY mips "MIPS®"> +<!ENTITY mips "<trademark class='registered'>MIPS</trademark>"> <!-- http://www.mysql.com/company/trademark.html --> -<!ENTITY mysql "MySQL™"> +<!ENTITY mysql "<trademark>MySQL</trademark>"> <!-- 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 "DiskOnChip®"> +<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>"> <!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ --> <!ENTITY tm-attrib.netbsd "<para>NetBSD¬O NetBSD Foundationªºµù¥U°Ó¼Ð¡C</para>"> <!ENTITY tm-attrib.netscape "<para>Netscape ¥H¤Î Netscape Navigator ¬O Netscape Communications Corporation ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY netscape "Netscape®"> -<!ENTITY netscape.navigator "Netscape Navigator®"> +<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>"> +<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>"> <!-- http://www.nexthop.com/legal.shtml --> <!ENTITY tm-attrib.nexthop "<para>GateD ©M NextHop ¬O NextHop ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY gated "GateD®"> +<!ENTITY gated "<trademark class='registered'>GateD</trademark>"> <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, ©M UNIX ¬O The Open Group ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡F IT DialTone ©M The Open Group ¬O¨ä°Ó¼Ð¡C</para>"> <!ENTITY tm-attrib.unix "<para>UNIX¬O Open Group ¦b¬ü°ê©M¨ä¥¦°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY motif "Motif®"> -<!ENTITY unix "UNIX®"> +<!ENTITY motif "<trademark class='registered'>Motif</trademark>"> +<!ENTITY unix "<trademark class='registered'>UNIX</trademark>"> <!-- http://www.oracle.com/html/trademark.html --> <!-- http://www.oracle.com/html/3party.html --> <!ENTITY tm-attrib.oracle "<para>Oracle ¬O Oracle Corporation ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY oracle "Oracle®"> +<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>"> <!-- http://www.powerquest.com/legal/ --> <!ENTITY tm-attrib.powerquest "<para>PowerQuest ©M PartitionMagic ¬O PowerQuest Corporation ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY partitionmagic "PartitionMagic®"> +<!ENTITY partitionmagic "<trademark class='registered'>PartitionMagic</trademark>"> <!-- http://www.qualcomm.com/main/legal.html --> <!ENTITY tm-attrib.qualcomm "<para>QUALCOMM ©M Eudora ¬O QUALCOMM Incorporated ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY eudora "Eudora®"> +<!ENTITY eudora "<trademark class='registered'>Eudora</trademark>"> <!-- 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 "RealPlayer®"> +<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>"> <!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks --> <!-- http://www.redhat.com/legal/legal_statement.html --> @@ -224,36 +224,36 @@ AMD Opteron, Athlon, Élan, Opteron, ©M PCnet ¬O <!ENTITY tm-attrib.sap "<para>SAP, R/3, ©M mySAP ¬O SAP AG ¦b¼w°ê¥H¤Î³\¦h¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY r3 "R/3®"> -<!ENTITY sap "SAP®"> +<!ENTITY r3 "<trademark class='registered'>R/3</trademark>"> +<!ENTITY sap "<trademark class='registered'>SAP</trademark>"> <!ENTITY sap.r3 "&sap; &r3;"> <!ENTITY tm-attrib.sgi "<para>Silicon Graphics, SGI, ©M OpenGL ¬O Silicon Graphics, Inc. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY opengl "OpenGL®"> +<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>"> <!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, ¥H¤Î UltraSPARC ¬O SPARC International, Inc ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð¡C ¬° Sun Microsystems, Inc. ©Ò¶}µoªº¬[ºc¡A¥]§t SPARC °Ó¼Ðªº²£«~¡C</para>"> -<!ENTITY sparc "Sparc®"> -<!ENTITY sparc64 "Sparc64®"> -<!ENTITY ultrasparc "UltraSPARC®"> +<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>"> +<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>"> +<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>"> <!-- http://www.sun.com/suntrademarks/ --> <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JSP, JVM, Netra, Solaris, StarOffice ©M SunOS ¬O Sun Microsystems, Inc. ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY java "Java™"> -<!ENTITY java.virtual.machine "Java Virtual Machine™"> -<!ENTITY jdk "JDK™"> -<!ENTITY jre "JRE™"> -<!ENTITY jsp "JSP™"> -<!ENTITY jvm "JVM™"> -<!ENTITY netra "Netra™"> -<!ENTITY solaris "Solaris™"> -<!ENTITY staroffice "StarOffice™"> -<!ENTITY sun "Sun™"> -<!ENTITY sunos "SunOS™"> +<!ENTITY java "<trademark>Java</trademark>"> +<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>"> +<!ENTITY jdk "<trademark>JDK</trademark>"> +<!ENTITY jre "<trademark>JRE</trademark>"> +<!ENTITY jsp "<trademark>JSP</trademark>"> +<!ENTITY jvm "<trademark>JVM</trademark>"> +<!ENTITY netra "<trademark>Netra</trademark>"> +<!ENTITY solaris "<trademark>Solaris</trademark>"> +<!ENTITY staroffice "<trademark>StarOffice</trademark>"> +<!ENTITY sun "<trademark>Sun</trademark>"> +<!ENTITY sunos "<trademark>SunOS</trademark>"> <!-- http://www.symantec.com/legal/legal_note.html --> <!ENTITY tm-attrib.symantec "<para>Symantec ©M Ghost ¬O @@ -262,35 +262,35 @@ AMD Opteron, Athlon, É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 "MATLAB®"> +<!ENTITY matlab "<trademark class='registered'>MATLAB</trademark>"> <!ENTITY tm-attrib.thomson "<para>SpeedTouch ¬O Thomson ªº°Ó¼Ð¡C</para>"> -<!ENTITY speedtouch "SpeedTouch™"> +<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>"> <!-- http://www.usr.com/adbuilder/ab-usage-guidelines.asp --> <!-- http://www.usr.com/adbuilder/ab-tips-trade-ref.asp --> <!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics ©M Sportster ¬O U.S. Robotics Corporation ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY sportster "Sportster®"> -<!ENTITY usrobotics "U.S. Robotics®"> +<!ENTITY sportster "<trademark class='registered'>Sportster</trademark>"> +<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>"> <!-- http://www.maplesoft.com/trademarks.shtml --> <!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple ©M Maple ¬O Waterloo Maple Inc ªº°Ó¼Ð©Îµù¥U°Ó¼Ð</para>"> -<!ENTITY maple "Maple™"> +<!ENTITY maple "<trademark>Maple</trademark>"> <!-- http://www.wolfram.com/company/terms.html --> <!ENTITY tm-attrib.wolframresearch "<para>Mathematica ¬O Wolfram Research, Inc ªºµù¥U°Ó¼Ð¡C</para>"> -<!ENTITY mathematica "Mathematica®"> +<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>"> <!-- 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 "Xen™"> +<!ENTITY xen "<trademark>Xen</trademark>"> <!ENTITY tm-attrib.xfree86 "<para>XFree86 ¬O The XFree86 Project, Inc ªº°Ó¼Ð¡C.</para>"> -<!ENTITY xfree86 "XFree86™"> +<!ENTITY xfree86 "<trademark>XFree86</trademark>"> <!-- http://www.xiph.org/ --> <!ENTITY tm-attrib.xiph "<para>Ogg Vorbis ©M Xiph.Org ¬O Xiph.Org ªº°Ó¼Ð¡C</para>"> |