- Clean up unused trademark entities

1 files changed, 7 insertions, 75 deletions

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