Date: Sat, 22 Nov 2014 07:57:05 +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: r46012 - head/ja_JP.eucJP/share/xml Message-ID: <201411220757.sAM7v5pV003608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>">
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411220757.sAM7v5pV003608>