Date: Sun, 2 Nov 2014 14:18:09 +0000 (UTC) From: Ryusuke SUZUKI <ryusuke@FreeBSD.org> 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 Message-ID: <201411021418.sA2EI9ZX034929@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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, Élan, Opteron および PCnet は + AMD Opteron, AMD Phenom, AMD Sempron, AMD Turion, Athlon, É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>">
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411021418.sA2EI9ZX034929>