svn commit: r45856 - head/ja_JP.eucJP/share/xml

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue Oct 21 11:15:15 UTC 2014 

Author: ryusuke
Date: Tue Oct 21 11:15:14 2014
New Revision: 45856
URL: https://svnweb.freebsd.org/changeset/doc/45856

Log:
  - Merge the following from the English version:
  
  	r24989 -> r45697	head/ja_JP.eucJP/share/xml/trademarks.ent

Modified:
  head/ja_JP.eucJP/share/xml/trademarks.ent

Modified: head/ja_JP.eucJP/share/xml/trademarks.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/trademarks.ent	Mon Oct 20 14:56:01 2014	(r45855)
+++ head/ja_JP.eucJP/share/xml/trademarks.ent	Tue Oct 21 11:15:14 2014	(r45856)
@@ -10,29 +10,31 @@
      Please keep this file sorted.
 
      $FreeBSD$
-     Original revision: 1.28
+     Original revision: r45697
 -->
 
 <!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com ¤ª¤è¤Ó HomeConnect ¤Ï
   3Com Corporation ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
-<!-- An SGML entity can't start with a number... -->
+<!-- An XML entity can't start with a number... -->
 
-<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware ¤ª¤è¤Ó Escalade ¤Ï
-  3ware Inc. ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+<!ENTITY tm-attrib.3ware "<para xmlns='http://docbook.org/ns/docbook'>3ware ¤Ï 3ware Inc. ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
 <!-- http://www.adaptec.com/worldwide/company/compeditorial.html?prodkey=legal_copyright -->
 <!ENTITY tm-attrib.adaptec "<para xmlns='http://docbook.org/ns/docbook'>Adaptec ¤Ï Adaptec, Inc. ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
-<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader ¤ª¤è¤Ó
+<!ENTITY tm-attrib.adobe "<para xmlns='http://docbook.org/ns/docbook'>Adobe, Acrobat, Acrobat Reader, Flash ¤ª¤è¤Ó
   PostScript ¤Ï ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Î
   Adobe Systems Incorporated ¤ÎÅÐÏ¿¾¦É¸¤Þ¤¿¤Ï¾¦É¸¤Ç¤¹¡£</para>">
 
 <!-- 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, Élan ¤ª¤è¤Ó PCnet ¤Ï
+  AMD Opteron, Athlon, Élan, Opteron ¤ª¤è¤Ó PCnet ¤Ï
   Advanced Micro Devices, Inc. ¤Î¾¦É¸¤Ç¤¹¡£</para>">
 
-<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, FireWire, Mac, Macintosh, Mac OS,
+<!-- http://www.apple.com/legal/trademark/appletmlist.html -->
+<!ENTITY tm-attrib.apple "<para xmlns='http://docbook.org/ns/docbook'>Apple, AirPort, FireWire,
+  iMac, iPhone, iPad,
+  Mac, Macintosh, Mac OS,
   Quicktime ¤ª¤è¤Ó TrueType ¤Ï Apple Computer, Inc. ¤Î¾¦É¸¤Ç¡¢
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤ÇÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>">
 
@@ -46,6 +48,11 @@
   ¥«¥Ê¥À¡¢¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Corel Corporation ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î´ØÏ¢²ñ¼Ò¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- http://www.coverity.com/html/press_story45_07_25_07.html -->
+<!ENTITY tm-attrib.coverity "<para xmlns='http://docbook.org/ns/docbook'>Coverity ¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹; 
+Coverity Extend, Coverity Prevent ¤ª¤è¤Ó Coverity Prevent SQS ¤Ï¡¢
+Coverity, Inc. ¤Î¾¦É¸¤Ç¤¹¡£</para>">
+
 <!-- http://www.creative.com/legal.asp -->
 <!ENTITY tm-attrib.creative "<para xmlns='http://docbook.org/ns/docbook'>Sound Blaster ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
@@ -58,13 +65,26 @@
 <!ENTITY tm-attrib.freebsd "<para xmlns='http://docbook.org/ns/docbook'>FreeBSD ¤Ï
   The FreeBSD Foundation ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</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,
