From owner-svn-doc-all@FreeBSD.ORG  Sun Nov  2 14:18:10 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 02C5AFEA;
 Sun,  2 Nov 2014 14:18:10 +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 E2841A66;
 Sun,  2 Nov 2014 14:18:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA2EI9L2034930;
 Sun, 2 Nov 2014 14:18:09 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA2EI9ZX034929;
 Sun, 2 Nov 2014 14:18:09 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201411021418.sA2EI9ZX034929@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: Sun, 2 Nov 2014 14:18:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45908 - 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: Sun, 02 Nov 2014 14:18:10 -0000

Author: ryusuke
Date: Sun Nov  2 14:18:09 2014
New Revision: 45908
URL: https://svnweb.freebsd.org/changeset/doc/45908

Log:
  - Merge the following from the English version:
  
  	r45697 -> r45900	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	Sun Nov  2 10:18:50 2014	(r45907)
+++ head/ja_JP.eucJP/share/xml/trademarks.ent	Sun Nov  2 14:18:09 2014	(r45908)
@@ -10,7 +10,7 @@
      Please keep this file sorted.
 
      $FreeBSD$
-     Original revision: r45697
+     Original revision: r45900
 -->
 
 <!ENTITY tm-attrib.3com "<para xmlns='http://docbook.org/ns/docbook'>3Com および HomeConnect は
@@ -28,7 +28,7 @@
 
 <!-- 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, &Eacute;lan, Opteron および PCnet は
+  AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, &Eacute;lan, Opteron および PCnet は
   Advanced Micro Devices, Inc. の商標です。</para>">
 
 <!-- http://www.apple.com/legal/trademark/appletmlist.html -->
@@ -93,7 +93,7 @@ Coverity, Inc. の商標です。</para>">
   の登録商標です。</para>">
 
 <!-- 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>">