aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.UTF-8/share/xml
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-06-02 20:26:20 +0000
committerXin LI <delphij@FreeBSD.org>2015-06-02 20:26:20 +0000
commitdb170bc3bbf95b2af0daf4cba7a8a692d0985ee7 (patch)
tree0006e19fa51238ac38c19fcf7df6767b929d4cf0 /zh_CN.UTF-8/share/xml
parent56a116008d513c07c3c388311fa8f969c83447a2 (diff)
downloaddoc-db170bc3bbf95b2af0daf4cba7a8a692d0985ee7.tar.gz
doc-db170bc3bbf95b2af0daf4cba7a8a692d0985ee7.zip
MFen: chase some of recent changes, these were sitting in my local working
directory for quite a bit of time.
Notes
Notes: svn path=/head/; revision=46747
Diffstat (limited to 'zh_CN.UTF-8/share/xml')
-rw-r--r--zh_CN.UTF-8/share/xml/mailing-lists.ent112
-rw-r--r--zh_CN.UTF-8/share/xml/mirrors-local.xsl6
-rw-r--r--zh_CN.UTF-8/share/xml/trademarks.ent210
-rw-r--r--zh_CN.UTF-8/share/xml/transtable.xml7
4 files changed, 221 insertions, 114 deletions
diff --git a/zh_CN.UTF-8/share/xml/mailing-lists.ent b/zh_CN.UTF-8/share/xml/mailing-lists.ent
index 8b3a1fae93..56fcde6b97 100644
--- a/zh_CN.UTF-8/share/xml/mailing-lists.ent
+++ b/zh_CN.UTF-8/share/xml/mailing-lists.ent
@@ -3,7 +3,7 @@
Names of FreeBSD mailing lists and related software.
The FreeBSD Chinese Documentation Project
- Original revision: 1.85
+ Original Revision: r43258
$FreeBSD$
-->
@@ -51,14 +51,6 @@
<!ENTITY a.atm "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>FreeBSD ATM 网络邮件列表</link>">
<!ENTITY a.atm.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.atm.url;'>freebsd-atm</link>">
-<!ENTITY a.audit.url "&a.mailman.listinfo;/freebsd-audit">
-<!ENTITY a.audit "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>FreeBSD 源代码审计邮件列表</link>">
-<!ENTITY a.audit.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.audit.url;'>freebsd-audit</link>">
-
-<!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
-<!ENTITY a.binup "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>FreeBSD 预编译系统更新邮件列表</link>">
-<!ENTITY a.binup.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.binup.url;'>freebsd-binup</link>">
-
<!ENTITY a.bluetooth.url "&a.mailman.listinfo;/freebsd-bluetooth">
<!ENTITY a.bluetooth "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>FreeBSD Bluetooth 邮件列表</link>">
<!ENTITY a.bluetooth.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.bluetooth.url;'>freebsd-bluetooth</link>">
@@ -97,10 +89,6 @@
<!ENTITY a.ctm-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>CTM 公告</link>">
<!ENTITY a.ctm-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-announce.url;'>ctm-announce</link>">
-<!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
-<!ENTITY a.ctm-cvs-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>通过 CTM 发布的 CVS 文件</link>">
-<!ENTITY a.ctm-cvs-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</link>">
-
<!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
<!ENTITY a.ctm-src-4 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution 邮件列表</link>">
<!ENTITY a.ctm-src-4.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-4.url;'>ctm-src-4</link>">
@@ -125,6 +113,10 @@
<!ENTITY a.ctm-src-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>CTM 9-STABLE src branch distribution 邮件列表</link>">
<!ENTITY a.ctm-src-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>ctm-src-9</link>">
+<!ENTITY a.ctm-src-10.url "&a.mailman.listinfo;/ctm-src-10">
+<!ENTITY a.ctm-src-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>CTM 10-STABLE src branch distribution mailing list</link>">
+<!ENTITY a.ctm-src-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>ctm-src-10</link>">
+
<!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
<!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution 邮件列表</link>">
<!ENTITY a.ctm-src-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
@@ -161,6 +153,10 @@
<!ENTITY a.database "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>在 FreeBSD 上运行的数据库邮件列表</link>">
<!ENTITY a.database.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.database.url;'>freebsd-database</link>">
+<!ENTITY a.desktop.url "&a.mailman.listinfo;/freebsd-desktop">
+<!ENTITY a.desktop "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.desktop.url;'>&os; 桌面方面的使用与改进的邮件列表</link>">
+<!ENTITY a.desktop.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.desktop.url;'>freebsd-desktop</link>">
+
<!ENTITY a.developers "FreeBSD 开发人员邮件列表">
<!ENTITY a.developers.name "freebsd-developers">
@@ -178,6 +174,10 @@
<!ENTITY a.drivers "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>为 FreeBSD 编写设备驱动程序</link>">
<!ENTITY a.drivers.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.drivers.url;'>freebsd-drivers</link>">
+<!ENTITY a.dtrace.url "&a.mailman.listinfo;/freebsd-dtrace">
+<!ENTITY a.dtrace "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.dtrace.url;'>Using and working on DTrace in &os;.</link>">
+<!ENTITY a.dtrace.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.dtrace.url;'>freebsd-dtrace</link>">
+
<!ENTITY a.eclipse.url "&a.mailman.listinfo;/freebsd-eclipse">
<!ENTITY a.eclipse "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>FreeBSD 上的 Eclipse IDE、 工具、 富客户应用程序和 port 的用户</link>">
<!ENTITY a.eclipse.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.eclipse.url;'>freebsd-eclipse</link>">
@@ -198,6 +198,10 @@
<!ENTITY a.firewire "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>FreeBSD 火线技术 (IEEE 1394) 讨论邮件列表</link>">
<!ENTITY a.firewire.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.firewire.url;'>freebsd-firewire</link>">
+<!ENTITY a.fortran.url "&a.mailman.listinfo;/freebsd-fortran">
+<!ENTITY a.fortran "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fortran.url;'>Fortran on FreeBSD 邮件列表</link>">
+<!ENTITY a.fortran.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fortran.url;'>freebsd-fortran</link>">
+
<!ENTITY a.fs.url "&a.mailman.listinfo;/freebsd-fs">
<!ENTITY a.fs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>FreeBSD 文件系统项目邮件列表</link>">
<!ENTITY a.fs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.fs.url;'>freebsd-fs</link>">
@@ -242,6 +246,10 @@
<!ENTITY a.ia64 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>FreeBSD IA64 移植邮件列表</link>">
<!ENTITY a.ia64.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ia64.url;'>freebsd-ia64</link>">
+<!ENTITY a.infiniband.url "&a.mailman.listinfo;/freebsd-infiniband">
+<!ENTITY a.infiniband "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.infiniband.url;'>Infiniband on FreeBSD</link>">
+<!ENTITY a.infiniband.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.infiniband.url;'>freebsd-infiniband</link>">
+
<!ENTITY a.ipfw.url "&a.mailman.listinfo;/freebsd-ipfw">
<!ENTITY a.ipfw "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>FreeBSD IPFW 代码邮件列表</link>">
<!ENTITY a.ipfw.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ipfw.url;'>freebsd-ipfw</link>">
@@ -290,10 +298,6 @@
<!ENTITY a.mono "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>FreeBSD 上的 Mono 和 C# 应用</link>">
<!ENTITY a.mono.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>freebsd-mono</link>">
-<!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
-<!ENTITY a.mozilla "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>FreeBSD 的 Mozilla 浏览器 port 邮件列表</link>">
-<!ENTITY a.mozilla.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>freebsd-mozilla</link>">
-
<!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
<!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD 多媒体应用邮件列表</link>">
<!ENTITY a.multimedia.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
@@ -310,10 +314,18 @@
<!ENTITY a.newbus "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>FreeBSD new-bus 邮件列表</link>">
<!ENTITY a.newbus.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.newbus.url;'>freebsd-new-bus</link>">
+<!ENTITY a.numerics.url "&a.mailman.listinfo;/freebsd-numerics">
+<!ENTITY a.numerics "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.numerics.url;'>Discussions of high quality implementation of libm functions</link>">
+<!ENTITY a.numerics.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.numerics.url;'>freebsd-numerics</link>">
+
<!ENTITY a.office.url "&a.mailman.listinfo;/freebsd-office">
<!ENTITY a.office "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.office.url;'>FreeBSD 办公套件应用 邮件列表</link>">
<!ENTITY a.office.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.office.url;'>freebsd-office</link>">
+<!ENTITY a.ops-announce.url "&a.mailman.listinfo;/freebsd-ops-announce">
+<!ENTITY a.ops-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ops-announce.url;'>Project Infrastructure Announcements</link>">
+<!ENTITY a.ops-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ops-announce.url;'>freebsd-ops-announce</link>">
+
<!ENTITY a.performance.url "&a.mailman.listinfo;/freebsd-performance">
<!ENTITY a.performance "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>FreeBSD 性能邮件列表</link>">
<!ENTITY a.performance.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.performance.url;'>freebsd-performance</link>">
@@ -326,18 +338,26 @@
<!ENTITY a.pf "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>FreeBSD packet filter 邮件列表</link>">
<!ENTITY a.pf.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pf.url;'>freebsd-pf</link>">
+<!ENTITY a.pkg.url "&a.mailman.listinfo;/freebsd-pkg">
+<!ENTITY a.pkg "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg.url;'>二进制包管理和打包工具的邮件列表</link>">
+<!ENTITY a.pkg.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg.url;'>freebsd-pkg</link>">
+
+<!ENTITY a.pkg-fallout.url "&a.mailman.listinfo;/freebsd-pkg-fallout">
+<!ENTITY a.pkg-fallout "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg-fallout.url;'>Fallout logs from package building</link>">
+<!ENTITY a.pkg-fallout.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.pkg-fallout.url;'>freebsd-pkg-fallout</link>">
+
<!ENTITY a.platforms.url "&a.mailman.listinfo;/freebsd-platforms">
<!ENTITY a.platforms "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>FreeBSD 非 Intel 平台移植邮件列表</link>">
<!ENTITY a.platforms.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.platforms.url;'>freebsd-platforms</link>">
-<!ENTITY a.policy.url "&a.mailman.listinfo;/freebsd-policy">
-<!ENTITY a.policy "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>FreeBSD 核心团队政策讨论邮件列表</link>">
-<!ENTITY a.policy.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.policy.url;'>freebsd-policy</link>">
-
<!ENTITY a.ports.url "&a.mailman.listinfo;/freebsd-ports">
<!ENTITY a.ports "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>FreeBSD ports 邮件列表</link>">
<!ENTITY a.ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>freebsd-ports</link>">
+<!ENTITY a.ports-announce.url "&a.mailman.listinfo;/freebsd-ports-announce">
+<!ENTITY a.ports-announce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-announce.url;'>FreeBSD ports 公告的邮件列表</link>">
+<!ENTITY a.ports-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-announce.url;'>freebsd-ports-announce</link>">
+
<!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
<!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>FreeBSD ports bugs 邮件列表</link>">
<!ENTITY a.ports-bugs.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>freebsd-ports-bugs</link>">
@@ -392,6 +412,10 @@
<!ENTITY a.small "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>FreeBSD-small 邮件列表</link>">
<!ENTITY a.small.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.small.url;'>freebsd-small</link>">
+<!ENTITY a.snapshots.url "&a.mailman.listinfo;/freebsd-snapshots">
+<!ENTITY a.snapshots "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.snapshots.url;'>FreeBSD 的开发快照公告</link>">
+<!ENTITY a.snapshots.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.snapshots.url;'>freebsd-snapshots</link>">
+
<!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
<!ENTITY a.sparc "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>FreeBSD SPARC 移植邮件列表</link>">
<!ENTITY a.sparc.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sparc.url;'>freebsd-sparc64</link>">
@@ -414,6 +438,36 @@
<!ENTITY a.sun4v "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>FreeBSD sun4v 移植邮件列表</link>">
<!ENTITY a.sun4v.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sun4v.url;'>freebsd-sun4v</link>">
+
+
+<!ENTITY a.svn-doc-all.url "&a.mailman.listinfo;/svn-doc-all">
+<!ENTITY a.svn-doc-all "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-all.url;'>SVN commit messages for the entire doc tree (except for <quote> user</quote>, <quote>projects</quote> and <quote>translations</quote>)</link>">
+<!ENTITY a.svn-doc-all.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-all.url;'>svn-doc-all</link>">
+
+<!ENTITY a.svn-doc-head.url "&a.mailman.listinfo;/svn-doc-head">
+<!ENTITY a.svn-doc-head "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-head.url;'>SVN commit messages for the doc tree for head/</link>">
+<!ENTITY a.svn-doc-head.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-head.url;'>svn-doc-head</link>">
+
+<!ENTITY a.svn-doc-projects.url "&a.mailman.listinfo;/svn-doc-projects">
+<!ENTITY a.svn-doc-projects "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-projects.url;'>SVN commit messages for the doc <quote>projects</quote> tree</link>">
+<!ENTITY a.svn-doc-projects.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-projects.url;'>svn-doc-projects</link>">
+
+<!ENTITY a.svn-doc-svnadmin.url "&a.mailman.listinfo;/svn-doc-svnadmin">
+<!ENTITY a.svn-doc-svnadmin "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-svnadmin.url;'>SVN commit messages for the doc admin&nbsp;/ configuration tree</link>">
+<!ENTITY a.svn-doc-svnadmin.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-doc-svnadmin.url;'>svn-doc-svnadmin</link>">
+
+<!ENTITY a.svn-ports-all.url "&a.mailman.listinfo;/svn-ports-all">
+<!ENTITY a.svn-ports-all "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-all.url;'>SVN commit messages for the entire ports tree</link>">
+<!ENTITY a.svn-ports-all.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-all.url;'>svn-ports-all</link>">
+
+<!ENTITY a.svn-ports-head.url "&a.mailman.listinfo;/svn-ports-head">
+<!ENTITY a.svn-ports-head "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-head.url;'>SVN commit messages for the ports tree for head/</link>">
+<!ENTITY a.svn-ports-head.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-head.url;'>svn-ports-head</link>">
+
+<!ENTITY a.svn-ports-svnadmin.url "&a.mailman.listinfo;/svn-ports-svnadmin">
+<!ENTITY a.svn-ports-svnadmin "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-svnadmin.url;'>SVN commit messages for the ports admin&nbsp;/ configuration tree</link>">
+<!ENTITY a.svn-ports-svnadmin.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-ports-svnadmin.url;'>svn-ports-svnadmin</link>">
+
<!ENTITY a.svn-src-all.url "&a.mailman.listinfo;/svn-src-all">
<!ENTITY a.svn-src-all "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>SVN 整个 src 树的修订讯息 (除了 <quote>user</quote> 与 <quote>projects</quote>)</link>">
<!ENTITY a.svn-src-all.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-all.url;'>svn-src-all</link>">
@@ -454,6 +508,10 @@
<!ENTITY a.svn-src-stable-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>SVN commit messages for only the 9-stable src tree</link>">
<!ENTITY a.svn-src-stable-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
+<!ENTITY a.svn-src-stable-10.url "&a.mailman.listinfo;/svn-src-stable-10">
+<!ENTITY a.svn-src-stable-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>SVN commit messages for only the 10-stable src tree</link>">
+<!ENTITY a.svn-src-stable-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>svn-src-stable-10</link>">
+
<!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
<!ENTITY a.svn-src-stable-other "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>SVN src 树以往 stable 分支的修订讯息</link>">
<!ENTITY a.svn-src-stable-other.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>svn-src-stable-other</link>">
@@ -474,6 +532,10 @@
<!ENTITY a.sysinstall "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>Sysinstall 开发邮件列表</link>">
<!ENTITY a.sysinstall.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.sysinstall.url;'>freebsd-sysinstall</link>">
+<!ENTITY a.tcltk.url "&a.mailman.listinfo;/freebsd-tcltk">
+<!ENTITY a.tcltk "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tcltk.url;'>FreeBSD-specific Tcl/Tk discussions</link>">
+<!ENTITY a.tcltk.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tcltk.url;'>freebsd-tcltk</link>">
+
<!ENTITY a.test.url "&a.mailman.listinfo;/freebsd-test">
<!ENTITY a.test "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>FreeBSD 测试邮件列表</link>">
<!ENTITY a.test.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.test.url;'>freebsd-test</link>">
@@ -482,6 +544,10 @@
<!ENTITY a.testing "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>FreeBSD 性能和稳定性测试邮件列表</link>">
<!ENTITY a.testing.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.testing.url;'>freebsd-testing</link>">
+<!ENTITY a.tex.url "&a.mailman.listinfo;/freebsd-tex">
+<!ENTITY a.tex "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tex.url;'>Porting TeX and its applications to &os;</link>">
+<!ENTITY a.tex.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.tex.url;'>freebsd-tex</link>">
+
<!ENTITY a.threads.url "&a.mailman.listinfo;/freebsd-threads">
<!ENTITY a.threads "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>FreeBSD 线程邮件列表</link>">
<!ENTITY a.threads.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.threads.url;'>freebsd-threads</link>">
@@ -542,6 +608,10 @@
<!ENTITY a.xfce "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xfce.url;'>FreeBSD 有关 XFCE 的邮件列表</link>">
<!ENTITY a.xfce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.xfce.url;'>freebsd-xfce</link>">
+<!ENTITY a.zope.url "&a.mailman.listinfo;/freebsd-zope">
+<!ENTITY a.zope "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.zope.url;'>Zope for FreeBSD mailing list</link>">
+<!ENTITY a.zope.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.zope.url;'>freebsd-zope</link>">
+
<!-- Not really proper mailing lists -->
<!ENTITY a.bugfollowup "<email xmlns='http://docbook.org/ns/docbook'>bug-followup@FreeBSD.org</email>">
diff --git a/zh_CN.UTF-8/share/xml/mirrors-local.xsl b/zh_CN.UTF-8/share/xml/mirrors-local.xsl
index dfab305461..de2c5e4b96 100644
--- a/zh_CN.UTF-8/share/xml/mirrors-local.xsl
+++ b/zh_CN.UTF-8/share/xml/mirrors-local.xsl
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Original Revision: 1.3 -->
+<!-- Original Revision: r43258 -->
<!-- $FreeBSD$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -15,8 +15,8 @@
<xsl:template name="mirrors-docbook-contact">
<xsl:param name="email" value="'someone@somewhere'"/>
- <para>如有问题,请和负责相关子域服务器的管理员
- <email><xsl:value-of select="$email" /></email>联系。</para>
+ <para>如有问题, 请和负责相关子域服务器的管理员
+ <email><xsl:value-of select="$email" /></email> 联系。</para>
</xsl:template>
<!-- template: "mirrors-lastmodified" -->
diff --git a/zh_CN.UTF-8/share/xml/trademarks.ent b/zh_CN.UTF-8/share/xml/trademarks.ent
index e7508ffb6c..d2b9233347 100644
--- a/zh_CN.UTF-8/share/xml/trademarks.ent
+++ b/zh_CN.UTF-8/share/xml/trademarks.ent
@@ -9,15 +9,16 @@
Please keep this file sorted.
- Original revision: 1.48
+ Original revision: r43258
$FreeBSD$
-->
-<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com 和 HomeConnect 是 3Com Corporation 的注册商标。</para>">
-<!-- An SGML entity can't start with a number... -->
+<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com 和 HomeConnect 是
+ 3Com Corporation 的注册商标。</para>">
+<!-- An XML entity can't start with a number... -->
<!ENTITY tm.3com "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>3Com</trademark>">
-<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware 和 Escalade 是 3ware Inc 的注册商标。</para>">
+<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware 是 3ware Inc 的注册商标。</para>">
<!ENTITY tm.3ware "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>3ware</trademark>">
<!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
@@ -25,19 +26,24 @@
Adaptec, Inc. 的注册商标。</para>">
<!ENTITY adaptec "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Adaptec</trademark>">
-<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader, 以及
+<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe、 Acrobat、 Acrobat Reader、 Flash, 以及
PostScript 是 Adobe
Systems Incorporated 在美国和/或其他国家的商标或注册商标。</para>">
<!ENTITY acrobat "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Acrobat</trademark>">
-<!ENTITY acrobat.reader "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Acrobat Reader</trademark>">
+<!ENTITY acrobat.reader "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Acrobat&nbsp;Reader</trademark>">
<!ENTITY adobe "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Adobe</trademark>">
+<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Flash</trademark>">
<!ENTITY postscript "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PostScript</trademark>">
<!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
<!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>AMD, AMD Athlon,
AMD Opteron, Athlon, &Eacute;lan, Opteron, 和 PCnet 是
- Advanced Micro Devices, Inc. 的商标。</para>">
-<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Athlon</trademark>">
+ Advanced Micro Devices, Inc. 的商标。</para>">
+<!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am486</trademark>">
+<!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am5x86</trademark>">
+<!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Athlon</trademark>">
+<!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Duron</trademark>">
+<!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD-K6</trademark>">
<!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD&nbsp;Opteron</trademark>">
<!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
<!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>&Eacute;lan</trademark>">
@@ -52,7 +58,7 @@
<!ENTITY imac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iMac</trademark>">
<!ENTITY mac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac</trademark>">
<!ENTITY macintosh "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Macintosh</trademark>">
-<!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac OS</trademark>">
+<!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac&nbsp;OS</trademark>">
<!ENTITY quicktime "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Quicktime</trademark>">
<!ENTITY truetype "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>TrueType</trademark>">
@@ -70,8 +76,8 @@
<!ENTITY etherchannel "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EtherChannel</trademark>">
<!ENTITY ios "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>IOS</trademark>">
-<!ENTITY tm-attrib.corel "<para xmlns='http://docbook.org/ns/docbook'>Corel 和 WordPerfect 是 Corel Corporation 和/或其子公司
- 在加拿大、美国和/或其他国家的注册商标。</para>">
+<!ENTITY tm-attrib.corel "<para xmlns='http://docbook.org/ns/docbook'>Corel 和 WordPerfect 是
+ Corel Corporation 和/或其子公司 在加拿大、美国和/或其他国家的注册商标。</para>">
<!ENTITY wordperfect "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>WordPerfect</trademark>">
<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
@@ -89,13 +95,24 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY tm-attrib.cvsup "<para xmlns='http://docbook.org/ns/docbook'>CVSup 是
John D. Polstra 的注册商标。</para>">
+<!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
+<!ENTITY dell "<trademark xmlns='http://docbook.org/ns/docbook'>Dell</trademark>">
+<!ENTITY poweredge "<trademark xmlns='http://docbook.org/ns/docbook'>PowerEdge</trademark>">
+
<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
<!ENTITY epson.perfection "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>EPSON
Perfection</trademark>">
-<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD 是 FreeBSD基金会的注册商标</para>">
+<!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD 是 FreeBSD 基金会的注册商标</para>">
+<!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
+<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>Fujitsu, the Fujitsu logo, LifeBook,
+ Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
+ ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
+ SystemWalker, and Interstage are trademarks or registered trademarks
+ of Fujitsu Limited in the United States and other countries.</para>">
<!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">
+<!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PRIMEPOWER</trademark>">
<!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
<!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg、 Helvetica、
@@ -157,6 +174,8 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY megaraid "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>MegaRAID</trademark>">
<!ENTITY mylex "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mylex</trademark>">
+<!-- These two are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!ENTITY tm-attrib.macromedia "<para xmlns='http://docbook.org/ns/docbook'>Macromedia, Flash, 以及 Shockwave
Macromedia, Inc. 在美国和/或其他国家的商标或注册商标。</para>">
<!ENTITY flash "<trademark xmlns='http://docbook.org/ns/docbook'>Flash</trademark>">
@@ -167,7 +186,7 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
在美国和/或其他国家的商标或注册商标。</para>">
<!ENTITY intellimouse "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>IntelliMouse</trademark>">
<!ENTITY microsoft "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Microsoft</trademark>">
-<!ENTITY microsoft.windows "&microsoft; &windows;">
+<!ENTITY microsoft.windows "&microsoft;&nbsp;&windows;">
<!ENTITY ms-dos "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>MS-DOS</trademark>">
<!ENTITY outlook "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Outlook</trademark>">
<!ENTITY windows "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Windows</trademark>">
@@ -196,6 +215,8 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY netscape "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Netscape</trademark>">
<!ENTITY netscape.navigator "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Netscape Navigator</trademark>">
+<!-- These two are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!-- http://www.nexthop.com/legal.shtml -->
<!ENTITY tm-attrib.nexthop "<para xmlns='http://docbook.org/ns/docbook'>GateD 和 NextHop 是 NextHop 在美国和其他国家的商标或注册商标。</para>">
<!ENTITY gated "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>GateD</trademark>">
@@ -232,12 +253,13 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY tm-attrib.redhat "<para xmlns='http://docbook.org/ns/docbook'>Red Hat, RPM, 是 Red Hat, Inc.
在美国和其他国家的注册商标。</para>">
-
+<!-- These four are no longer used in the en_US documentation, but need
+ leaving until translations stop using them -->
<!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>SAP, R/3, 和 mySAP 是 SAP AG
在德国以及许多其他国家的商标或注册商标。</para>">
<!ENTITY r3 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>R/3</trademark>">
<!ENTITY sap "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>SAP</trademark>">
-<!ENTITY sap.r3 "&sap; &r3;">
+<!ENTITY sap.r3 "&sap;&nbsp;&r3;">
<!ENTITY tm-attrib.sgi "<para xmlns='http://docbook.org/ns/docbook'>Silicon Graphics, SGI, 和 OpenGL 是 Silicon Graphics, Inc.
在美国和/或其他国家的注册商标。</para>">
@@ -269,8 +291,13 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY netra "<trademark xmlns='http://docbook.org/ns/docbook'>Netra</trademark>">
<!ENTITY openjdk "<trademark xmlns='http://docbook.org/ns/docbook'>OpenJDK</trademark>">
<!ENTITY solaris "<trademark xmlns='http://docbook.org/ns/docbook'>Solaris</trademark>">
+<!ENTITY sparcengine "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>SPARCEngine</trademark>">
<!ENTITY staroffice "<trademark xmlns='http://docbook.org/ns/docbook'>StarOffice</trademark>">
<!ENTITY sun "<trademark xmlns='http://docbook.org/ns/docbook'>Sun</trademark>">
+<!ENTITY sun.blade "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Blade</trademark>">
+<!ENTITY sun.enterprise "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Enterprise</trademark>">
+<!ENTITY sun.fire "<trademark xmlns='http://docbook.org/ns/docbook'>Sun&nbsp;Fire</trademark>">
+<!ENTITY sun.ultra "Sun&nbsp;<trademark xmlns='http://docbook.org/ns/docbook'>Ultra</trademark>">
<!ENTITY sunos "<trademark xmlns='http://docbook.org/ns/docbook'>SunOS</trademark>">
<!ENTITY virtualbox "<trademark xmlns='http://docbook.org/ns/docbook'>VirtualBox</trademark>">
@@ -315,25 +342,27 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!ENTITY tm-attrib.xiph "<para xmlns='http://docbook.org/ns/docbook'>Ogg Vorbis 和 Xiph.Org 是 Xiph.Org 的商标。</para>">
<!ENTITY tm-attrib.general "<para xmlns='http://docbook.org/ns/docbook'>许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
- 本文档中出现的, 为 FreeBSD Project 所知晓的商标,后面将以 '&trade;' 或 '&reg;' 符号来标注。</para>">
+ 本文档中出现的, 为 FreeBSD Project 所知晓的商标,后面将以 <quote>&trade;</quote> 或
+ <quote>&reg;</quote> 符号来标注。</para>">
-<!ENTITY legalnotice "
-<legalnotice xmlns='http://docbook.org/ns/docbook' xml:id='legalnotice'>
+<!ENTITY legalnotice '
+<legalnotice xmlns="http://docbook.org/ns/docbook" xml:id="legalnotice">
+ <title>版权声明</title>
<important><para><emphasis>本文中许可证的非官方中文翻译仅供参考,
不作为判定任何责任的依据。如与英文原文有出入,则以英文原文为准。</emphasis></para></important>
<para>在满足下列许可条件的前提下, 允许再分发或以源代码 (SGML DocBook) 或 “编译”
- (SGML, HTML, PDF, PostScript, RTF 等) 的经过修改或未修改的形式:</para>
+ (XML、 HTML、 PDF、 PostScript、 RTF 等) 的经过修改或未修改的形式:</para>
<orderedlist>
<listitem>
- <para>再分发源代码 (SGML DocBook) 必须不加修改的保留上述版权告示、
+ <para>再分发源代码 (XML DocBook) 必须不加修改的保留上述版权告示、
本条件清单和下述弃权书作为该文件的最先若干行。</para>
</listitem>
<listitem>
- <para>再分发编译的形式 (转换为其它DTD、 PDF、 PostScript、 RTF 或其它形式),
+ <para>再分发编译的形式 (转换为其它 DTD、 PDF、 PostScript、 RTF 或其它形式),
必须将上述版权告示、本条件清单和下述弃权书复制到与分发品一同提供的文件,
以及其它材料中。</para>
</listitem>
@@ -350,14 +379,14 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
严格责任或是民事侵权行为(包括疏忽或其它)中的, 即使已被告知发生该损失的可能性。</para>
</important>
- <para>Redistribution and use in source (SGML DocBook) and &quot;compiled&quot;
- forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
+ <para>Redistribution and use in source (XML DocBook) and &apos;compiled&apos;
+ forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without
modification, are permitted provided that the following conditions are
met:</para>
<orderedlist>
<listitem>
- <para>Redistributions of source code (SGML DocBook) must retain the
+ <para>Redistributions of source code (XML DocBook) must retain the
above copyright notice, this list of conditions and the following
disclaimer as the first lines of this file unmodified.</para>
</listitem>
@@ -373,7 +402,7 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<important>
<para>THIS DOCUMENTATION IS PROVIDED BY THE FREEBSD DOCUMENTATION
- PROJECT &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ PROJECT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE FREEBSD DOCUMENTATION PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT,
@@ -390,87 +419,87 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
PostScript&reg; 和 PDF 格式文件中内嵌的中文字体,由文鼎科技开发股份有限公司按
《文鼎公众授权书》授权提供。</emphasis></para></important>
-<para xmlns='http://docbook.org/ns/docbook'>文鼎公众授权书</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>版权所有(C) 1999 文鼎科技开发股份有限公司</para>
-<para xmlns='http://docbook.org/ns/docbook'>台湾110台北市永吉路168号11楼</para>
-<para xmlns='http://docbook.org/ns/docbook'>除以下规定外,保留所有权利。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>任何人均可以复制及分发本授权书原始文件的复本,但禁止修改之。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>前言</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  绝大多数软件的授权书是用来剥夺您共享和修改软件的自由。相反,
+<para xmlns="http://docbook.org/ns/docbook">文鼎公众授权书</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">版权所有(C) 1999 文鼎科技开发股份有限公司</para>
+<para xmlns="http://docbook.org/ns/docbook">台湾110台北市永吉路168号11楼</para>
+<para xmlns="http://docbook.org/ns/docbook">除以下规定外,保留所有权利。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">任何人均可以复制及分发本授权书原始文件的复本,但禁止修改之。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">前言</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  绝大多数软件的授权书是用来剥夺您共享和修改软件的自由。相反,
如果您将我们所授与您的一切权利授与您的接受者,
并且确保他们能得到本软件的修改物,
文鼎公众授权书特别许可并鼓励您使用本软件。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>法律性条款</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>0. 定义</para>
-<para xmlns='http://docbook.org/ns/docbook'>  本授权书中,「字型」是指「文鼎PL细上海宋」、「文鼎PL中楷」(BIG-5码)
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">法律性条款</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">0. 定义</para>
+<para xmlns="http://docbook.org/ns/docbook">  本授权书中,「字型」是指「文鼎PL细上海宋」、「文鼎PL中楷」(BIG-5码)
和「文鼎PL简报宋」、「文鼎PL简中楷」(GB码)等TrueType字型,
以及经修改而产生的该等字型的衍生物, 包括修改字型样式、 更动编码顺序、
转换格式、 变更字型名称,
或者在 glyph table 中增减一些文字。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  「PL」是指「Public License」(公众授权)。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  「版权人」是指在字型版权声明中被称为版权所有者之人。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  「您」是指被授权者或复制、再散布、修改字型的人。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  「自由使用」是指您在所接受的相同条件下, 有复制、
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  「PL」是指「Public License」(公众授权)。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  「版权人」是指在字型版权声明中被称为版权所有者之人。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  「您」是指被授权者或复制、再散布、修改字型的人。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  「自由使用」是指您在所接受的相同条件下, 有复制、
修改字型及散布字型复制品的自由,
而非指价格。 如果您愿意, 可以对此项服务收取费用。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>1. 复制及分发</para>
-<para xmlns='http://docbook.org/ns/docbook'>  如果在所有复制品维持本授权书文件(ARPHICPL.TXT)不变,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">1. 复制及分发</para>
+<para xmlns="http://docbook.org/ns/docbook">  如果在所有复制品维持本授权书文件(ARPHICPL.TXT)不变,
您可以在任何媒体无限制复制及分发本字型之复制品。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>2. 修改</para>
-<para xmlns='http://docbook.org/ns/docbook'>  如果满足以下条件, 您可以用任何方式修改本字型的复制品, 包括修改字型样式、
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">2. 修改</para>
+<para xmlns="http://docbook.org/ns/docbook">  如果满足以下条件, 您可以用任何方式修改本字型的复制品, 包括修改字型样式、
更换编码顺序、 转换格式、 变更字型名称, 或者在 glyph table 中增减一些文字,
并且依据上述第一条的规定复制及分发该修改物。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'> a)您必须在每个修改过的文件中插入明显的声明, 表示您如何及何时修改了该文件。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'> b)您必须允许所有第三方在本授权书条款下, 得以「自由使用」该修改物的全部,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook"> a)您必须在每个修改过的文件中插入明显的声明, 表示您如何及何时修改了该文件。</para>
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook"> b)您必须允许所有第三方在本授权书条款下, 得以「自由使用」该修改物的全部,
例如通过提供指定地点的复制路径,或在通常作为软件交换的媒体上发布该修改物。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'> c)如果修改过的字型在执行时以交谈方式读取命令,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook"> c)如果修改过的字型在执行时以交谈方式读取命令,
您必须使它在开始进入一般的交谈使用方式时打印或显示声明,
包括适当的版权声明、 无担保声明 (或者其他您提供担保的声明),
以及使用者可以依据这些条件再分发本字型的声明,
并且告知使用者如何看到本授权书的复本。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  这些要求适用于整个修改过的作品。 如果作品的可辨识部分并非衍生自本字型,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  这些要求适用于整个修改过的作品。 如果作品的可辨识部分并非衍生自本字型,
且可以合理地认其为独立而个别的作品, 则当您将它当作个别作品分发时,
本授权书及其条款将不适用于该部分。 因此,
仅将非基于本字型之其他作品和本字型一起放入贮存或分发媒体的同一卷上,
并不会使该其他作品纳入本授权书的适用范围。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>3. 解除条件</para>
-<para xmlns='http://docbook.org/ns/docbook'>  除非依照本授权书的规定, 否则您不能复制、 修改、 再授权或分发本字型。
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">3. 解除条件</para>
+<para xmlns="http://docbook.org/ns/docbook">  除非依照本授权书的规定, 否则您不能复制、 修改、 再授权或分发本字型。
任何用其他方式复制、 修改、 再授权或分发本字型的意图,
将使本授权书所授与您的权利自动失效。 不过,
从您那依据本授权书取得复制品和权利的人,
只要他们完全遵行条款,其权利将维持有效。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>4. 同意</para>
-<para xmlns='http://docbook.org/ns/docbook'>  因您未签订本授权书, 所以没必要遵行它。 然而,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">4. 同意</para>
+<para xmlns="http://docbook.org/ns/docbook">  因您未签订本授权书, 所以没必要遵行它。 然而,
没有任何其他文件授与您复制、 修改、 再授权或分发本字型之权利,
如果您不同意本授权书, 这些行为是法律所禁止的。
因此一旦复制、 修改、 再授权或分发本字型,
就表示您接受本授权书及其一切条款和条件。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>5. 自动取得授权</para>
-<para xmlns='http://docbook.org/ns/docbook'>  每当您再散布本字型时, 收受者便自动从原始授权者处取得依据这些条款和条件复制、
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">5. 自动取得授权</para>
+<para xmlns="http://docbook.org/ns/docbook">  每当您再散布本字型时, 收受者便自动从原始授权者处取得依据这些条款和条件复制、
分发或修改本字型的授权。 您不可对在此所授与收受者之权利实行强加其他限制,
您也没有使第三方遵行本授权书的义务。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>6. 抵触</para>
-<para xmlns='http://docbook.org/ns/docbook'>  若因法院判决、 违反专利宣称或任何其他原因(不限于专利纠纷)的结果,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">6. 抵触</para>
+<para xmlns="http://docbook.org/ns/docbook">  若因法院判决、 违反专利宣称或任何其他原因(不限于专利纠纷)的结果,
使强加于您的条件(不论是法院命令、协议或其他)和授权书的条件有所冲突时,
也不能让您违背授权书的条件。
如果您不能同时满足本授权书所定的义务及其他相关义务来分发时,
@@ -478,32 +507,35 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
如果专利授权不许所有直接或间接从您那里取得复制品者,
在免授权费的情况下再分发本字型时,
唯一能同时满足双方要求的方法是完全避免分发本字型。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>  如果本条款之任何部分在特定情况下无效或无法实施, 条款的其他部分将继续适用,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">  如果本条款之任何部分在特定情况下无效或无法实施, 条款的其他部分将继续适用,
并作为整体适用于其他情况。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>7. 无担保</para>
-<para xmlns='http://docbook.org/ns/docbook'>  由于本字型是免费授权, 在法律允许的范围内, 本字型将不附带任何担保。
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">7. 无担保</para>
+<para xmlns="http://docbook.org/ns/docbook">  由于本字型是免费授权, 在法律允许的范围内, 本字型将不附带任何担保。
除非另有书面说明, 版权人或其他提供本字型者「同样」不提供任何种类的担保,
不论是明示还是暗示, 包括但不限于销售性和适于特定目的的暗示担保。
有关本字型品质和执行的一切危险均由您承担。 如果本字型出现瑕疵,
您应承担一切所需服务、修复和改正的费用。</para>
-<para xmlns='http://docbook.org/ns/docbook'></para>
-<para xmlns='http://docbook.org/ns/docbook'>8. 损害赔偿请求权的放弃</para>
-<para xmlns='http://docbook.org/ns/docbook'>  除非法律规定或以书面形式同意, 在任何情况下,
+<para xmlns="http://docbook.org/ns/docbook"></para>
+<para xmlns="http://docbook.org/ns/docbook">8. 损害赔偿请求权的放弃</para>
+<para xmlns="http://docbook.org/ns/docbook">  除非法律规定或以书面形式同意, 在任何情况下,
任何版权人或以上被允许得以复制、 修改或再分发本字型者,
均不对您因使用或不能使用本字型(包括但不限于替代商品或服务的采购;
使用、 数据或利益之损失; 或者营业妨碍) 所引致的任何直接、 间接、 必然、
偶然、 特殊或惩罚性损失负责, 即使版权人或其他人已知该损失的可能性时亦不例外。</para>
</legalnotice>
-">
+'>
-<!ENTITY trademarks "
-<legalnotice xmlns='http://docbook.org/ns/docbook' xml:id='trademarks' role='trademarks'>
+<!-- This is no longer used in the en_US documentation, but needs
+ leaving until translations stop using it -->
+<!ENTITY trademarks '
+<legalnotice xmlns="http://docbook.org/ns/docbook" xml:id="trademarks" role="trademarks">
+ <title>法律声明</title>
- <para>FreeBSD是FreeBSD基金会的注册商标。</para>
+ <para>FreeBSD 是 XFreeBSD 基金会的注册商标。</para>
- <para>UNIX是Open Group在美国和其它国家的注册商标。</para>
+ <para>UNIX 是 Open Group 在美国和其它国家的注册商标。</para>
<para>Sun, Sun Microsystems, SunOS, Solaris,
Java, JDK, 以及 OpenJDK 是 Sun Microsystems, Inc.
@@ -527,4 +559,4 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
&reg; 符号来标注。</para>
</legalnotice>
-">
+'>
diff --git a/zh_CN.UTF-8/share/xml/transtable.xml b/zh_CN.UTF-8/share/xml/transtable.xml
index dab4cd75bc..ffa53717de 100644
--- a/zh_CN.UTF-8/share/xml/transtable.xml
+++ b/zh_CN.UTF-8/share/xml/transtable.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Original Revision: 1.2 -->
+<!-- Original Revision: r43258 -->
<!-- $FreeBSD$ -->
<!--
@@ -38,6 +38,11 @@
</word>
<word>
+ <orig>Armenia</orig>
+ <tran>亚美尼亚</tran>
+ </word>
+
+ <word>
<orig>Australia</orig>
<tran>澳大利亚</tran>
</word>