+  Stylistic, PRIMEPOWER, PRIMEQUEST, PRIMECLUSTER, ETERNUS, TRIOLE,
+  ESPRIMO, BioMedCAChe, CAChe, CELLINJECTOR, isS, Materials Explorer,
+  SystemWalker ¤ª¤è¤Ó Interstage ¤Ï¡¢
+  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+  Fujitsu Limited ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+
+<!-- http://www.google.com/permissions/trademark/our-trademarks.html -->
+<!ENTITY tm-attrib.google "<para xmlns='http://docbook.org/ns/docbook'>Android
+  ¤Ï Google Inc. ¤Î¾¦É¸¤Ç¤¹¡£</para>">
+
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para xmlns='http://docbook.org/ns/docbook'>Heidelberg, Helvetica,
-  Palatino, and Times Roman ¤Ï¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+  Palatino, ¤ª¤è¤Ó Times Roman ¤Ï¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Heidelberger Druckmaschinen AG ¤ÎÅÐÏ¿¾¦É¸¤Þ¤¿¤Ï¾¦É¸¤Ç¤¹¡£</para>">
 
-<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, OS/2, PowerPC, PS/2, S/390 ¤ª¤è¤Ó ThinkPad ¤Ï
-  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+<!ENTITY tm-attrib.ibm "<para xmlns='http://docbook.org/ns/docbook'>IBM, AIX, OS/2,
+  PowerPC, PS/2, S/390 ¤ª¤è¤Ó ThinkPad ¤Ï
+  ¥¢¥á¥ê¥«¹ç½°¹ñ¡¢¤½¤Î¾¤Î¹ñ¡¢¤Þ¤¿¤ÏξÊý¤Ë¤ª¤±¤ë
   International Business Machines Corporation ¤Î¾¦É¸¤Ç¤¹¡£</para>">
 
 <!ENTITY tm-attrib.ieee "<para xmlns='http://docbook.org/ns/docbook'>IEEE, POSIX ¤ª¤è¤Ó 802 ¤Ï
@@ -72,6 +92,7 @@
   Institute of Electrical and Electronics Engineers, Inc.
   ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- http://www.intel.com/intel/legal/tmnouns2.htm -->
 <!ENTITY tm-attrib.intel "<para xmlns='http://docbook.org/ns/docbook'>Intel, Celeron, EtherExpress, i386,
   i486, Itanium, Pentium ¤ª¤è¤Ó Xeon ¤Ï¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Intel Corporation ¤Þ¤¿¤Ï¤½¤Î´ØÏ¢²ñ¼Ò¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
@@ -79,7 +100,7 @@
 <!-- http://www.quicken.com/support/trademark/ -->
 <!ENTITY tm-attrib.intuit "<para xmlns='http://docbook.org/ns/docbook'>Intuit ¤ª¤è¤Ó Quicken ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë  Intuit Inc. ¤Þ¤¿¤Ï¤½¤Î´ØÏ¢²ñ¼Ò¤Î
-  ÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+  ¾¦É¸¤ª¤è¤Ó/¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
 <!ENTITY tm-attrib.iomega "<para xmlns='http://docbook.org/ns/docbook'>Iomega, Zip ¤ª¤è¤Ó Jaz ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
@@ -96,6 +117,8 @@
 <!ENTITY tm-attrib.lsilogic "<para xmlns='http://docbook.org/ns/docbook'>LSI Logic, AcceleRAID, eXtremeRAID,
   MegaRAID ¤ª¤è¤Ó Mylex ¤Ï LSI Logic Corp. ¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- These two are no longer used in the en_US documentation, but need
+  leaving until translations stop using them -->
 <!ENTITY tm-attrib.macromedia "<para xmlns='http://docbook.org/ns/docbook'>Macromedia, Flash ¤ª¤è¤Ó Shockwave ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Macromedia, Inc. ¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
@@ -113,10 +136,15 @@
 <!ENTITY tm-attrib.m-systems "<para xmlns='http://docbook.org/ns/docbook'>M-Systems ¤ª¤è¤Ó DiskOnChip ¤Ï
   M-Systems Flash Disk Pioneers, Ltd. ¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- http://www.netbsd.org/Misc/about.html, ack'd by http://www.uspto.gov/ -->
+<!ENTITY tm-attrib.netbsd "<para xmlns='http://docbook.org/ns/docbook'>NetBSD ¤Ï the NetBSD Foundation ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+
 <!ENTITY tm-attrib.netscape "<para xmlns='http://docbook.org/ns/docbook'>Netscape ¤ª¤è¤Ó the Netscape Navigator ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Netscape Communications Corporation ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- These two are no longer used in the en_US documentation, but need
