aboutsummaryrefslogtreecommitdiff
path: root/es_ES.ISO8859-1/share
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2013-06-08 17:03:03 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2013-06-08 17:03:03 +0000
commitd0265dd3986914c180ccb52e10047a5bbbb3895d (patch)
treed62287614b8be38ddff7745bb7c9af73de8cd39a /es_ES.ISO8859-1/share
parentf79b758b0992357953520defa33514f304ea1af6 (diff)
downloaddoc-d0265dd3986914c180ccb52e10047a5bbbb3895d.tar.gz
doc-d0265dd3986914c180ccb52e10047a5bbbb3895d.zip
- Clean up unused trademark entities
Notes
Notes: svn path=/projects/db5/; revision=41879
Diffstat (limited to 'es_ES.ISO8859-1/share')
-rw-r--r--es_ES.ISO8859-1/share/xml/trademarks.ent84
1 files changed, 8 insertions, 76 deletions
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