From owner-svn-doc-all@freebsd.org Sun Jun 24 05:32:10 2018 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AA5C1018ED4; Sun, 24 Jun 2018 05:32:10 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06FE87A692; Sun, 24 Jun 2018 05:32:10 +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 DC7F41A7B6; Sun, 24 Jun 2018 05:32:09 +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 w5O5W9uD098069; Sun, 24 Jun 2018 05:32:09 GMT (envelope-from ygy@FreeBSD.org) Received: (from ygy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5O5W92N098068; Sun, 24 Jun 2018 05:32:09 GMT (envelope-from ygy@FreeBSD.org) Message-Id: <201806240532.w5O5W92N098068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ygy set sender to ygy@FreeBSD.org using -f From: Guangyuan Yang Date: Sun, 24 Jun 2018 05:32:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51906 - 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: 51906 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.26 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: Sun, 24 Jun 2018 05:32:10 -0000 Author: ygy Date: Sun Jun 24 05:32:09 2018 New Revision: 51906 URL: https://svnweb.freebsd.org/changeset/doc/51906 Log: Update trademark entities from the English version. MFen: r43258 -> r51826 Reviewed by: loader (mentor) Approved by: loader (mentor) Differential Revision: https://reviews.freebsd.org/D15969 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 Sat Jun 23 15:31:48 2018 (r51905) +++ head/zh_CN.UTF-8/share/xml/trademarks.ent Sun Jun 24 05:32:09 2018 (r51906) @@ -9,8 +9,8 @@ Please keep this file sorted. - Original revision: r43258 $FreeBSD$ + Original revision: r51826 --> 3Com 和 HomeConnect 是 @@ -37,25 +37,33 @@ AMD, AMD Athlon, - AMD Opteron, Athlon, Élan, Opteron, 和 PCnet 是 + AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, Élan, Opteron, 和 PCnet 是 Advanced Micro Devices, Inc. 的商标。"> +AMD"> Am486"> Am5x86"> AMD Athlon"> AMD Duron"> AMD-K6"> AMD Opteron"> +AMD Phenom"> +AMD Sempron"> +AMD Turion"> Athlon"> Élan"> Opteron"> -Apple, AirPort, FireWire, Mac, Macintosh, Mac OS, - Quicktime, 以及 TrueType 是 Apple Computer, Inc. 在美国以及其他国家的注册商标。"> +Apple, AirPort, FireWire, + iMac, iPhone, iPad, + Mac, Macintosh, Mac OS, + Quicktime, 以及 TrueType 是 Apple Inc. 在美国以及其他国家的注册商标。"> AirPort"> -Apple"> +Apple"> FireWire"> iMac"> +iPad"> +iPhone"> Mac"> Macintosh"> Mac OS"> @@ -106,14 +114,19 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve FreeBSD 是 FreeBSD 基金会的注册商标"> -Fujitsu, the Fujitsu logo, LifeBook, +Fujitsu, Fujitsu 商标, 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."> + SystemWalker, 以及 Interstage 是 Fujitsu Limited + 在美国和其他国家的商标或注册商标。"> Fujitsu"> PRIMEPOWER"> + +Android + 是 Google Inc 的注册商标。"> +Android"> + Heidelberg、 Helvetica、 Palatino 以及 Times Roman 是 Heidelberger Druckmaschinen AG @@ -124,6 +137,7 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve 是国际商用机器公司在美国和其他国家的注册商标或商标。"> AIX"> OS/2"> +POWER"> PowerPC"> PS/2"> S/390"> @@ -135,10 +149,12 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve POSIX"> -Intel, Celeron, EtherExpress, i386, +Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation 及其分支机构在美国和其他国家的商标或注册商标。"> Celeron"> +Centrino"> +Core"> EtherExpress"> i386"> i486"> @@ -146,7 +162,6 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve Itanium"> Pentium"> Xeon"> -Core"> Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美国和其他国家的商标或注册商标。"> @@ -252,6 +267,11 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve Red Hat, RPM, 是 Red Hat, Inc. 在美国和其他国家的注册商标。"> + + +“RISC-V” 商标名是 RISC-V + 基金会正在注册的注册商标。"> +RISC-V">