aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.GB2312/share/sgml/trademarks.ent
diff options
context:
space:
mode:
Diffstat (limited to 'zh_CN.GB2312/share/sgml/trademarks.ent')
-rw-r--r--zh_CN.GB2312/share/sgml/trademarks.ent8
1 files changed, 6 insertions, 2 deletions
diff --git a/zh_CN.GB2312/share/sgml/trademarks.ent b/zh_CN.GB2312/share/sgml/trademarks.ent
index dec60a5104..b8498ffab3 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.38
+ Original revision: 1.41
$FreeBSD$
-->
@@ -42,7 +42,9 @@
<!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 Opteron</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>&Eacute;lan</trademark>">
<!ENTITY opteron "<trademark>Opteron</trademark>">
@@ -83,6 +85,7 @@
<!ENTITY tm-attrib.corel "<para>Corel 和 WordPerfect 是 Corel Corporation 和/或其子公司
在加拿大、美国和/或其他国家的注册商标。</para>">
+<!ENTITY wordperfect "<trademark class='registered'>WordPerfect</trademark>">
<!-- http://www.creative.com/legal.asp -->
<!ENTITY tm-attrib.creative "<para>Sound Blaster 是
@@ -246,6 +249,7 @@
<!-- http://www.realnetworks.com/company/logos/policy.html -->
<!ENTITY tm-attrib.realnetworks "<para>RealNetworks, RealPlayer, 和
RealAudio 是 RealNetworks, Inc. 的注册商标。</para>">
+<!ENTITY realplayer "<trademark class='registered'>RealPlayer</trademark>">
<!-- Note: RedHat doesn't use (r)/(tm) for their own trademarks -->
<!-- http://www.redhat.com/legal/legal_statement.html -->