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 Ländern.</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 gehört
-  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
   Ländern.</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 Ländern oder beiden.</para>">
@@ -140,11 +119,6 @@
   Warenzeichen von MIPS Technologies, Inc. in den Vereinigten Staaten
   und in anderen Ländern.</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
-  Europäische Union und in anderen Ländern.</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 Ländern.</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
-  Ländern.</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 Ländern.</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 Ländern.  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
   Ländern.</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 Ländern.</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
   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
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 védjegyei.</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. védjegyei.</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 @@
   védjegye.</para>">
 <!ENTITY arm "<trademark class='registered'>ARM</trademark>">
 
-<!-- http://www.bluetooth.com/sig/trademark.use.asp -->
-<!ENTITY tm-attrib.bluetooth "<para>A Bluetooth világmárka 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 leányvállalatainak a bejegyzett
-  védjegye.</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
-  védjegyei.</para>">
-
 <!ENTITY tm-attrib.cisco "<para>A Cisco, Catalyst és IOS
   a Cisco Systems, Inc. és/vagy társvállalatainak
   bejegyzett védjegyei az Egyesült Államokban és
@@ -124,32 +102,10 @@
 <!ENTITY tm-attrib.cvsup "<para>A CVSup John D. Polstra bejegyzett
   védjegye.</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 védjegyei, vagy
-  bejegyzett védjegyei.</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 védjegyei.</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 védjegye.</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
-  védjegyei vagy bejegyzett védjegyei az Egyesült
-  Államokban és egyéb országokban.</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 védjegyei, vagy védjegyei az Egyesült
   Államokban és más országokban.</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 védjegyei az Egyesült Államokban,
   más országokban, vagy mindkettõben.</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 @@
   országokban.</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 védjegye
-  az Egyesült Államokban, az Európai Unióban
-  és más országokban.</para>">
 <!ENTITY mysql "<trademark>MySQL</trademark>">
 
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
@@ -279,12 +229,6 @@
   Államokban és más országokban.</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 védjegyei vagy védjegyei az
-  Egyesült Államokban és más
-  országokban.</para>">
-
 <!ENTITY tm-attrib.opengroup "<para>A Motif, OSF/1 és UNIX a
   The Open Group bejegyzett védjegyei, az IT DialTone és
   a The Open Group pedig védjegyei az Egyesült államokban
@@ -301,9 +245,6 @@
   védjegye.</para>">
 <!ENTITY oracle "<trademark class='registered'>Oracle</trademark>">
 
-<!ENTITY tm-attrib.parallels "<para>A Parallels a Parallels Software
-  International Inc. védjegye.</para>">
-
 <!-- http://www.powerquest.com/legal/ -->
 <!ENTITY tm-attrib.powerquest "<para>A PowerQuest és PartitionMagic
   a PowerQuest Corporation bejegyzett védjegyei az Egyesült
@@ -340,11 +281,7 @@
   világszerte.</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 védjegye.</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 védjegyei az
   Egyesült államokban és más
   országokban.  A SPARC International, Inc birtokolja az
@@ -354,20 +291,18 @@
   alapján.</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. védjegyei vagy bejegyzett
   védjegyei az Egyesült Államokban és más
   országokban.</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 @@
   védjegye.</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 védjegyei vagy bejegyzett védjegyei
-  az Egyesült Államokban és/vagy más
-  országokban.</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.
   védjegye.</para>">
 <!-- http://www.xensource.com/xen-tm-faq.html -->
-<!ENTITY tm-attrib.xen "<para>A Xen a XenSource, Inc. védjegye
-  az Egyesült Államokban és más
-  országokban.</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/©Î¨ä¤l¤½¥qªºµù¥U°Ó¼Ð¡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/©Î¨äªþÄÝ¾÷ºc¦b¬ü°ê©M¤@¨Ç¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡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 Corporationªºµù¥U°Ó¼Ð¡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
   °ê»Ú°Ó¥Î¾÷¾¹¤½¥q¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð©Î°Ó¼Ð¡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. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥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 ¦b¬ü°ê¡B¼Ú·ù©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡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 ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥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. ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥U°Ó¼Ð¡C</para>">
-
 <!ENTITY tm-attrib.opengroup "<para>Motif, OSF/1, ©M UNIX
   ¬O The Open Group ¦b¬ü°ê©M¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡F IT DialTone ©M The Open Group
   ¬O¨ä°Ó¼Ð¡C</para>">
@@ -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 ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡C</para>">
@@ -279,25 +232,19 @@ AMD Opteron, AMD-K6, Athlon, &Eacute;lan, Opteron, ©M PCnet ¬O
   Graphics, Inc. ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð¡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 ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð¡C
   ¬° Sun Microsystems, Inc. ©Ò¶}µoªº¬[ºc¡A¥]§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. ¦b¬ü°ê©M¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥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
-  ¦b¬ü°ê©M/©Î¨ä¥L°ê®aªº°Ó¼Ð©Îµù¥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¬ü°ê¤Î¨ä¥L°ê®aªºµù¥U°Ó¼Ð.</para>">
 <!ENTITY xen "<trademark>Xen</trademark>">
 
 <!ENTITY tm-attrib.xfree86 "<para>XFree86 ¬O The