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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sat Nov 22 07:57:05 2014
New Revision: 46012
URL: https://svnweb.freebsd.org/changeset/doc/46012

Log:
  - Merge the following from the English version:
  
  	r45900 -> r45992	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	Sat Nov 22 07:33:45 2014	(r46011)
+++ head/ja_JP.eucJP/share/xml/trademarks.ent	Sat Nov 22 07:57:05 2014	(r46012)
@@ -10,7 +10,7 @@
      Please keep this file sorted.
 
      $FreeBSD$
-     Original revision: r45900
+     Original revision: r45992
 -->
 
 <!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com ¤ª¤è¤Ó HomeConnect ¤Ï
@@ -35,7 +35,7 @@
 <!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. ¤Î¾¦É¸¤Ç¡¢
+  Quicktime ¤ª¤è¤Ó TrueType ¤Ï Apple Inc. ¤Î¾¦É¸¤Ç¡¢
   ¥¢¥á¥ê¥«¹ç½°¹ñ¤ª¤è¤Ó¤½¤Î¾¤Î¹ñ¤ÇÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>">
 
 <!ENTITY tm-attrib.arm "<para xmlns='http://docbook.org/ns/docbook'>ARM ¤Ï ARM Limited ¤ÎÅÐÏ¿¾¦É¸¤Ç¤¹¡£</para>">