- Clean up unused trademark entities

1 files changed, 6 insertions, 71 deletions

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 和 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. 的註冊商標。</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, 和 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 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, 和 PCnet 是
 <!ENTITY tm-attrib.arm "<para>ARM 是 ARM 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 catalyst "<trademark class='registered'>Catalyst</trademark>">
@@ -105,20 +84,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
 <!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.heidelberg.com/hq/eng/small_print/trademarks.asp -->
@@ -127,11 +92,9 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
 
 
 
-<!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 是
   國際商用機器公司在美國和其他國家的註冊商標或商標。</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, 和 PCnet 是
   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
@@ -207,8 +169,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
 <!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 -->
@@ -228,10 +188,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
 <!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>">
@@ -245,9 +201,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
 <!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>">
@@ -279,25 +232,19 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
   Graphics, Inc. 在美國和/或其他國家的註冊商標。</para>">
 <!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
 
-<!-- http://slackware.com/trademark/trademark.php -->
-<!ENTITY tm-attrib.slackware "<para>Slackware 是 Patrick Volkerding and
-  Slackware Linux, Inc. 的註冊商標。</para>">
-
-<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, 以及
+<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, 以及
   UltraSPARC 是 SPARC International, Inc 在美國和其他國家的商標。
   為 Sun Microsystems, 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, 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>">
 <!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, 和 PCnet 是
 <!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, 和 PCnet 是
 <!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>">
@@ -349,8 +286,6 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
   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