- Various fixes;
- MFen: 1.17 --> 1.35
This commit is contained in:
parent
1475dfa957
commit
92874371ff
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=34400
1 changed files with 83 additions and 46 deletions
|
@ -12,16 +12,16 @@
|
|||
Please keep this file sorted.
|
||||
|
||||
$FreeBSD$
|
||||
Original Revision : 1.17
|
||||
Original Revision : 1.35
|
||||
-->
|
||||
|
||||
<!ENTITY tm-attrib.3com "<para>3Com and HomeConnect are registered
|
||||
trademarks of 3Com Corporation.</para>">
|
||||
<!ENTITY tm-attrib.3com "<para>3Com et HomeConnect sont des marques
|
||||
déposées de 3Com Corporation.</para>">
|
||||
<!-- 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
|
||||
trademarks of 3ware Inc.</para>">
|
||||
<!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>">
|
||||
|
||||
|
@ -41,19 +41,26 @@
|
|||
|
||||
<!-- 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, Élan, and PCnet are
|
||||
trademarks of Advanced Micro Devices, Inc.</para>">
|
||||
Duron, AMD Opteron, AMD-K6, 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 Athlon</trademark>">
|
||||
<!ENTITY amd.duron "<trademark>AMD Duron</trademark>">
|
||||
<!ENTITY amd.k6 "<trademark class='registered'>AMD-K6</trademark>">
|
||||
<!ENTITY amd.opteron "<trademark>AMD Operon</trademark>">
|
||||
<!ENTITY amd.opteron "<trademark>AMD Opteron</trademark>">
|
||||
<!ENTITY amd.sempron "<trademark>AMD Sempron</trademark>">
|
||||
<!ENTITY amd.turion "<trademark>AMD Turion</trademark>">
|
||||
<!ENTITY athlon "<trademark>Athlon</trademark>">
|
||||
<!ENTITY elan "<trademark>Élan</trademark>">
|
||||
<!ENTITY opteron "<trademark>Opteron</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.apple "<para>Apple, FireWire, Mac, Macintosh, Mac OS,
|
||||
Quicktime, and TrueType are trademarks of Apple Computer, Inc.,
|
||||
registered in the United States and other countries.</para>">
|
||||
<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
|
||||
<!ENTITY tm-attrib.apple "<para>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
|
||||
Quicktime, et TrueType sont des marques d'Apple Computer, Inc.,
|
||||
déposées aux Etats Unis et dans d'autres pays.</para>">
|
||||
<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
|
||||
<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
|
||||
<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
|
||||
<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
|
||||
<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
|
||||
|
@ -81,7 +88,7 @@
|
|||
|
||||
<!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.">
|
||||
in the United States and certain other countries.</para>">
|
||||
<!ENTITY catalyst "<trademark class='registered'>Catalyst</trademark>">
|
||||
<!ENTITY ios "<trademark class='registered'>IOS</trademark>">
|
||||
|
||||
|
@ -97,7 +104,7 @@
|
|||
<!ENTITY soundblaster "<trademark class='registered'>SoundBlaster</trademark>">
|
||||
|
||||
<!-- http://www.cvsup.org/ -->
|
||||
<!ENTITY tm-attrib.cvsup "<para>CVSup est une marque déposée de
|
||||
<!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 -->
|
||||
|
@ -107,8 +114,15 @@
|
|||
<!ENTITY dell "<trademark>Dell</trademark>">
|
||||
<!ENTITY poweredge "<trademark>PowerEdge</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.freebsd "<para>FreeBSD est une marque déposée de
|
||||
Wind River Systems, Inc. Il est prévu qu'elle change rapidement.</para>">
|
||||
<!-- 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>">
|
||||
|
||||
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
|
||||
<!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,
|
||||
|
@ -128,15 +142,15 @@
|
|||
<!ENTITY s390 "<trademark class='registered'>S/390</trademark>">
|
||||
<!ENTITY thinkpad "<trademark class='registered'>ThinkPad</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, et 802 sont des marques déposées de
|
||||
<!ENTITY tm-attrib.ieee "<para>IEEE, POSIX, et 802 sont des marques déposées de
|
||||
Institute of Electrical and Electronics Engineers,
|
||||
Inc. aux Etats Unis.</para>">
|
||||
<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
|
||||
i486, Itanium, Pentium, and Xeon are trademarks or registered
|
||||
trademarks of Intel Corporation or its subsidiaries in the United
|
||||
States and other countries.</para>">
|
||||
i486, Itanium, Pentium, et Xeon sont des marques ou des marques
|
||||
déposées d'Intel Corporation ou de ses filiales aux Etats Unis
|
||||
et dans d'autres pays.</para>">
|
||||
<!ENTITY celeron "<trademark class='registered'>Celeron</trademark>">
|
||||
<!ENTITY etherexpress "<trademark>EtherExpress</trademark>">
|
||||
<!ENTITY i386 "<trademark>i386</trademark>">
|
||||
|
@ -161,8 +175,10 @@
|
|||
trademarks of Lantronix Corporation.</para>">
|
||||
<!ENTITY easyio "<trademark>EasyIO</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.linux "<para>Linux is a registered trademark of
|
||||
Linus Torvalds in the United States.</para>">
|
||||
<!-- http://www.linuxmark.org/ -->
|
||||
<!ENTITY tm-attrib.linux "<para>Linux est une marque
|
||||
déposée de Linus Torvalds.</para>">
|
||||
<!ENTITY linux "<trademark class='registered'>Linux</trademark>">
|
||||
|
||||
<!-- http://www.lsilogic.com/trademrk.html -->
|
||||
<!ENTITY tm-attrib.lsilogic "<para>LSI Logic, AcceleRAID, eXtremeRAID,
|
||||
|
@ -179,17 +195,20 @@
|
|||
<!ENTITY macromedia "<trademark class='registered'>Macromedia</trademark>">
|
||||
<!ENTITY shockwave "<trademark class='registered'>Shockwave</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
|
||||
Outlook, Windows, Windows Media, and Windows NT are either
|
||||
registered trademarks or trademarks of Microsoft Corporation in the
|
||||
United States and/or other countries.</para>">
|
||||
<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
|
||||
Outlook, Windows, Windows Media, et Windows NT sont soit des marques
|
||||
soit des marques déposées de Microsoft Corporation aux
|
||||
Etats Unis ou dans d'autres pays.</para>">
|
||||
<!ENTITY intellimouse "<trademark class='registered'>IntelliMouse</trademark>">
|
||||
<!ENTITY microsoft "<trademark class='registered'>Microsoft</trademark>">
|
||||
<!ENTITY microsoft.windows "µsoft; &windows;">
|
||||
<!ENTITY ms-dos "<trademark class='registered'>MS-DOS</trademark>">
|
||||
<!ENTITY outlook "<trademark class='registered'>Outlook</trademark>">
|
||||
<!ENTITY windows "<trademark class='registered'>Windows</trademark>">
|
||||
<!ENTITY windows.media "<trademark class='registered'>Windows Media</trademark>">
|
||||
<!ENTITY windows2k "&windows; 2000">
|
||||
<!ENTITY windowsnt "<trademark class='registered'>Windows NT</trademark>">
|
||||
<!ENTITY windowsxp "&windows; XP">
|
||||
|
||||
<!ENTITY tm-attrib.mips "<para>MIPS and R4000 are registered
|
||||
trademarks of MIPS Technologies, Inc. in the United States and other
|
||||
|
@ -208,21 +227,34 @@
|
|||
Pioneers, Ltd.</para>">
|
||||
<!ENTITY diskonchip "<trademark class='registered'>DiskOnChip</trademark>">
|
||||
|
||||
<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
|
||||
<!ENTITY tm-attrib.netbsd "<para>NetBSD est une marque
|
||||
déposée de la fondation NetBSD.</para>">
|
||||
|
||||
<!ENTITY tm-attrib.netscape "<para>Netscape and the Netscape Navigator
|
||||
are registered trademarks of Netscape Communications Corporation in
|
||||
the U.S. and other countries.</para>">
|
||||
<!ENTITY netscape "<trademark class='registered'>Netscape</trademark>">
|
||||
<!ENTITY netscape.navigator "<trademark class='registered'>Netscape Navigator</trademark>">
|
||||
|
||||
<!-- http://www.nexthop.com/legal.shtml -->
|
||||
<!ENTITY tm-attrib.nexthop "<para>GateD et NextHop sont des marques
|
||||
déposées ou non de NextHop aux Etats Unis et dans d'autres
|
||||
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 enregistrées et IT DialTone et
|
||||
The Open Group sont des marques déposées de l' Open Group
|
||||
aux Etats Unis et dans d'autres pays. </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
|
||||
d'autres pays. </para>">
|
||||
<!ENTITY tm-attrib.unix "<para>UNIX est une marque
|
||||
déposée de l'Open Group aux Etats Unis et dans d'autres
|
||||
pays.</para>">
|
||||
<!ENTITY motif "<trademark class='registered'>Motif</trademark>">
|
||||
<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
|
||||
|
||||
|
@ -266,28 +298,32 @@ aux Etats Unis et dans d'autres pays. </para>">
|
|||
States and/or other countries worldwide.</para>">
|
||||
<!ENTITY opengl "<trademark class='registered'>OpenGL</trademark>">
|
||||
|
||||
<!ENTITY tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, 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 tm-attrib.sparc "<para>Sparc, Sparc64, SPARCEngine, 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, JSP, JVM, Netra, Solaris, StarOffice,
|
||||
Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of
|
||||
Sun Microsystems, Inc. in the United States and other
|
||||
countries.</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, et
|
||||
Ultra 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>">
|
||||
<!ENTITY jvm "<trademark>JVM</trademark>">
|
||||
<!ENTITY netra "<trademark>Netra</trademark>">
|
||||
<!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>">
|
||||
|
@ -323,30 +359,31 @@ aux Etats Unis et dans d'autres pays. </para>">
|
|||
<!ENTITY usrobotics "<trademark class='registered'>U.S. Robotics</trademark>">
|
||||
|
||||
<!-- http://www.maplesoft.com/trademarks.shtml -->
|
||||
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple and Maple are
|
||||
trademarks or registered trademarks of Waterloo Maple Inc.</para>">
|
||||
<!ENTITY tm-attrib.waterloomaple "<para>Waterloo Maple et Maple sont
|
||||
des marques ou des marques déposées de Waterloo Maple
|
||||
Inc.</para>">
|
||||
<!ENTITY maple "<trademark>Maple</trademark>">
|
||||
|
||||
<!-- http://www.wolfram.com/company/terms.html -->
|
||||
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica is a registered
|
||||
trademark of Wolfram Research, Inc.</para>">
|
||||
<!ENTITY tm-attrib.wolframresearch "<para>Mathematica est une marque
|
||||
déposée de Wolfram Research, Inc.</para>">
|
||||
<!ENTITY mathematica "<trademark class='registered'>Mathematica</trademark>">
|
||||
|
||||
<!-- http://www.vmware.com/legal.html -->
|
||||
<!ENTITY tm-attrib.vmware "<para>VMware is a trademark of VMware,
|
||||
<!ENTITY tm-attrib.vmware "<para>VMware est une marque de VMware,
|
||||
Inc.</para>">
|
||||
|
||||
<!ENTITY tm-attrib.xfree86 "<para>XFree86 is a trademark of The
|
||||
<!ENTITY tm-attrib.xfree86 "<para>XFree86 est une marque de
|
||||
XFree86 Project, Inc.</para>">
|
||||
<!ENTITY xfree86 "<trademark>XFree86</trademark>">
|
||||
|
||||
<!-- http://www.xiph.org/ -->
|
||||
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis and Xiph.Org are trademarks
|
||||
of Xiph.Org.</para>">
|
||||
<!ENTITY tm-attrib.xiph "<para>Ogg Vorbis et Xiph.Org sont des
|
||||
marques de Xiph.Org.</para>">
|
||||
|
||||
<!ENTITY tm-attrib.general "<para>Plusieurs désignations utilisées
|
||||
par les constructeurs et vendeurs pour distinguer leurs produits sont
|
||||
mentionnées comme des marques enregistrées. Lorsqu'elles
|
||||
mentionnées comme des marques déposées. Lorsqu'elles
|
||||
apparaissent dans ce document et que le projet FreeBSD est au courant de cette
|
||||
mention, la désignation est suivie du symbole <quote>™</quote>
|
||||
ou du symbole <quote>®</quote>.</para>">
|
||||
|
|
Loading…
Reference in a new issue