aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--de_DE.ISO8859-1/share/xml/trademarks.ent51
-rw-r--r--el_GR.ISO8859-7/share/xml/trademarks.ent90
-rw-r--r--es_ES.ISO8859-1/share/xml/trademarks.ent84
-rw-r--r--fr_FR.ISO8859-1/share/xml/trademarks.ent73
-rw-r--r--hu_HU.ISO8859-2/share/xml/trademarks.ent94
-rw-r--r--it_IT.ISO8859-15/share/xml/trademarks.ent48
-rw-r--r--ja_JP.eucJP/share/xml/trademarks.ent47
-rw-r--r--mn_MN.UTF-8/share/xml/trademarks.ent79
-rw-r--r--nl_NL.ISO8859-1/share/xml/trademarks.ent93
-rw-r--r--ru_RU.KOI8-R/share/xml/trademarks.ent79
-rw-r--r--share/xml/trademarks.ent93
-rw-r--r--zh_CN.GB2312/share/xml/trademarks.ent82
-rw-r--r--zh_TW.Big5/share/xml/trademarks.ent77
13 files changed, 90 insertions, 900 deletions
diff --git a/de_DE.ISO8859-1/share/xml/trademarks.ent b/de_DE.ISO8859-1/share/xml/trademarks.ent
index 218b70a202..bd74b24fc8 100644
--- a/de_DE.ISO8859-1/share/xml/trademarks.ent
+++ b/de_DE.ISO8859-1/share/xml/trademarks.ent
@@ -30,8 +30,8 @@
und/oder in anderen Lndern.</para>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
-<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, &Eacute;lan und PCnet sind
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, &Eacute;lan und PCnet sind
eingetragene Warenzeichen von Advanced Micro Devices, Inc.</para>">
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
@@ -42,18 +42,6 @@
<!ENTITY tm-attrib.arm "<para>ARM ist ein eingetragenes Warenzeichen
von ARM Limited.</para>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>Die Marke Bluetooth gehrt
- Bluetooth SIG, Inc.</para>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom ist ein eingetragenes
- Warenzeichen der Broadcom Corporation und ihrer Gesellschaften.</para>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1 und
- VPN-1 sind Warenzeichen von Check Point Software Technologies
- Ltd..</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst und IOS sind
eingetragene Warenzeichen von Cisco Systems Inc. und/oder
ihren Gesellschaften in den Vereinigten Staaten und bestimmten
@@ -73,15 +61,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup ist ein eingetragenes
Warenzeichen von John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge sind Warenzeichen oder eingetragene
- Warenzeichen der Dell Computer Corporation</para>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection sind
- eingetragene Warenzeichen der Seiko Epson Corporation.</para>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD ist ein eingetragenes
Warenzeichen der FreeBSD Foundation.</para>">
@@ -91,7 +70,7 @@
Heidelberger Druckmaschinen AG in Deutschland und anderen
Lndern.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2,
PowerPC, PS/2, S/390 und ThinkPad
sind Warenzeichen der International Business Machines Corporation
in den Vereinigten Staaten, anderen Lndern oder beiden.</para>">
@@ -140,11 +119,6 @@
Warenzeichen von MIPS Technologies, Inc. in den Vereinigten Staaten
und in anderen Lndern.</para>">
-<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL ist ein eingetragenes
- Warenzeichen von MySQL AB in den Vereinigten Staaten, der
- Europische Union und in anderen Lndern.</para>">
-
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems und DiskOnChip sind
Warenzeichen oder eingetragene Warenzeichen von M-Systems Flash Disk
@@ -159,12 +133,6 @@
eingetragene Warenzeichen und Warenzeichen von NextHop
in den Vereinigten Staaten und in anderen Lndern.</para>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module und
- NLM sind entweder eingetragene Warenzeichen oder Warenzeichen von
- Novell Inc. in den Vereinigten Staaten und in anderen
- Lndern.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1 und UNIX sind
eingetragene Warenzeichen und IT DialTone und The Open Group
sind Warenzeichen der The Open Group in den Vereinigten Staaten
@@ -203,16 +171,16 @@
eingetragene Warenzeichen von Silicon Graphics, Inc. in den
Vereinigten Staaten und/oder in anderen Lndern.</para>">
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine und
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, und
UltraSPARC sind Warenzeichen von SPARC International, Inc
in den Vereinigten Staaten und in anderen Lndern. Produkte,
die das Warenzeichen SPARC tragen, basieren auf einer
von Sun Microsystems, Inc. entwickelten Architektur.</para>">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java,
- Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS
- und Ultra sind Warenzeichen oder eingetragene Warenzeichen von
+ Java Virtual Machine, JDK, JSP, JVM, Netra,
+ Solaris, StarOffice
+ und SunOS sind Warenzeichen oder eingetragene Warenzeichen von
Sun Microsystems, Inc. in den Vereinigten Staaten und in anderen
Lndern.</para>">
@@ -228,11 +196,6 @@
<!ENTITY tm-attrib.thomson "<para>SpeedTouch ist ein Warenzeichen von
Thomson</para>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta und Crusoe sind entweder
- Warenzeichen oder eingetragene Warenzeichen der Transmeta Corporation
- in den Vereinigten Staaten und/oder in anderen Lndern.</para>">
-
<!-- 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 und Sportster sind
diff --git a/el_GR.ISO8859-7/share/xml/trademarks.ent b/el_GR.ISO8859-7/share/xml/trademarks.ent
index a9aa5958de..5c31a29e54 100644
--- a/el_GR.ISO8859-7/share/xml/trademarks.ent
+++ b/el_GR.ISO8859-7/share/xml/trademarks.ent
@@ -30,7 +30,6 @@
<!ENTITY tm-attrib.3ware "<para> 3ware Escalade
3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para> Adaptec
@@ -47,17 +46,11 @@
<!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, Am486, Am5X86, AMD
- Athlon, AMD Duron, AMD Opteron, AMD-K6, &Eacute;lan, PCnet
+<!ENTITY tm-attrib.amd "<para> AMD, AMD
+ Athlon, AMD Opteron, &Eacute;lan, PCnet
Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -80,20 +73,6 @@
ARM Limited.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para> Bluetooth
- Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para> Broadcom
- Broadcom Corporation .</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para> Check Point,
- Firewall-1, VPN-1 Check Point Software
- Technologies Ltd.</para>">
-
<!ENTITY tm-attrib.cisco "<para> Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.">
@@ -125,32 +104,10 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para> CVSup
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para> Dell, Dell Precision,
- Latitude, Optiplex, PowerEdge
- Dell Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para> EPSON EPSON Perfection
- Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para> FreeBSD
FreeBSD Foundation.</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para> Fujitsu Fujitsu,
- LifeBook, Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
- ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
- SystemWalker Interstage
- Fujitsu Limited
- .</para>">
<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para> Heidelberg,
@@ -158,13 +115,11 @@ Coverity, Inc.</para>">
Heidelberger Druckmaschinen AG
.</para>">
-<!ENTITY tm-attrib.ibm "<para> IBM, AIX, EtherJet,
- Netfinity, OS/2, PowerPC, PS/2, S/390, ThinkPad
+<!ENTITY tm-attrib.ibm "<para> IBM, AIX,
+ OS/2, PowerPC, PS/2, S/390, ThinkPad
International Business Machines Corporation ,
, .</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -225,7 +180,6 @@ Coverity, Inc.</para>">
Macromedia, Inc. / .</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para> Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, Windows NT
@@ -248,9 +202,6 @@ Coverity, Inc.</para>">
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para> MySQL
- MySQL AB ,
- .</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -275,11 +226,6 @@ Coverity, Inc.</para>">
... .</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para> NetWare, NetWare Loadable Module,
- NLM Novell, Inc.
- .</para>">
-
<!ENTITY tm-attrib.opengroup "<para> Motif, OSF/1, UNIX
IT
DialTone The Open Group The Open Group
@@ -296,9 +242,6 @@ Coverity, Inc.</para>">
Oracle Corporation.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para> Parallels
- Parallels Software International Inc.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para> PowerQuest PartitionMagic
PowerQuest Corporation
@@ -334,30 +277,24 @@ Coverity, Inc.</para>">
/ .</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para> Slackware
- Patrick Volkerding Slackware Linux, Inc.</para>">
-
<!ENTITY tm-attrib.sparc "<para> SPARC, SPARC64,
- SPARCengine, UltraSPARC SPARC International,
+ UltraSPARC SPARC International,
Inc. . SPARC International
Inc. SPARC
, .</para>">
<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</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, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra
+ Java Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+ Solaris, StarOffice, SunOS
VirtualBox Sun
Microsystems, Inc. .</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -367,10 +304,6 @@ Coverity, Inc.</para>">
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
@@ -388,13 +321,6 @@ Coverity, Inc.</para>">
Thomson</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para> Transmeta Crusoe
- Transmeta Corporation
- .</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
@@ -418,8 +344,6 @@ Coverity, Inc.</para>">
VMware, Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para> Xen
- XenSource, Inc. s .</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para> XFree86
diff --git a/es_ES.ISO8859-1/share/xml/trademarks.ent b/es_ES.ISO8859-1/share/xml/trademarks.ent
index 3d2ed3c283..ca4ee1b91b 100644
--- a/es_ES.ISO8859-1/share/xml/trademarks.ent
+++ b/es_ES.ISO8859-1/share/xml/trademarks.ent
@@ -18,10 +18,9 @@
<!-- An SGML entity can't start with a number... -->
<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
-<!ENTITY tm-attrib.3ware "<para>3ware and Escalade are registered
+<!ENTITY tm-attrib.3ware "<para>3ware is a registered
trademarks of 3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
@@ -38,17 +37,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, lan, Opteron, and PCnet are
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -71,20 +64,6 @@
Limited.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
- by the Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
- of Broadcom Corporation and/or its subsidiaries.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
- VPN-1 are trademarks of Check Point Software Technologies
- Ltd.</para>">
-
<!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>">
@@ -114,20 +93,6 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para>CVSup is a registered trademark of
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge are trademarks or registered trademarks of Dell
- Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection are registered
- trademarks of Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>">
@@ -137,13 +102,11 @@ Coverity, Inc.</para>">
trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
countries.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2,
PowerPC, PS/2, S/390, and ThinkPad are
trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -203,7 +166,6 @@ Coverity, Inc.</para>">
United States and/or other countries.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media and Windows NT are either
@@ -226,9 +188,6 @@ Coverity, Inc.</para>">
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
- MySQL AB in the United States, the European Union and other
- countries.</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -253,11 +212,6 @@ Coverity, Inc.</para>">
countries.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
- NLM are either registered trademarks or trademarks of Novell,
- Inc. in the United States and other countries.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, and UNIX are
registered trademarks and IT DialTone and The Open Group are
trademarks of The Open Group in the United States and other
@@ -273,9 +227,6 @@ Coverity, Inc.</para>">
of Oracle Corporation.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels is a trademark of
- Parallels Software International Inc.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest and PartitionMagic are
registered trademarks of PowerQuest Corporation in the United States
@@ -311,29 +262,23 @@ Coverity, Inc.</para>">
States and/or other countries worldwide.</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware is a registered trademark
- of Patrick Volkerding and Slackware Linux, Inc.</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, and
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, and
UltraSPARC are trademarks of SPARC International, Inc in the United
States and other countries. Products bearing SPARC trademarks are
based upon architecture developed by Sun Microsystems, Inc.</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</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, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, and
- Ultra are trademarks or registered trademarks of Sun Microsystems,
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra,
+ Solaris, StarOffice and
+ SunOS are trademarks or registered trademarks of Sun Microsystems,
Inc. in the United States and other countries.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -342,10 +287,6 @@ Coverity, Inc.</para>">
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html -->
@@ -362,13 +303,6 @@ Coverity, Inc.</para>">
Thomson.</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
- trademarks or registered trademarks of Transmeta Corporation in the
- United States and/or other countries.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
@@ -391,8 +325,6 @@ Coverity, Inc.</para>">
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen is a trademark of XenSource, Inc. in
- the United States and other countries.</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
diff --git a/fr_FR.ISO8859-1/share/xml/trademarks.ent b/fr_FR.ISO8859-1/share/xml/trademarks.ent
index 4616c292ab..68c640547d 100644
--- a/fr_FR.ISO8859-1/share/xml/trademarks.ent
+++ b/fr_FR.ISO8859-1/share/xml/trademarks.ent
@@ -24,7 +24,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware et Escalade sont des marques
dposes de 3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec is a registered trademark of
@@ -41,17 +40,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, lan, Opteron, et PCnet sont
+<!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 am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -73,20 +66,6 @@
Limited.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth word mark is owned
- by the Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom is a registered trademark
- of Broadcom Corporation and/or its subsidiaries.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, and
- VPN-1 are trademarks of Check Point Software Technologies
- Ltd..</para>">
-
<!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>">
@@ -108,20 +87,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup est une marque dpose de
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge are trademarks or registered trademarks of Dell
- Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection sont des
- marques dposes de Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD est une marque
dpose de la fondation FreeBSD.</para>">
@@ -131,12 +96,10 @@
trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
countries.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, S/390, and ThinkPad are
trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -194,7 +157,6 @@
United States and/or other countries.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, et Windows NT sont soit des marques
@@ -217,9 +179,6 @@
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is a registered trademark of
- MySQL AB in the United States, the European Union and other
- countries.</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -244,11 +203,6 @@
pays.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, and
- NLM are either registered trademarks or trademarks of Novell,
- Inc. in the United States and other countries.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, et UNIX
sont des marques dposes et IT DialTone et The Open
Group sont des marques de l'Open Group aux Etats Unis et dans
@@ -299,24 +253,22 @@
States and/or other countries worldwide.</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, et
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, et
UltraSPARC sont des marques de SPARC International, Inc aux Etats
Unis et dans d'autres pays. Les produits utilisant les marques
SPARC sont bass sur une architecture
dveloppe par Sun Microsystems, Inc.</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
- Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, et
- Ultra sont des marques ou des marques dposes de Sun
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra,
+ Solaris, StarOffice, et
+ SunOS sont des marques ou des marques dposes de Sun
Microsystems, Inc. aux Etats Unis et dans d'autres pays.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -325,10 +277,6 @@
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html -->
@@ -345,13 +293,6 @@
Thomson</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta and Crusoe are either
- trademarks or registered trademarks of Transmeta Corporation in the
- United States and/or other countries.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
diff --git a/hu_HU.ISO8859-2/share/xml/trademarks.ent b/hu_HU.ISO8859-2/share/xml/trademarks.ent
index 0047602504..818f97117d 100644
--- a/hu_HU.ISO8859-2/share/xml/trademarks.ent
+++ b/hu_HU.ISO8859-2/share/xml/trademarks.ent
@@ -23,10 +23,9 @@
<!-- An SGML entity can't start with a number... -->
<!ENTITY tm.3com "<trademark class='registered'>3Com</trademark>">
-<!ENTITY tm-attrib.3ware "<para>A 3ware s Escalade a 3ware Inc.
+<!ENTITY tm-attrib.3ware "<para>A 3ware a 3ware Inc.
bejegyzett vdjegyei.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>A Adaptec az Adaptec, Inc. bejegyzett
@@ -43,17 +42,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, lan, Opteron s PCnet
+<!ENTITY tm-attrib.amd "<para>Az AMD, AMD Athlon,
+ AMD Opteron, Athlon, lan, Opteron s PCnet
az Advanced Micro Devices, Inc. vdjegyei.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -77,21 +70,6 @@
vdjegye.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>A Bluetooth vilgmrka a
- Bluetooth SIG, Inc. tulajdona.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>A Broadcom a Broadcom Corporation
- s/vagy lenyvllalatainak a bejegyzett
- vdjegye.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>A Check Point, Firewall-1 s
- VPN-1 a Check Point Software Technologies Ltd. bejegyzett
- vdjegyei.</para>">
-
<!ENTITY tm-attrib.cisco "<para>A Cisco, Catalyst s IOS
a Cisco Systems, Inc. s/vagy trsvllalatainak
bejegyzett vdjegyei az Egyeslt llamokban s
@@ -124,32 +102,10 @@
<!ENTITY tm-attrib.cvsup "<para>A CVSup John D. Polstra bejegyzett
vdjegye.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>A Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge a Dell Computer Corporation vdjegyei, vagy
- bejegyzett vdjegyei.</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>Az EPSON s EPSON Perfection a Seiko
- Epson Corporation bejegyzett vdjegyei.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>A FreeBSD a FreeBSD Foundation
bejegyzett vdjegye.</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para>Fujitsu, a Fujitsu logo, LifeBook,
- Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
- ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
- SystemWalker s az Interstage a Fujitsu Limited
- vdjegyei vagy bejegyzett vdjegyei az Egyeslt
- llamokban s egyb orszgokban.</para>">
<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para>A Heidelberg, Helvetica,
@@ -157,13 +113,11 @@
bejegyzett vdjegyei, vagy vdjegyei az Egyeslt
llamokban s ms orszgokban.</para>">
-<!ENTITY tm-attrib.ibm "<para>Az IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para>Az IBM, AIX, OS/2,
PowerPC, PS/2, S/390 s ThinkPad az International Business Machines
Corporation vdjegyei az Egyeslt llamokban,
ms orszgokban, vagy mindkettben.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -228,7 +182,6 @@
orszgokban.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>A Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media s Windows NT a Microsoft Corporation
@@ -251,9 +204,6 @@
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>A MySQL a MySQL AB bejegyzett vdjegye
- az Egyeslt llamokban, az Eurpai Uniban
- s ms orszgokban.</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -279,12 +229,6 @@
llamokban s ms orszgokban.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>A NetWare, NetWare Loadable Module s
- NLM a Novell, Inc. bejegyzett vdjegyei vagy vdjegyei az
- Egyeslt llamokban s ms
- orszgokban.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>A Motif, OSF/1 s UNIX a
The Open Group bejegyzett vdjegyei, az IT DialTone s
a The Open Group pedig vdjegyei az Egyeslt llamokban
@@ -301,9 +245,6 @@
vdjegye.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>A Parallels a Parallels Software
- International Inc. vdjegye.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>A PowerQuest s PartitionMagic
a PowerQuest Corporation bejegyzett vdjegyei az Egyeslt
@@ -340,11 +281,7 @@
vilgszerte.</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>A Slackware Patrick Volkerding
- s a Slackware Linux, Inc. bejegyzett vdjegye.</para>">
-
-<!ENTITY tm-attrib.sparc "<para>A SPARC, SPARC64, SPARCEngine s
+<!ENTITY tm-attrib.sparc "<para>A SPARC, SPARC64, s
UltraSPARC a SPARC International, Inc vdjegyei az
Egyeslt llamokban s ms
orszgokban. A SPARC International, Inc birtokolja az
@@ -354,20 +291,18 @@
alapjn.</para>">
<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</trademark>">
<!ENTITY ultrasparc "<trademark class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para>A Sun, Sun Microsystems, Java, Java
- Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, Ultra
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+ Solaris, StarOffice, SunOS
s VirtualBox a Sun Microsystems, Inc. vdjegyei vagy bejegyzett
vdjegyei az Egyeslt llamokban s ms
orszgokban.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -377,10 +312,6 @@
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
@@ -398,14 +329,6 @@
vdjegye.</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>A Transmeta s Crusoe a
- Transmeta Corporation vdjegyei vagy bejegyzett vdjegyei
- az Egyeslt llamokban s/vagy ms
- orszgokban.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
@@ -428,9 +351,6 @@
<!ENTITY tm-attrib.vmware "<para>A VMware a VMware, Inc.
vdjegye.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>A Xen a XenSource, Inc. vdjegye
- az Egyeslt llamokban s ms
- orszgokban.</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>Az XFree86 az XFree86 Project, Inc.
diff --git a/it_IT.ISO8859-15/share/xml/trademarks.ent b/it_IT.ISO8859-15/share/xml/trademarks.ent
index db963c92ba..894aa602ba 100644
--- a/it_IT.ISO8859-15/share/xml/trademarks.ent
+++ b/it_IT.ISO8859-15/share/xml/trademarks.ent
@@ -24,8 +24,8 @@
PostScript sono marchi o marchi registrati della Adobe
Systems Incorporated negli Stati Uniti e/o in altri paesi.</para>">
-<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, lan, Opteron, e PCnet sono marchi
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, lan, Opteron, e PCnet sono marchi
della Advanced Micro Devices, Inc.</para>">
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
@@ -35,15 +35,6 @@
<!ENTITY tm-attrib.arm "<para>ARM un marchio registrato della ARM
Limited.</para>">
-<!ENTITY tm-attrib.bluetooth "<para>Il marchio Bluetooth di
- propriet della Bluetooth SIG, Inc.</para>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom un marchio registrato della
- Broadcom Corporation e/o delle sue sussidiarie.</para>">
-
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, e
- VPN-1 sono marchi della Check Point Software Technologies Ltd.</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, e IOS sono marchi registrati
della Cisco Systems, Inc. e/o delle sue affiliate negli Stati Uniti e in
certi altri paesi.</para>">
@@ -58,13 +49,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup un marchio registrato di
John D. Polstra.</para>">
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge sono marchi o marchi registrati della Dell
- Computer Corporation</para>">
-
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection sono marchi registrati
- della Seiko Epson Corporation.</para>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD un marchio registrato della
FreeBSD Foundation.</para>">
@@ -72,7 +56,7 @@
Palatino, e Times Roman sono marchi o marchi registrati della
Heidelberger Druckmaschinen AG negli Stati Uniti e in altri paesi.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC,
PS/2, S/390, e ThinkPad sono marchi della International Business Machines
Corporation negli Stati Uniti, in altri paesi, o in entrambi.</para>">
@@ -115,9 +99,6 @@
<!ENTITY tm-attrib.mips "<para>MIPS e R4000 sono marchi registrati della
MIPS Technologies, Inc. negli Stati Uniti e in altri paesi.</para>">
-<!ENTITY tm-attrib.mysql "<para>MySQL un marchio registrato della
- MySQL AB negli Stati Uniti, nell'Unione Europea e in altri paesi.</para>">
-
<!ENTITY tm-attrib.m-systems "<para>M-Systems e DiskOnChip sono marchi o
marchi registrati della M-Systems Flash Disk Pioneers, Ltd.</para>">
@@ -131,10 +112,6 @@
<!ENTITY tm-attrib.nexthop "<para>GateD e NextHop sono marchi registrati e non
registrati della NextHop negli Stati Uniti e in altri paesi.</para>">
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, e
- NLM sono marchi o marchi registrati della Novell,
- Inc. negli Stati Uniti e in altri paesi.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, e UNIX sono marchi
registrati e IT DialTone e The Open Group sono marchi del The Open Group
negli Stati Uniti e in altri paesi.</para>">
@@ -145,9 +122,6 @@
<!ENTITY tm-attrib.oracle "<para>Oracle un marchio registrato della
Oracle Corporation.</para>">
-<!ENTITY tm-attrib.parallels "<para>Parallels un marchio della
- Parallels Software International Inc.</para>">
-
<!ENTITY tm-attrib.powerquest "<para>PowerQuest e PartitionMagic sono marchi
registrati della PowerQuest Corporation negli Stati Uniti e/o in altri
paesi.</para>">
@@ -169,17 +143,14 @@
registrati della Silicon Graphics, Inc., negli Stati Uniti e/o in altri
paesi in tutto il mondo.</para>">
-<!ENTITY tm-attrib.slackware "<para>Slackware un marchio registrato
- della Patrick Volkerding and Slackware Linux, Inc.</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, e
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, e
UltraSPARC sono marchi SPARC International, Inc negli Stati Uniti e in
altri paesi. I prodotti che portano il marchio SPARC sono basati su
architettura sviluppata dalla Sun Microsystems, Inc.</para>">
<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine,
- JavaServer Pages, JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice,
- Sun Blade, Sun Enterprise, Sun Fire, SunOS, e Ultra sono marchi o marchi
+ JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice
+ e SunOS sono marchi o marchi
registrati della Sun Microsystems, Inc. negli Stati Uniti e in altri
paesi.</para>">
@@ -192,10 +163,6 @@
<!ENTITY tm-attrib.thomson "<para>SpeedTouch un marchio di
Thomson.</para>">
-<!ENTITY tm-attrib.transmeta "<para>Transmeta e Crusoe sono marchi o marchi
- registrati della Transmeta Corporation negli Stati Uniti e/o in altri
- paesi.</para>">
-
<!ENTITY tm-attrib.usrobotics "<para>U.S. Robotics e Sportster sono marchi
registrati della U.S. Robotics Corporation.</para>">
@@ -208,9 +175,6 @@
<!ENTITY tm-attrib.vmware "<para>VMware un marchio della VMware,
Inc.</para>">
-<!ENTITY tm-attrib.xen "<para>Xen un marchio della XenSource, Inc.
- negli Stati Uniti e in altri paesi.</para>">
-
<!ENTITY tm-attrib.xfree86 "<para>XFree86 un marchio della The
XFree86 Project, Inc.</para>">
diff --git a/ja_JP.eucJP/share/xml/trademarks.ent b/ja_JP.eucJP/share/xml/trademarks.ent
index 61a66d06af..7414f76efd 100644
--- a/ja_JP.eucJP/share/xml/trademarks.ent
+++ b/ja_JP.eucJP/share/xml/trademarks.ent
@@ -28,8 +28,8 @@
Adobe Systems Incorporated ϿɸޤϾɸǤ</para>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
-<!ENTITY tm-attrib.amd "<para>AMD, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, &Eacute;lan PCnet
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, &Eacute;lan PCnet
Advanced Micro Devices, Inc. ξɸǤ</para>">
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
@@ -38,17 +38,6 @@
<!ENTITY tm-attrib.arm "<para>ARM ARM Limited ϿɸǤ</para>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>ɥޡ Bluetooth
- Bluetooth SIG, Inc. ͭƤޤ</para>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom
- Broadcom Corporation /ޤϤδϢҤϿɸǤ</para>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1
- VPN-1 Check Point Software Technologies Ltd. ξɸǤ</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst IOS
ꥫ罰񤪤ӤΤۤιˤ
Cisco Systems, Inc. /ޤϤδϢҤϿɸǤ</para>">
@@ -66,15 +55,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup
John D. Polstra ϿɸǤ</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge Dell Computer Corporation
- ɸޤϿɸǤ</para>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection
- Seiko Epson Corporation ϿɸǤ</para>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD
The FreeBSD Foundation ϿɸǤ</para>">
@@ -83,7 +63,7 @@
Palatino, and Times Roman ϥꥫ罰񤪤Ӥ¾ιˤ
Heidelberger Druckmaschinen AG ϿɸޤϾɸǤ</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390 ThinkPad
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, S/390 ThinkPad
ꥫ罰񤪤/ޤϤ¾ιˤ
International Business Machines Corporation ξɸǤ</para>">
@@ -129,11 +109,6 @@
ꥫ罰񤪤Ӥ¾ιˤ
MIPS Technologies, Inc. ϿɸǤ</para>">
-<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL
- ꥫ罰EU Ӥ¾ιˤ
- MySQL AB ϿɸǤ</para>">
-
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
<!ENTITY tm-attrib.m-systems "<para>M-Systems DiskOnChip
M-Systems Flash Disk Pioneers, Ltd. ξɸޤϿɸǤ</para>">
@@ -147,11 +122,6 @@
ꥫ罰񤪤Ӥ¾ιˤ
NextHop ϿɸӾɸǤ</para>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module
- NLM ϥꥫ罰񤪤Ӥ¾ιˤ
- Novell, Inc. ϿɸޤϾɸǤ</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1 UNIX
ꥫ罰񤪤Ӥ¾ιˤ The Open Group Ͽɸǡ
IT DialTone The Open Group ƱɸǤ</para>">
@@ -187,13 +157,13 @@
ꥫ罰񤪤Ӥ¾ιˤ
Silicon Graphics, Inc. ϿɸǤ</para>">
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64
UltraSPARC ϥꥫ罰񤪤Ӥ¾ιˤ
SPARC International, Inc. ξɸǤSPARC ξɸĤʤ
Sun Microsystems, Inc. ȯƥ˴ŤƤޤ</para>">
-<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
- Sun Blade, Sun Enterprise, Sun Fire, SunOS Ultra
+<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JSP, JVM, Netra, Solaris, StarOffice,
+ SunOS
ꥫ罰񤪤Ӥ¾ιˤ Sun Microsystems, Inc.
ɸޤϿɸǤ</para>">
@@ -208,11 +178,6 @@
<!ENTITY tm-attrib.thomson "<para>SpeedTouch Thomson ξɸǤ</para>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta Crusoe
- ꥫ罰񤪤/ޤϤ¾ιˤ Transmeta Corporation
- ɸޤϿɸǤ</para>">
-
<!-- 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
diff --git a/mn_MN.UTF-8/share/xml/trademarks.ent b/mn_MN.UTF-8/share/xml/trademarks.ent
index 173624eaee..0bacc3ffce 100644
--- a/mn_MN.UTF-8/share/xml/trademarks.ent
+++ b/mn_MN.UTF-8/share/xml/trademarks.ent
@@ -24,7 +24,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware болон Escalade нь 3ware Inc-ийн
бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec нь Adaptec, Inc-ийн
@@ -41,14 +40,10 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, болон PCnet
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, &Eacute;lan, Opteron, болон PCnet
нь Advanced Micro Devices, Inc-ийн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
@@ -72,19 +67,6 @@
Limited-ийн бүртгэгдсэн худалдааны тэмдэг юм.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>Bluetooth үгийн тэмдгийг Bluetooth SIG, Inc
- эзэмшдэг.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom нь Broadcom корпораци ба/эсвэл
- түүний салбаруудын бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, болон
- VPN-1 нь Check Point Software Technologies Ltd-ийн худалдааны тэмдэгнүүд юм.</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, ба IOS нь
Америкийн Нэгдсэн Улс болон зарим нэг улсууд дахь Cisco Systems, Inc.
ба/эсвэл түүний гишүүдийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
@@ -115,20 +97,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup нь Жон Д. Полстрагийн бүртгэгдсэн худалдааны
тэмдэг юм.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge нь Dell Computer корпорацийн бүртгэгдсэн худалдааны
- тэмдэгнүүд юм</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection нь Seiko Epson
- корпорацийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD нь FreeBSD Сангийн бүртгэгдсэн худалдааны
тэмдэг юм.</para>">
@@ -138,13 +106,11 @@
Heidelberger Druckmaschinen AG-ийн бүртгэгдсэн худалдааны тэмдэгнүүд,
аль эсвэл худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2,
PowerPC, PS/2, S/390, болон ThinkPad нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь
International Business Machines корпорацийн худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -207,7 +173,6 @@
тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media болон Windows NT нь
@@ -230,9 +195,6 @@
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL нь Америкийн Нэгдсэн Улс, Европын
- Холбоо болон бусад улсууд дахь MySQL AB-ийн бүртгэгдсэн худалдааны
- тэмдэгнүүд юм.</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -257,11 +219,6 @@
бүртгэгдээгүй худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, болон
- NLM нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь Novell,
- Inc-ийн бүртгэгдсэн худалдааны тэмдэгнүүд эсвэл худалдааны тэмдэгнүүд юм.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, болон UNIX нь
Америкийн Нэгдсэн Улс болон бусад улсууд дахь The Open Group-ийн
бүртгэгдсэн худалдааны тэмдэгнүүд бөгөөд IT DialTone ба The Open Group
@@ -278,9 +235,6 @@
худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels нь
- Parallels Software International Inc.-ийн худалдааны тэмдэг юм.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest болон PartitionMagic
нь Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь PowerQuest корпорацийн
@@ -316,30 +270,24 @@
Silicon Graphics, Inc.-ийн бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware нь Patrick Volkerding болон
- Slackware Linux, Inc-ийн бүртгэгдсэн худалдааны тэмдэг юм.</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, болон
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, болон
UltraSPARC нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь SPARC International, Inc-ийн
худалдааны тэмдэгнүүд юм. SPARC худалдааны тэмдэгнүүдийг зүүсэн
бүтээгдэхүүнүүд нь Sun Microsystems, Inc-ийн хөгжүүлсэн архитектур
дээр суурилсан байдаг.</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</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, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
- Ultra болон VirtualBox нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь Sun Microsystems, Inc-ийн
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra,
+ Solaris, StarOffice, SunOS
+ болон VirtualBox нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь Sun Microsystems, Inc-ийн
худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -348,10 +296,6 @@
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
@@ -369,13 +313,6 @@
тэмдэг юм.</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta болон Crusoe нь
- Америкийн Нэгдсэн Улс ба/эсвэл бусад улсууд дахь Transmeta корпорацийн
- худалдааны тэмдэгнүүд эсвэл бүртгэгдсэн худалдааны тэмдэгнүүд юм.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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 нь
@@ -398,8 +335,6 @@
<!ENTITY tm-attrib.vmware "<para>VMware нь VMware, Inc-ийн худалдааны тэмдэг юм.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen нь Америкийн Нэгдсэн Улс болон бусад улсууд дахь
- XenSource, Inc.-ийн худалдааны тэмдэг юм.</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 нь XFree86 Project, Inc-ийн
diff --git a/nl_NL.ISO8859-1/share/xml/trademarks.ent b/nl_NL.ISO8859-1/share/xml/trademarks.ent
index 78ce494e9e..7353848da0 100644
--- a/nl_NL.ISO8859-1/share/xml/trademarks.ent
+++ b/nl_NL.ISO8859-1/share/xml/trademarks.ent
@@ -23,7 +23,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware en Escalade zijn geregistreerde
handelsmerken van 3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec is een geregistreerd
@@ -40,17 +39,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, lan, Opteron, en PCnet
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, lan, Opteron, en PCnet
zijn handelsmerken van Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -73,21 +66,6 @@
ARM Limited.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>Het woordmerk Bluetooth is eigendom
- van de Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom is een geregistreerd
- handelsmerk van Broadcom Corporation en/of haar
- dochterondernemingen.</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, en
- VPN-1 zijn handelsmerken van Check Point Software Technologies
- Ltd.</para>">
-
<!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>">
@@ -119,32 +97,10 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup is een geregistreerd handelsmerk
van John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge zijn handelsmerken of geregistreerde handelsmerken
- van Dell Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection zijn
- geregistreerde handelsmerken van Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>&os; is een geregistreerd
handelsmerk van de &os; Foundation.</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para>Fujitsu, het Fujitsu logo, LifeBook,
- Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
- ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
- SystemWalker, en Interstage zijn handelsmerken of geregistreerde
- handelsmerken van Fujitsu Limited in de Verenigde Staten en andere
- landen.</para>">
<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
@@ -153,13 +109,11 @@
handelsmerken f handelsmerken van Heidelberger Druckmaschinen
AG in de Verenigde Staten en andere landen.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2,
PowerPC, PS/2, S/390, en ThinkPad zijn handelsmerken van
International Business Machines Corporation in de
Verenigde Staten, andere landen, of beide.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -221,7 +175,6 @@
in de Verenigde Staten en/of andere landen.</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media en Windows NT zijn fwel
@@ -244,9 +197,6 @@
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL is een geregistreerd handelsmerk
- van MySQL AB in de Verenigde Staten, de Europese Unie en andere
- landen.</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -271,12 +221,6 @@
en andere landen.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, en
- NLM zijn fwel geregisteerde handelsmerken f
- handelsmerken van Novell, Inc. in de Verenigde Staten en andere
- landen.</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, en UNIX zijn
geregistreerde handelsmerken en IT DialTone en The Open Group zijn
handelsmerken van The Open Group in de Verenigde Staten en andere
@@ -292,9 +236,6 @@
van Oracle Corporation.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels is een handelsmerk van
- Parallels Software International Inc.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest en PartitionMagic zijn
geregistreerde handelsmerken van PowerQuest Corporation in de
@@ -330,30 +271,24 @@
Verenigde Staten en/of andere wereldwijde landen.</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware is een geregistreerd
- handelsmerk van Patrick Volkerding en Slackware Linux, Inc.</para>">
-
<!-- http://www.sparc.org/trademarksListing.html -->
-<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, SPARCengine, en
+<!ENTITY tm-attrib.sparc "<para>SPARC, SPARC64, en
UltraSPARC zijn handelsmerken van SPARC International, Inc. in de Verenigde
Staten en andere landen. SPARC International, Inc. bezit alle handelsmerken
van SPARC en staat onder licentie het juiste gebruik van deze handelsmerken
toe door zijn leden.</para>">
<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</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, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
- Ultra en VirtualBox zijn handelsmerken of geregistreerde handelsmerken van
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+ Solaris, StarOffice, SunOS
+ en VirtualBox zijn handelsmerken of geregistreerde handelsmerken van
Sun Microsystems, Inc. in de Verenigde Staten en andere landen.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -363,10 +298,6 @@
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
@@ -384,14 +315,6 @@
Thomson.</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta en Crusoe zijn
- fwel handelsmerken f geregistreerde handelsmerken van
- Transmeta Corporation in de Verenigde Staten en/of andere
- landen.</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
@@ -415,8 +338,6 @@
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen is een handelsmerk van XenSource, Inc.
- in de Verenigde Staten en andere landen.</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is een handelsmerk van The
diff --git a/ru_RU.KOI8-R/share/xml/trademarks.ent b/ru_RU.KOI8-R/share/xml/trademarks.ent
index c9dae8b297..17dac5db7a 100644
--- a/ru_RU.KOI8-R/share/xml/trademarks.ent
+++ b/ru_RU.KOI8-R/share/xml/trademarks.ent
@@ -25,7 +25,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware Escalade
3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec
@@ -42,17 +41,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, PCnet
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, &Eacute;lan, PCnet
Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -75,20 +68,6 @@
Limited.</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para> Bluetooth
- Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom
- Broadcom Corporation / .</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1,
- VPN-1 Check Point Software Technologies
- Ltd.</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, IOS
Cisco Systems, Inc. /
.</para>">
@@ -110,20 +89,6 @@
<!ENTITY tm-attrib.cvsup "<para>CVSup
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge
- Dell Computer Corporation</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection
- Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD
FreeBSD Foundation.</para>">
@@ -133,13 +98,11 @@
Heidelberger Druckmaschinen AG
.</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC,
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC,
PS/2, S/390 ThinkPad International Business Machines
Corporation , ,
.</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -198,7 +161,6 @@
/ .</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media Windows NT
@@ -221,8 +183,6 @@
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL
- MySQL AB , .</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -247,11 +207,6 @@
.</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module,
- NLM Novell,
- Inc. .</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1 UNIX
, IT DialTone The Open Group
Open Group
@@ -267,9 +222,6 @@
Oracle Corporation.</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels
- Parallels Software International Inc.</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest PartitionMagic
PowerQuest Corporation
@@ -304,29 +256,23 @@
/ .</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware
- Patrick Volkerding Slackware Linux, Inc.</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine,
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64,
UltraSPARC SPARC International, Inc
. SPARC
, Sun Microsystems, Inc.</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</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,
- JavaServer Pages, JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice,
- Sun Blade, Sun Enterprise, Sun Fire, SunOS Ultra
+ JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice,
+ SunOS
Sun Microsystems, Inc.
.</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -335,10 +281,6 @@
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html -->
@@ -355,13 +297,6 @@
Thomson.</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta Crusoe
- Transmeta Corporation
- / .</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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
@@ -384,8 +319,6 @@
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen XenSource, Inc.
- .</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86
diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent
index b53f40dced..e5e7253175 100644
--- a/share/xml/trademarks.ent
+++ b/share/xml/trademarks.ent
@@ -16,10 +16,9 @@
<!-- An XML entity can't start with a number... -->
<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3Com</trademark>">
-<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware and Escalade are registered
- trademarks of 3ware Inc.</para>">
+<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware is a registered
+ trademark of 3ware Inc.</para>">
<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Escalade</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
@@ -36,17 +35,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, and PCnet are
+<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
+ AMD Opteron, Athlon, &Eacute;lan, Opteron, and PCnet are
trademarks of Advanced Micro Devices, Inc.</para>">
-<!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">
@@ -69,20 +62,6 @@
Limited.</para>">
<!ENTITY arm "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para xmlns='http://docbook.org/ns/docbook'>The Bluetooth word mark is owned
- by the Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para xmlns='http://docbook.org/ns/docbook'>Broadcom is a registered trademark
- of Broadcom Corporation and/or its subsidiaries.</para>">
-<!ENTITY broadcom "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para xmlns='http://docbook.org/ns/docbook'>Check Point, Firewall-1, and
- VPN-1 are trademarks of Check Point Software Technologies
- Ltd.</para>">
-
<!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>">
@@ -114,31 +93,10 @@ Coverity, Inc.</para>">
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup is a registered trademark of
John D. Polstra.</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para xmlns='http://docbook.org/ns/docbook'>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge are trademarks or registered trademarks of Dell
- Computer Corporation</para>">
-<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
-<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para xmlns='http://docbook.org/ns/docbook'>EPSON, EPSON Perfection are registered
- trademarks of Seiko Epson Corporation.</para>">
-<!ENTITY epson "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD is a registered trademark of
the FreeBSD Foundation.</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>Fujitsu, the Fujitsu logo, LifeBook,
- Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
- ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
- SystemWalker, and Interstage are trademarks or registered trademarks
- of Fujitsu Limited in the United States and other countries.</para>">
<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
@@ -146,13 +104,11 @@ Coverity, Inc.</para>">
trademarks of Heidelberger Druckmaschinen AG in the U.S. and other
countries.</para>">
-<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, EtherJet, Netfinity, OS/2,
+<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, OS/2,
PowerPC, PS/2, S/390, and ThinkPad are
trademarks of International Business Machines Corporation in the
United States, other countries, or both.</para>">
<!ENTITY aix "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark xmlns='http://docbook.org/ns/docbook'>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Netfinity</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>">
@@ -213,7 +169,6 @@ Coverity, Inc.</para>">
United States and/or other countries.</para>">
<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
<!ENTITY macromedia "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Shockwave</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
@@ -236,9 +191,6 @@ Coverity, Inc.</para>">
<!ENTITY mips "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para xmlns='http://docbook.org/ns/docbook'>MySQL is a registered trademark of
- MySQL AB in the United States, the European Union and other
- countries.</para>">
<!ENTITY mysql "<trademark xmlns='http://docbook.org/ns/docbook'>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -263,11 +215,6 @@ Coverity, Inc.</para>">
countries.</para>">
<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para xmlns='http://docbook.org/ns/docbook'>NetWare, NetWare Loadable Module, and
- NLM are either registered trademarks or trademarks of Novell,
- Inc. in the United States and other countries.</para>">
-
<!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
trademarks of The Open Group in the United States and other
@@ -283,9 +230,6 @@ Coverity, Inc.</para>">
of Oracle Corporation.</para>">
<!ENTITY oracle "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para xmlns='http://docbook.org/ns/docbook'>Parallels is a trademark of
- Parallels Software International Inc.</para>">
-
<!-- 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
@@ -321,31 +265,25 @@ Coverity, Inc.</para>">
States and/or other countries worldwide.</para>">
<!ENTITY opengl "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para xmlns='http://docbook.org/ns/docbook'>Slackware is a registered trademark
- of Patrick Volkerding and Slackware Linux, Inc.</para>">
-
<!-- http://www.sparc.org/trademarksListing.html -->
-<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, SPARCengine, and
+<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64, and
UltraSPARC are trademarks of SPARC International, Inc in the United
States and other countries. SPARC International, Inc owns all of the
SPARC trademarks and under licensing agreements allows the proper use
of these trademarks by its members.</para>">
<!ENTITY sparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>SPARCengine</trademark>">
<!ENTITY ultrasparc "<trademark xmlns='http://docbook.org/ns/docbook'class='registered'>UltraSPARC</trademark>">
<!-- http://www.sun.com/suntrademarks/ -->
<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java
- Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
- Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
- Ultra and VirtualBox are trademarks or registered trademarks of
+ Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+ Solaris, StarOffice, SunOS
+ and VirtualBox are trademarks or registered trademarks of
Sun Microsystems, Inc. in the United States and other countries.</para>">
<!ENTITY java "<trademark xmlns='http://docbook.org/ns/docbook'>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark xmlns='http://docbook.org/ns/docbook'>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark xmlns='http://docbook.org/ns/docbook'>JavaServer Pages</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>">
@@ -355,10 +293,6 @@ Coverity, Inc.</para>">
<!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 sun.blade "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark xmlns='http://docbook.org/ns/docbook'>Ultra</trademark>">
<!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
<!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">
@@ -376,13 +310,6 @@ Coverity, Inc.</para>">
Thomson.</para>">
<!ENTITY speedtouch "<trademark xmlns='http://docbook.org/ns/docbook'>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para xmlns='http://docbook.org/ns/docbook'>Transmeta and Crusoe are either
- trademarks or registered trademarks of Transmeta Corporation in the
- United States and/or other countries.</para>">
-<!ENTITY crusoe "<trademark xmlns='http://docbook.org/ns/docbook'>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark xmlns='http://docbook.org/ns/docbook'>Transmeta</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
@@ -405,8 +332,6 @@ Coverity, Inc.</para>">
Inc.</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para xmlns='http://docbook.org/ns/docbook'>Xen is a trademark of XenSource, Inc. in
- the United States and other countries.</para>">
<!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
diff --git a/zh_CN.GB2312/share/xml/trademarks.ent b/zh_CN.GB2312/share/xml/trademarks.ent
index 89fa13f59c..efefa7eb0f 100644
--- a/zh_CN.GB2312/share/xml/trademarks.ent
+++ b/zh_CN.GB2312/share/xml/trademarks.ent
@@ -19,7 +19,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware Escalade 3ware Inc ע̱ꡣ</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec
@@ -35,17 +34,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD
- Duron, AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, PCnet
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+ AMD Opteron, Athlon, &Eacute;lan, Opteron, PCnet
Advanced Micro Devices, Inc. ̱ꡣ</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -67,18 +60,6 @@
Limited. ע̱ꡣ</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth ֱ־ Bluetooth SIG, Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom Broadcom Corporation /ӹ˾ע̱ꡣ</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, Լ
- VPN-1 Check Point Software Technologies
- Ltd. ̱ꡣ</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, IOS
Cisco Systems, Inc. /丽һЩҵע̱ꡣ</para>">
<!ENTITY cisco "<trademark class='registered'>Cisco</trademark>">
@@ -105,41 +86,19 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.cvsup "<para>CVSup
John D. Polstra ע̱ꡣ</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge Dell
- Computer Corporation ̱ע̱ꡣ</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection
- Epson Corporationע̱ꡣ</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD FreeBSDע̱</para>">
-<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para>Fujitsu Fujitsu ־ LifeBook
- Stylistic PRIMEPOWER PRIMEQUEST PRIMECLUSTER ETERNUS TRIOLE
- ESPRIMO BioMedCAChe CAChe CELLINJECTOR isS Materials Explorer
- SystemWalker Լ Interstage ʿͨʽ ҵ̱ע̱ꡣ</para>">
<!ENTITY fujitsu "<trademark class='registered'>Fujitsu</trademark>">
-<!ENTITY primepower "<trademark class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg Helvetica
Palatino Լ Times Roman Heidelberger Druckmaschinen AG
ҵ̱ע̱ꡣ</para>">
-<!ENTITY tm-attrib.ibm "<para>IBM AIX EtherJet Netfinity OS/2
+<!ENTITY tm-attrib.ibm "<para>IBM AIX OS/2
PowerPC PS/2 S/390 Լ ThinkPad
ǹû˾ҵע̱̱ꡣ</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -195,7 +154,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
Macromedia, Inc. /ҵ̱ע̱ꡣ</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, Windows NT Microsoft Corporation
@@ -216,8 +174,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL
- MySQL AB ŷ˺ҵע̱ꡣ</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -237,10 +193,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.nexthop "<para>GateD NextHop NextHop ҵ̱ע̱ꡣ</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module,
- NLM Novell, Inc. ҵ̱ע̱ꡣ</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, UNIX
The Open Group ҵע̱ꣻ IT DialTone The Open Group
̱ꡣ</para>">
@@ -254,9 +206,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.oracle "<para>Oracle Oracle Corporation ע̱ꡣ</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels
- Parallels Software International Inc. ̱ꡣ</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest PartitionMagic
PowerQuest Corporation /ҵע̱ꡣ</para>">
@@ -287,31 +236,25 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
/ҵע̱ꡣ</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware
- Patrick Volkerding Slackware Linux, Inc. ע̱ꡣ</para>">
-
<!-- http://www.sparc.org/trademarksListing.html -->
-<!ENTITY tm-attrib.sparc "<para>SPARC SPARC64 SPARCengine Լ
+<!ENTITY tm-attrib.sparc "<para>SPARC SPARC64 Լ
UltraSPARC SPARC International, Inc ҵ̱ꡣ
SPARC International, Inc ӵ
SPARC ̱Ȩ
֤ʽԱʵʽʹЩ̱ꡣ</para>">
<!ENTITY sparc "<trademark class='registered'>SPARC</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>SPARC64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCengine</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 JavaServer Pages JDK JRE JSP JVM Netra OpenJDK
- Solaris StarOffice Sun Blade Sun Enterprise Sun Fire SunOS
- Ultra Լ VirtualBox Sun Microsystems,
+ Virtual Machine JDK JRE JSP JVM Netra OpenJDK
+ Solaris StarOffice SunOS
+ Լ VirtualBox Sun Microsystems,
Inc. ҵ̱ע̱ꡣ</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -321,10 +264,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun Fire</trademark>">
-<!ENTITY sun.ultra "Sun <trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!ENTITY virtualbox "<trademark>VirtualBox</trademark>">
@@ -340,12 +279,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
<!ENTITY tm-attrib.thomson "<para>SpeedTouch Thomson ̱ꡣ</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta Crusoe Transmeta Corporation
- /ҵ̱ע̱ꡣ</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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>">
@@ -365,7 +298,6 @@ Coverity Extend Coverity Prevent Coverity Prevent SQS Coverity ˾ע
Inc. ̱</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen XenSource, Inc. ҵ̱ꡣ</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 The
diff --git a/zh_TW.Big5/share/xml/trademarks.ent b/zh_TW.Big5/share/xml/trademarks.ent
index 6adf8a275f..5c290061e1 100644
--- a/zh_TW.Big5/share/xml/trademarks.ent
+++ b/zh_TW.Big5/share/xml/trademarks.ent
@@ -21,7 +21,6 @@
<!ENTITY tm-attrib.3ware "<para>3ware M Escalade O 3ware Inc UӼСC
</para>">
<!ENTITY tm.3ware "<trademark class='registered'>3ware</trademark>">
-<!ENTITY escalade "<trademark class='registered'>Escalade</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
<!ENTITY tm-attrib.adaptec "<para>Adaptec O Adaptec, Inc. UӼСC</para>">
@@ -35,17 +34,11 @@
<!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, Am486, Am5X86, AMD Athlon, AMD Duron,
-AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
+<!ENTITY tm-attrib.amd "<para>AMD, AMD Athlon,
+AMD Opteron, Athlon, &Eacute;lan, Opteron, M PCnet O
Advanced Micro Devices, Inc. ӼСC</para>">
-<!ENTITY am486 "<trademark class='registered'>Am486</trademark>">
-<!ENTITY am5x86 "<trademark class='registered'>Am5x86</trademark>">
<!ENTITY amd.athlon "<trademark>AMD&nbsp;Athlon</trademark>">
-<!ENTITY amd.duron "<trademark>AMD&nbsp;Duron</trademark>">
-<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark>AMD&nbsp;Opteron</trademark>">
-<!ENTITY amd.sempron "<trademark>AMD&nbsp;Sempron</trademark>">
-<!ENTITY amd.turion "<trademark>AMD&nbsp;Turion</trademark>">
<!ENTITY athlon "<trademark>Athlon</trademark>">
<!ENTITY elan "<trademark>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -66,20 +59,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.arm "<para>ARM O ARM Limited. UӼСC</para>">
<!ENTITY arm "<trademark class='registered'>ARM</trademark>">
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>The Bluetooth rлxݩ Bluetooth SIG,
- Inc.</para>">
-<!ENTITY bluetooth "<trademark class='registered'>Bluetooth</trademark>">
-
-<!ENTITY tm-attrib.broadcom "<para>Broadcom O Broadcom Corporation
- M/ΨlqUӼСC</para>">
-<!ENTITY broadcom "<trademark class='registered'>Broadcom</trademark>">
-
-<!-- http://www.checkpoint.com/copyright.html -->
-<!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1, H
- VPN-1 O Check Point Software Technologies
- Ltd. ӼСC</para>">
-
<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst, M IOS
O Cisco Systems, Inc. M/ΨݾcbM@ǨLaUӼСC</para>">
<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
@@ -105,20 +84,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.cvsup "<para>CVSup O
John D. Polstra UӼСC</para>">
-<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
-<!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
- Optiplex, PowerEdge O Dell
- Computer Corporation ӼЩεUӼСC</para>">
-<!ENTITY dell "<trademark>Dell</trademark>">
-<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
-
-<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
-<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection O
- Epson CorporationUӼСC</para>">
-<!ENTITY epson "<trademark class='registered'>EPSON</trademark>">
-<!ENTITY epson.perfection "<trademark class='registered'>EPSON
- Perfection</trademark>">
-
<!ENTITY tm-attrib.freebsd "<para>FreeBSD O FreeBSD|UӼ</para>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
@@ -127,11 +92,9 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
-<!ENTITY tm-attrib.ibm "<para>IBM, AIX, EtherJet, Netfinity, OS/2, PowerPC, PS/2, S/390, M ThinkPad O
+<!ENTITY tm-attrib.ibm "<para>IBM, AIX, OS/2, PowerPC, PS/2, S/390, M ThinkPad O
ڰӥξqbMLaUӼЩΰӼСC</para>">
<!ENTITY aix "<trademark class='registered'>AIX</trademark>">
-<!ENTITY etherjet "<trademark>EtherJet</trademark>">
-<!ENTITY netfinity "<trademark class='registered'>Netfinity</trademark>">
<!ENTITY os2 "<trademark class='registered'>OS/2</trademark>">
<!ENTITY powerpc "<trademark class='registered'>PowerPC</trademark>">
<!ENTITY ps2 "<trademark class='registered'>PS/2</trademark>">
@@ -186,7 +149,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
Macromedia, Inc. bM/ΨLaӼЩεUӼСC</para>">
<!ENTITY flash "<trademark>Flash</trademark>">
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
-<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
Outlook, Windows, Windows Media, M Windows NT O Microsoft Corporation
@@ -207,8 +169,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY mips "<trademark class='registered'>MIPS</trademark>">
<!-- http://www.mysql.com/company/trademark.html -->
-<!ENTITY tm-attrib.mysql "<para>MySQL O
- MySQL AB bBڷMLaUӼСC</para>">
<!ENTITY mysql "<trademark>MySQL</trademark>">
<!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -228,10 +188,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.nexthop "<para>GateD M NextHop O NextHop bMLaӼЩεUӼСC</para>">
<!ENTITY gated "<trademark class='registered'>GateD</trademark>">
-<!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
-<!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module, M
- NLM O Novell, Inc. bMLaӼЩεUӼСC</para>">
-
<!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, M UNIX
O The Open Group bMLaUӼСF IT DialTone M The Open Group
OӼСC</para>">
@@ -245,9 +201,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.oracle "<para>Oracle O Oracle Corporation UӼСC</para>">
<!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
-<!ENTITY tm-attrib.parallels "<para>Parallels O Parallels Software
- International Inc. UӼСC</para>">
-
<!-- http://www.powerquest.com/legal/ -->
<!ENTITY tm-attrib.powerquest "<para>PowerQuest M PartitionMagic O
PowerQuest Corporation bM/ΨLaUӼСC</para>">
@@ -279,25 +232,19 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
Graphics, Inc. bM/ΨLaUӼСC</para>">
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware O Patrick Volkerding and
- Slackware Linux, Inc. UӼСC</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, H
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, H
UltraSPARC O SPARC International, Inc bMLaӼСC
Sun Microsystems, Inc. Ҷ}o[cA]t SPARC ӼЪ~C</para>">
<!ENTITY sparc "<trademark class='registered'>Sparc</trademark>">
<!ENTITY sparc64 "<trademark class='registered'>Sparc64</trademark>">
-<!ENTITY sparcengine "<trademark class='registered'>SPARCEngine</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, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice,
- Sun Blade, Sun Enterprise, Sun Fire, SunOS, M Ultra O
+<!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JSP, JVM, Netra, Solaris, StarOffice
+ M SunOS O
Sun Microsystems, Inc. bMLaӼЩεUӼСC</para>">
<!ENTITY java "<trademark>Java</trademark>">
<!ENTITY java.virtual.machine "<trademark>Java Virtual Machine</trademark>">
-<!ENTITY javaserver.pages "<trademark>JavaServer Pages</trademark>">
<!ENTITY jdk "<trademark>JDK</trademark>">
<!ENTITY jre "<trademark>JRE</trademark>">
<!ENTITY jsp "<trademark>JSP</trademark>">
@@ -306,10 +253,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY solaris "<trademark>Solaris</trademark>">
<!ENTITY staroffice "<trademark>StarOffice</trademark>">
<!ENTITY sun "<trademark>Sun</trademark>">
-<!ENTITY sun.blade "<trademark>Sun&nbsp;Blade</trademark>">
-<!ENTITY sun.enterprise "<trademark>Sun&nbsp;Enterprise</trademark>">
-<!ENTITY sun.fire "<trademark>Sun&nbsp;Fire</trademark>">
-<!ENTITY sun.ultra "Sun&nbsp;<trademark>Ultra</trademark>">
<!ENTITY sunos "<trademark>SunOS</trademark>">
<!-- http://www.symantec.com/legal/legal_note.html -->
@@ -324,12 +267,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
<!ENTITY tm-attrib.thomson "<para>SpeedTouch O Thomson ӼСC</para>">
<!ENTITY speedtouch "<trademark>SpeedTouch</trademark>">
-<!-- http://www.transmeta.com/about/legal.html -->
-<!ENTITY tm-attrib.transmeta "<para>Transmeta M Crusoe O Transmeta Corporation
- bM/ΨLaӼЩεUӼСC</para>">
-<!ENTITY crusoe "<trademark>Crusoe</trademark>">
-<!ENTITY transmeta "<trademark>Transmeta</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>">
@@ -349,8 +286,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, M PCnet O
Inc. Ӽ</para>">
<!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>Xen O XenSource, Inc.
- bΨLaUӼ.</para>">
<!ENTITY xen "<trademark>Xen</trademark>">
<!ENTITY tm-attrib.xfree86 "<para>XFree86 O The