From owner-svn-doc-all@FreeBSD.ORG  Sat Nov 22 07:57:06 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 202149E5;
 Sat, 22 Nov 2014 07:57:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0C371FAA;
 Sat, 22 Nov 2014 07:57:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAM7v5Xg003609;
 Sat, 22 Nov 2014 07:57:05 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAM7v5pV003608;
 Sat, 22 Nov 2014 07:57:05 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201411220757.sAM7v5pV003608@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 22 Nov 2014 07:57:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46012 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
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.18-1
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Nov 2014 07:57:06 -0000

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>">