aboutsummaryrefslogtreecommitdiff
path: root/zh_CN.UTF-8/share/xml
diff options
context:
space:
mode:
authorGuangyuan Yang <ygy@FreeBSD.org>2020-01-15 00:25:26 +0000
committerGuangyuan Yang <ygy@FreeBSD.org>2020-01-15 00:25:26 +0000
commit3167944e28b6f8190f8535b9ee58062b45ae557d (patch)
tree8f8d37251a095af43a2aac984a4f0d2cdcafbf47 /zh_CN.UTF-8/share/xml
parent56b954270d6b8c18375a63c4a751e8175bac5def (diff)
downloaddoc-3167944e28b6f8190f8535b9ee58062b45ae557d.tar.gz
doc-3167944e28b6f8190f8535b9ee58062b45ae557d.zip
Merge from the English version.
MFen: r51826 -> r52500
Notes
Notes: svn path=/head/; revision=53779
Diffstat (limited to 'zh_CN.UTF-8/share/xml')
-rw-r--r--zh_CN.UTF-8/share/xml/trademarks.ent7
1 files changed, 6 insertions, 1 deletions
diff --git a/zh_CN.UTF-8/share/xml/trademarks.ent b/zh_CN.UTF-8/share/xml/trademarks.ent
index 5c1f6d9893..81ee03e405 100644
--- a/zh_CN.UTF-8/share/xml/trademarks.ent
+++ b/zh_CN.UTF-8/share/xml/trademarks.ent
@@ -10,7 +10,7 @@
Please keep this file sorted.
$FreeBSD$
- Original revision: r51826
+ Original revision: r52500
-->
<!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com 和 HomeConnect 是
@@ -361,6 +361,11 @@ Coverity Extend, Coverity Prevent 和 Coverity Prevent SQS 是 Coverity 公司
<!-- http://www.xiph.org/ -->
<!ENTITY tm-attrib.xiph "<para xmlns='http://docbook.org/ns/docbook'>Ogg Vorbis 和 Xiph.Org 是 Xiph.Org 的商标。</para>">
+<!-- used in the X11 chapter of the Handbook -->
+<!ENTITY amdgpu "AMD KMS 驱动程序">
+<!ENTITY i915kms "Intel KMS 驱动程序">
+<!ENTITY radeonkms "Radeon KMS 驱动程序">
+
<!ENTITY tm-attrib.general "<para xmlns='http://docbook.org/ns/docbook'>许多制造商和经销商使用一些称为商标的图案或文字设计来彰显自己的产品。
本文档中出现的, 为 FreeBSD Project 所知晓的商标,后面将以 <quote>&trade;</quote> 或
<quote>&reg;</quote> 符号来标注。</para>">