aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.GB2312/share
diff options
context:
space:
mode:
authorFukang Chen <loader@FreeBSD.org>2007-10-23 02:08:23 +0000
committerFukang Chen <loader@FreeBSD.org>2007-10-23 02:08:23 +0000
commitd58e3b71be97a2e0f2c7df8a16c1625030a5bfd5 (patch)
tree7f22139431f1311109bb6291e668c84b5fae26ea /zh_CN.GB2312/share
parent87a6889455df0cf98c9a96c8cf676ab25dcbfaf2 (diff)
Notes
Diffstat (limited to 'zh_CN.GB2312/share')
-rw-r--r--zh_CN.GB2312/share/sgml/trademarks.ent10
1 files changed, 9 insertions, 1 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent
index b8498ffab3..7b0c2ac0a9 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.41
+ Original revision: 1.43
$FreeBSD$
-->
@@ -87,6 +87,12 @@
在加拿大、美国和/或其他国家的注册商标。</para>">
<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
+<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
+<!ENTITY tm-attrib.coverity "<para>Coverity 是一个注册商标;
+Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司的注册商标。</para>">
+<!ENTITY coverity "<trademark class='registered'>Coverity</trademark>">
+<!ENTITY coverity.prevent "<trademark class='registered'>Coverity Prevent</trademark>">
+
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster 是
Creative Technology Ltd. 在美国和/或其他国家的注册商标。</para>">
@@ -133,6 +139,7 @@
Inc. 在美国的注册商标。</para>">
<!ENTITY posix "<trademark class='registered'>POSIX</trademark>">
+<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
<!ENTITY tm-attrib.intel "<para>Intel, Celeron, EtherExpress, i386,
i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation
及其分支机构在美国和其他国家的商标或注册商标。</para>">
@@ -144,6 +151,7 @@
<!ENTITY itanium "<trademark class='registered'>Itanium</trademark>">
<!ENTITY pentium "<trademark class='registered'>Pentium</trademark>">
<!ENTITY xeon "<trademark>Xeon</trademark>">
+<!ENTITY core "<trademark>Core</trademark>">
<!-- http://www.quicken.com/support/trademark/ -->
<!ENTITY tm-attrib.intuit "<para>Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美国和其他国家的商标或注册商标。</para>">