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

Guangyuan Yang ygy at FreeBSD.org
Sun Jun 24 05:32:10 UTC 2018 

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
 -->
 
 <!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com 和 HomeConnect 是
@@ -37,25 +37,33 @@
 
 <!-- http://www.amd.com/us-en/Trademarkinformation/0,,1435_1442,00.html -->
 <!ENTITY tm-attrib.amd "<para xmlns='http://docbook.org/ns/docbook'>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. 的商标。</para>">
+<!ENTITY amd "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD</trademark>">
 <!ENTITY am486 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am486</trademark>">
 <!ENTITY am5x86 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Am5x86</trademark>">
 <!ENTITY amd.athlon "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Athlon</trademark>">
 <!ENTITY amd.duron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Duron</trademark>">
 <!ENTITY amd.k6 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AMD-K6</trademark>">
 <!ENTITY amd.opteron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Opteron</trademark>">
+<!ENTITY amd.phenom "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Phenom</trademark>">
+<!ENTITY amd.sempron "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Sempron</trademark>">
+<!ENTITY amd.turion "<trademark xmlns='http://docbook.org/ns/docbook'>AMD Turion</trademark>">
 <!ENTITY athlon "<trademark xmlns='http://docbook.org/ns/docbook'>Athlon</trademark>">
 <!ENTITY elan "<trademark xmlns='http://docbook.org/ns/docbook'>Élan</trademark>">
 <!ENTITY opteron "<trademark xmlns='http://docbook.org/ns/docbook'>Opteron</trademark>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
-<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire, Mac, Macintosh, Mac OS,
-  Quicktime, 以及 TrueType 是 Apple Computer, Inc. 在美国以及其他国家的注册商标。</para>">
+<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire,
+  iMac, iPhone, iPad,
+  Mac, Macintosh, Mac OS,
+  Quicktime, 以及 TrueType 是 Apple Inc. 在美国以及其他国家的注册商标。</para>">
 <!ENTITY airport "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AirPort</trademark>">
-<!ENTITY apple "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Apple</trademark>">
+<!ENTITY apple 67	 	 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Apple</trademark>">
 <!ENTITY firewire "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>FireWire</trademark>">
 <!ENTITY imac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iMac</trademark>">
+<!ENTITY ipad "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iPad</trademark>">
+<!ENTITY iphone "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>iPhone</trademark>">
 <!ENTITY mac "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac</trademark>">
 <!ENTITY macintosh "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Macintosh</trademark>">
 <!ENTITY macos "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Mac OS</trademark>">
@@ -106,14 +114,19 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD 是 FreeBSD 基金会的注册商标</para>">
 
 <!-- http://www.fpc.fujitsu.com/www/content/legal_resources/trademarks.php -->
-<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>Fujitsu, the Fujitsu logo, LifeBook,
+<!ENTITY tm-attrib.fujitsu "<para xmlns='http://docbook.org/ns/docbook'>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.</para>">
+  SystemWalker, 以及 Interstage 是 Fujitsu Limited
+  在美国和其他国家的商标或注册商标。</para>">
 <!ENTITY fujitsu "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Fujitsu</trademark>">
 <!ENTITY primepower "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PRIMEPOWER</trademark>">
 
+<!-- http://www.google.com/permissions/trademark/our-trademarks.html -->
+<!ENTITY tm-attrib.google "<para xmlns='http://docbook.org/ns/docbook'>Android
+  是 Google Inc 的注册商标。</para>">
+<!ENTITY android "<trademark xmlns='http://docbook.org/ns/docbook'>Android</trademark>">
+
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg、 Helvetica、
   Palatino 以及 Times Roman 是 Heidelberger Druckmaschinen AG
@@ -124,6 +137,7 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
   是国际商用机器公司在美国和其他国家的注册商标或商标。</para>">
 <!ENTITY aix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>AIX</trademark>">
 <!ENTITY os2 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>OS/2</trademark>">
+<!ENTITY power "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POWER</trademark>">
 <!ENTITY powerpc "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PowerPC</trademark>">
 <!ENTITY ps2 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>PS/2</trademark>">
 <!ENTITY s390 "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>S/390</trademark>">
@@ -135,10 +149,12 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
 <!ENTITY posix "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>POSIX</trademark>">
 
 <!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
-<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
+<!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, 和 Xeon 是 Intel Corporation
   及其分支机构在美国和其他国家的商标或注册商标。</para>">
 <!ENTITY celeron "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Celeron</trademark>">
+<!ENTITY centrino "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Centrino</trademark>">
+<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">
 <!ENTITY etherexpress "<trademark xmlns='http://docbook.org/ns/docbook'>EtherExpress</trademark>">
 <!ENTITY i386 "<trademark xmlns='http://docbook.org/ns/docbook'>i386</trademark>">
 <!ENTITY i486 "<trademark xmlns='http://docbook.org/ns/docbook'>i486</trademark>">
@@ -146,7 +162,6 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
 <!ENTITY itanium "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Itanium</trademark>">
 <!ENTITY pentium "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>Pentium</trademark>">
 <!ENTITY xeon "<trademark xmlns='http://docbook.org/ns/docbook'>Xeon</trademark>">
-<!ENTITY core "<trademark xmlns='http://docbook.org/ns/docbook'>Core</trademark>">
 
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit 和 Quicken 是 Intuit Inc., 或其子公司在美国和其他国家的商标或注册商标。</para>">
@@ -252,6 +267,11 @@ Coverity Extend， Coverity Prevent 和 Coverity Preve
 <!-- http://www.redhat.com/legal/legal_statement.html -->
 <!ENTITY tm-attrib.redhat "<para xmlns='http://docbook.org/ns/docbook'>Red Hat, RPM, 是 Red Hat, Inc.
   在美国和其他国家的注册商标。</para>">
+
+<!-- https://riscv.org/risc-v-trademark-usage/ -->
+<!ENTITY tm-attrib.risc-v "<para xmlns='http://docbook.org/ns/docbook'>“RISC-V” 商标名是 RISC-V
+  基金会正在注册的注册商标。</para>">
+<!ENTITY risc-v "<trademark xmlns='http://docbook.org/ns/docbook' class='registered'>RISC-V</trademark>">
 
 <!-- These four are no longer used in the en_US documentation, but need
   leaving until translations stop using them -->

More information about the svn-doc-all mailing list