From owner-svn-doc-projects@FreeBSD.ORG  Sat Jun  8 17:03:06 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1F631192;
 Sat,  8 Jun 2013 17:03:05 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5272D16E0;
 Sat,  8 Jun 2013 17:03:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58H357l033917;
 Sat, 8 Jun 2013 17:03:05 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58H34u7033900;
 Sat, 8 Jun 2013 17:03:04 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201306081703.r58H34u7033900@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 8 Jun 2013 17:03:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41879 - in projects/db5: de_DE.ISO8859-1/share/xml
 el_GR.ISO8859-7/share/xml es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/xml
 hu_HU.ISO8859-2/share/xml it_IT.ISO8859-15/share/xml ja...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jun 2013 17:03:06 -0000

Author: gabor
Date: Sat Jun  8 17:03:03 2013
New Revision: 41879
URL: http://svnweb.freebsd.org/changeset/doc/41879

Log:
  - Clean up unused trademark entities

Modified:
  projects/db5/de_DE.ISO8859-1/share/xml/trademarks.ent
  projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
  projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
  projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
  projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
  projects/db5/it_IT.ISO8859-15/share/xml/trademarks.ent
  projects/db5/ja_JP.eucJP/share/xml/trademarks.ent
  projects/db5/mn_MN.UTF-8/share/xml/trademarks.ent
  projects/db5/nl_NL.ISO8859-1/share/xml/trademarks.ent
  projects/db5/ru_RU.KOI8-R/share/xml/trademarks.ent
  projects/db5/share/xml/trademarks.ent
  projects/db5/zh_CN.GB2312/share/xml/trademarks.ent
  projects/db5/zh_TW.Big5/share/xml/trademarks.ent

Modified: projects/db5/de_DE.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/de_DE.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/de_DE.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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

Modified: projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent
==============================================================================
--- projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/el_GR.ISO8859-7/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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 είναι ένα εμπορικό σύμβολο

Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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

Modified: projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/fr_FR.ISO8859-1/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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

Modified: projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent
==============================================================================
--- projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/hu_HU.ISO8859-2/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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.

Modified: projects/db5/it_IT.ISO8859-15/share/xml/trademarks.ent
==============================================================================
--- projects/db5/it_IT.ISO8859-15/share/xml/trademarks.ent	Sat Jun  8 15:55:49 2013	(r41878)
+++ projects/db5/it_IT.ISO8859-15/share/xml/trademarks.ent	Sat Jun  8 17:03:03 2013	(r41879)
@@ -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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***