os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Merge the following from the English version:

Browse source 
r45697 -> r45900	head/ja_JP.eucJP/share/xml/trademarks.ent
This commit is contained in:
Ryusuke SUZUKI 2014-11-02 14:18:09 +00:00
parent c6fcc98222
commit d273f2580c
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=45908
1 changed files with 3 additions and 3 deletions

6
ja_JP.eucJP/share/xml/trademarks.ent
View file

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