svn commit: r45908 - head/ja_JP.eucJP/share/xml
Ryusuke SUZUKI <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
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>">
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"