From owner-svn-doc-all@freebsd.org Thu Nov 26 06:07:04 2020 Return-Path: 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 ACA334A268E; Thu, 26 Nov 2020 06:07:04 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4ChS2c4bXWz3GBg; Thu, 26 Nov 2020 06:07:04 +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 8C3A41E81E; Thu, 26 Nov 2020 06:07:04 +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 0AQ674Bd085370; Thu, 26 Nov 2020 06:07:04 GMT (envelope-from ygy@FreeBSD.org) Received: (from ygy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AQ674Aa085369; Thu, 26 Nov 2020 06:07:04 GMT (envelope-from ygy@FreeBSD.org) Message-Id: <202011260607.0AQ674Aa085369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ygy set sender to ygy@FreeBSD.org using -f From: Guangyuan Yang Date: Thu, 26 Nov 2020 06:07:04 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r54715 - head/zh_CN.UTF-8/htdocs/copyright X-SVN-Group: doc-head X-SVN-Commit-Author: ygy X-SVN-Commit-Paths: head/zh_CN.UTF-8/htdocs/copyright X-SVN-Commit-Revision: 54715 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.34 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 06:07:04 -0000 Author: ygy Date: Thu Nov 26 06:07:04 2020 New Revision: 54715 URL: https://svnweb.freebsd.org/changeset/doc/54715 Log: Merge from the English version. MFen: 1.17 -> r51230 Modified: head/zh_CN.UTF-8/htdocs/copyright/trademarks.xml Modified: head/zh_CN.UTF-8/htdocs/copyright/trademarks.xml ============================================================================== --- head/zh_CN.UTF-8/htdocs/copyright/trademarks.xml Wed Nov 25 20:27:33 2020 (r54714) +++ head/zh_CN.UTF-8/htdocs/copyright/trademarks.xml Thu Nov 26 06:07:04 2020 (r54715) @@ -4,7 +4,7 @@ ]> - + &title; @@ -20,8 +20,8 @@

请参见 FreeBSD 基金会 商标使用许可条件 - 网页了解关于使用 FreeBSD 标志的进一步详情。

+ href="https://www.freebsdfoundation.org/legal/trademark-usage-terms-and-conditions/">商标使用许可条件 + 网页了解关于使用 FreeBSD 标志的详情。

Adobe, Acrobat, Acrobat Reader, 以及 PostScript 是 Adobe Systems Incorporated 在 美国和/或其他国家的注册商标或商标。

@@ -59,8 +59,6 @@

Sun, Sun Microsystems, SunOS, Solaris, 以及 Java 是 Sun Microsystems, Inc. 在美国和/或其他国家的商标或注册商标。

- -

XFree86 是 The XFree86 Project, Inc. 的商标。

许多制造商和经销商使用一些成为商标的图案或文字设计来彰显自己的产品。 本网站中出现的， 为 FreeBSD Project 所承认的商标后面将以