+  leaving until translations stop using them -->
 <!-- http://www.nexthop.com/legal.shtml -->
 <!ENTITY tm-attrib.nexthop "<para xmlns='http://docbook.org/ns/docbook'>GateD ¤ª¤è¤Ó NextHop ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
@@ -126,6 +154,10 @@
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë The Open Group ¤ÎÅÐÏ¿¾¦É¸¤Ç¡¢
   IT DialTone ¤ª¤è¤Ó The Open Group ¤ÏƱ¤¸¤¯¾¦É¸¤Ç¤¹¡£</para>">
 
+<!ENTITY tm-attrib.unix "<para xmlns='http://docbook.org/ns/docbook'>UNIX ¤Ï
+  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+  The Open Group ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
+
 <!-- http://www.oracle.com/html/trademark.html -->
 <!-- http://www.oracle.com/html/3party.html -->
 <!ENTITY tm-attrib.oracle "<para xmlns='http://docbook.org/ns/docbook'>Oracle ¤Ï
@@ -133,7 +165,7 @@
 
 <!-- http://www.powerquest.com/legal/ -->
 <!ENTITY tm-attrib.powerquest "<para xmlns='http://docbook.org/ns/docbook'>PowerQuest ¤ª¤è¤Ó PartitionMagic ¤Ï
-  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   PowerQuest Corporation ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
 <!-- http://www.qualcomm.com/main/legal.html -->
@@ -150,20 +182,27 @@
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Red Hat, Inc. ¤Î¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
+<!-- These four are no longer used in the en_US documentation, but need
+  leaving until translations stop using them -->
 <!ENTITY tm-attrib.sap "<para xmlns='http://docbook.org/ns/docbook'>SAP, R/3 ¤ª¤è¤Ó mySAP ¤Ï
   ¥É¥¤¥Ä¤ª¤è¤ÓÀ¤³¦Ãæ¤Î¤¤¤¯¤Ä¤â¤Î¹ñ¤Ë¤ª¤±¤ë SAP AG ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
 <!ENTITY tm-attrib.sgi "<para xmlns='http://docbook.org/ns/docbook'>Silicon Graphics, SGI ¤ª¤è¤Ó OpenGL ¤Ï
-  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
+  ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
   Silicon Graphics, Inc. ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">
 
-<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>Sparc, Sparc64 ¤ª¤è¤Ó
+<!ENTITY tm-attrib.sparc "<para xmlns='http://docbook.org/ns/docbook'>SPARC, SPARC64 ¤ª¤è¤Ó
   UltraSPARC ¤Ï¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë
-  SPARC International, Inc. ¤Î¾¦É¸¤Ç¤¹¡£SPARC ¤Î¾¦É¸¤ò¤Ä¤±¤¿À½ÉʤÏ
-  Sun Microsystems, Inc. ¤¬³«È¯¤·¤¿¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë´ð¤Å¤¤¤Æ¤¤¤Þ¤¹¡£</para>">
-
-<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java Virtual Machine, JDK, JSP, JVM, Netra, Solaris, StarOffice,
-  ¤ª¤è¤Ó SunOS ¤Ï
+  SPARC International, Inc. ¤Î¾¦É¸¤Ç¤¹¡£
+  SPARC International, Inc ¤Ï¡¢¤¹¤Ù¤Æ¤Î SPARC ¾¦É¸¤ò½êÍ­¤·¤Æ¤¤¤Þ¤¹¡£
+  ¤Þ¤¿¡¢¥é¥¤¥»¥ó¥¹µöÂú·ÀÌó¤Î¤â¤È¤Ç¡¢
+  ¤½¤Î¥á¥ó¥Ð¡¼¤Ï¡¢¤³¤ì¤é¤Î¾¦É¸¤òŬÀÚ¤ÊÈϰϤǻÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>">
+
+<!-- http://www.sun.com/suntrademarks/ -->
+<!ENTITY tm-attrib.sun "<para xmlns='http://docbook.org/ns/docbook'>Sun, Sun Microsystems, Java, Java
+  Virtual Machine, JDK, JRE, JSP, JVM, Netra, OpenJDK,
+  Solaris, StarOffice, SunOS
+  ¤ª¤è¤Ó VirtualBox ¤Ï
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤Ë¤ª¤±¤ë Sun Microsystems, Inc. ¤Î
   ¾¦É¸¤Þ¤¿¤ÏÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">

More information about the svn-doc-head mailing list