From owner-svn-doc-all@freebsd.org  Wed Jan 15 00:25:27 2020
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 58ADA1F9766;
 Wed, 15 Jan 2020 00:25:27 +0000 (UTC) (envelope-from ygy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47y7QH1RpWz3K9m;
 Wed, 15 Jan 2020 00:25:27 +0000 (UTC) (envelope-from ygy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CD9A25FCC;
 Wed, 15 Jan 2020 00:25:27 +0000 (UTC) (envelope-from ygy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00F0PRvJ007724;
 Wed, 15 Jan 2020 00:25:27 GMT (envelope-from ygy@FreeBSD.org)
Received: (from ygy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00F0PR7U007723;
 Wed, 15 Jan 2020 00:25:27 GMT (envelope-from ygy@FreeBSD.org)
Message-Id: <202001150025.00F0PR7U007723@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ygy set sender to ygy@FreeBSD.org
 using -f
From: Guangyuan Yang <ygy@FreeBSD.org>
Date: Wed, 15 Jan 2020 00:25:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r53779 - head/zh_CN.UTF-8/share/xml
X-SVN-Group: doc-head
X-SVN-Commit-Author: ygy
X-SVN-Commit-Paths: head/zh_CN.UTF-8/share/xml
X-SVN-Commit-Revision: 53779
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2020 00:25:27 -0000

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> 或