diff options
| author | Xin LI <delphij@FreeBSD.org> | 2007-04-17 03:09:11 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2007-04-17 03:09:11 +0000 |
| commit | f40a4c1eebc39fc5332d3378e4847a25aaec321c (patch) | |
| tree | a8cc8a3ff919b9b37b71f788ffe12a7f05aa5fe2 /zh_CN.GB2312 | |
| parent | e570d58ad9baa0d83f01d5ebe33ceff728f60c3b (diff) | |
Notes
Diffstat (limited to 'zh_CN.GB2312')
| -rw-r--r-- | zh_CN.GB2312/share/sgml/trademarks.ent | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent index fd9bcd23f8..dec60a5104 100644 --- a/zh_CN.GB2312/share/sgml/trademarks.ent +++ b/zh_CN.GB2312/share/sgml/trademarks.ent @@ -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>"> |