os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

MFen 1.35 -> 1.38

Browse source 
Obtained from:	The FreeBSD Simplified Chinese Project
This commit is contained in:
Xin LI 2007-04-17 03:09:11 +00:00
parent e570d58ad9
commit f40a4c1eeb
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=30053
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zh_CN.GB2312/share/sgml/trademarks.ent
View file

@ -8,7 +8,7 @@
Please keep this file sorted.
Original revision: 1.35
Original revision: 1.38
$FreeBSD$
-->
@ -53,6 +53,7 @@
<!ENTITY airport "<trademark class='registered'>AirPort</trademark>">
<!ENTITY apple "<trademark class='registered'>Apple</trademark>">
<!ENTITY firewire "<trademark class='registered'>FireWire</trademark>">
<!ENTITY imac "<trademark class='registered'>iMac</trademark>">
<!ENTITY mac "<trademark class='registered'>Mac</trademark>">
<!ENTITY macintosh "<trademark class='registered'>Macintosh</trademark>">
<!ENTITY macos "<trademark class='registered'>Mac OS</trademark>">
@ -230,6 +231,9 @@
<!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>">
@ -259,6 +263,10 @@
在美国和/或其他国家的注册商标。</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, Inc 在美国和其他国家的商标。
包含 SPARC 商标的产品基于 Sun Microsystems, Inc. 开发的架构。</para>">
@ -327,6 +335,10 @@
<!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 是 The
XFree86 Project, Inc 的商标。.</para>">
<!ENTITY xfree86 "<trademark>XFree86</trademark>">