svn commit: r53779 - head/zh_CN.UTF-8/share/xml

Author: ygy
Date: Wed Jan 15 00:25:26 2020
New Revision: 53779
URL: https://svnweb.freebsd.org/changeset/doc/53779

Log:
  Merge from the English version.
  
  MFen:	r51826 -> r52500

Modified:
  head/zh_CN.UTF-8/share/xml/trademarks.ent

Modified: head/zh_CN.UTF-8/share/xml/trademarks.ent
==============================================================================
--- head/zh_CN.UTF-8/share/xml/trademarks.ent	Tue Jan 14 20:15:08 2020	(r53778)
+++ head/zh_CN.UTF-8/share/xml/trademarks.ent	Wed Jan 15 00:25:26 2020	(r53779)
@@ -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 是
@@ -360,6 +360,11 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
 
 <!-- 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> 或
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"