diff options
| author | Fukang Chen <loader@FreeBSD.org> | 2007-08-09 15:40:40 +0000 |
|---|---|---|
| committer | Fukang Chen <loader@FreeBSD.org> | 2007-08-09 15:40:40 +0000 |
| commit | 9ff15e34ef9aeacbcf009cd1003b218ab2c324fa (patch) | |
| tree | ac88e44d52170a777deb2e429e45dbb47e7d9660 /zh_CN.GB2312/share/sgml | |
| parent | 4b9675c0a4771694619f680fad0e5220aba12134 (diff) | |
Notes
Diffstat (limited to 'zh_CN.GB2312/share/sgml')
| -rw-r--r-- | zh_CN.GB2312/share/sgml/authors.ent | 4 | ||||
| -rw-r--r-- | zh_CN.GB2312/share/sgml/mailing-lists.ent | 6 | ||||
| -rw-r--r-- | zh_CN.GB2312/share/sgml/teams.ent | 4 | ||||
| -rw-r--r-- | zh_CN.GB2312/share/sgml/trademarks.ent | 8 |
4 files changed, 18 insertions, 4 deletions
diff --git a/zh_CN.GB2312/share/sgml/authors.ent b/zh_CN.GB2312/share/sgml/authors.ent index 398737c07a..778a655401 100644 --- a/zh_CN.GB2312/share/sgml/authors.ent +++ b/zh_CN.GB2312/share/sgml/authors.ent @@ -52,10 +52,14 @@ <!ENTITY a.leeym "李彦明 <email>leeym@FreeBSD.org</email>"> +<!ENTITY a.loader "陈福康 <email>loader@FreeBSD.org</email>"> + <!ENTITY a.luoqi "陈洛祁 <email>luoqi@FreeBSD.org</email>"> <!ENTITY a.lwhsu "许立文 <email>lwhsu@FreeBSD.org</email>"> +<!ENTITY a.nemoliu "刘彤 <email>nemoliu@FreeBSD.org</email>"> + <!ENTITY a.pat "李云玖 <email>pat@FreeBSD.org</email>"> <!ENTITY a.rafan "范荣恩 <email>rafan@FreeBSD.org</email>"> diff --git a/zh_CN.GB2312/share/sgml/mailing-lists.ent b/zh_CN.GB2312/share/sgml/mailing-lists.ent index 332ebd235a..c2ba923da8 100644 --- a/zh_CN.GB2312/share/sgml/mailing-lists.ent +++ b/zh_CN.GB2312/share/sgml/mailing-lists.ent @@ -2,7 +2,7 @@ Names of FreeBSD mailing lists and related software. The FreeBSD Chinese Documentation Project - Original revision: 1.56 + Original revision: 1.57 $FreeBSD$ --> @@ -229,6 +229,10 @@ <!ENTITY a.isp "<ulink url='&a.isp.url;'>FreeBSD Internet 服务提供商的邮件列表</ulink>"> <!ENTITY a.isp.name "<ulink url='&a.isp.url;'>freebsd-isp</ulink>"> +<!ENTITY a.jail.url "&a.mailman.listinfo;/freebsd-jail"> +<!ENTITY a.jail "<ulink url='&a.jail.url;'>FreeBSD jails 邮件列表</ulink>"> +<!ENTITY a.jail.name "<ulink url='&a.jail.url;'>freebsd-jail</ulink>"> + <!ENTITY a.java.url "&a.mailman.listinfo;/freebsd-java"> <!ENTITY a.java "<ulink url='&a.java.url;'>FreeBSD Java 语言邮件列表</ulink>"> <!ENTITY a.java.name "<ulink url='&a.java.url;'>freebsd-java</ulink>"> diff --git a/zh_CN.GB2312/share/sgml/teams.ent b/zh_CN.GB2312/share/sgml/teams.ent index c501166c4d..0b4ef1c3d8 100644 --- a/zh_CN.GB2312/share/sgml/teams.ent +++ b/zh_CN.GB2312/share/sgml/teams.ent @@ -12,12 +12,14 @@ builds for the other languages, and we will poke fun of you in public. - Original revision: 1.17 + Original revision: 1.18 $FreeBSD$ --> <!ENTITY a.admins "FreeBSD 集群管理员 <email>admins@FreeBSD.org</email>"> +<!ENTITY a.bugmeister "问题报告数据库管理员 <email>bugmeister@FreeBSD.org</email>"> + <!ENTITY a.core-secretary "核心团队秘书 <email>core-secretary@FreeBSD.org</email>"> <!ENTITY a.cvsadm "CVS 代码库管理员 <email>cvsadm@FreeBSD.org</email>"> 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 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>"> @@ -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 --> |