- Clean up unused trademark entities

1 files changed, 7 insertions, 66 deletions

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
   déposées 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 déposée 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 déposées 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
   déposée 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 déposées 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 basés sur une architecture
   développée 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 déposées de Sun
+  Virtual Machine, JDK, JRE, JSP, JVM, Netra,
+  Solaris, StarOffice, et
+  SunOS sont des marques ou des marques déposées de Sun
   Microsystems, Inc. aux Etats Unis et dans d'autres pays.</para>">
 <!ENTITY java "<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