From dc311b692995bf5ae8df1df65ac5d583a1db2126 Mon Sep 17 00:00:00 2001
From: Hideyuki KURASHINA <rushani@FreeBSD.org>
Date: Thu, 30 Jun 2005 14:31:19 +0000
Subject: [PATCH] Merge the following from the English version:

	1.11 -> 1.24	share/sgml/trademarks.ent
---
 ja_JP.eucJP/share/sgml/trademarks.ent | 32 ++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/ja_JP.eucJP/share/sgml/trademarks.ent b/ja_JP.eucJP/share/sgml/trademarks.ent
index 32597ba0c2..a6b9bed5ed 100644
--- a/ja_JP.eucJP/share/sgml/trademarks.ent
+++ b/ja_JP.eucJP/share/sgml/trademarks.ent
@@ -9,7 +9,7 @@
      Please keep this file sorted.
 
      $FreeBSD$
-     Original revision: 1.11
+     Original revision: 1.24
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com ����� HomeConnect ��
@@ -48,6 +48,10 @@
 <!ENTITY tm-attrib.check-point "<para>Check Point, Firewall-1 �����
   VPN-1 �� Check Point Software Technologies Ltd. �ξ�ɸ�Ǥ���</para>">
 
+<!ENTITY tm-attrib.cisco "<para>Cisco, Catalyst ����� IOS ��
+  ����ꥫ�罰�񤪤�Ӥ��Τۤ��ι�ˤ�����
+  Cisco Systems, Inc. �����/�ޤ��Ϥ��δ�Ϣ��Ҥ���Ͽ��ɸ�Ǥ���</para>">
+
 <!ENTITY tm-attrib.corel "<para>Corel ����� WordPerfect ��
   ���ʥ�������ꥫ�罰�񤪤��/�ޤ��Ϥ���¾�ι�ˤ�����
   Corel Corporation �����/�ޤ��Ϥ��δ�Ϣ��Ҥξ�ɸ�ޤ�����Ͽ��ɸ�Ǥ���</para>">
@@ -57,11 +61,19 @@
   ����ꥫ�罰�񤪤��/�ޤ��Ϥ���¾�ι�ˤ�����
   Creative Technology Ltd. �ξ�ɸ�Ǥ���</para>">
 
+<!-- http://www.cvsup.org/ -->
+<!ENTITY tm-attrib.cvsup "<para>CVSup ��
+  John D. Polstra ����Ͽ��ɸ�Ǥ���</para>">
+
 <!-- http://www.dell.com/us/en/gen/misc/policy_007_policy.htm -->
 <!ENTITY tm-attrib.dell "<para>Dell, Dell Precision, Latitude,
   Optiplex, PowerEdge �� Dell Computer Corporation ��
   ��ɸ�ޤ�����Ͽ��ɸ�Ǥ���</para>">
 
+<!-- http://www.epson.com/cgi-bin/Store/AboutTrademarkInfo.jsp -->
+<!ENTITY tm-attrib.epson "<para>EPSON, EPSON Perfection ��
+  Seiko Epson Corporation ����Ͽ��ɸ�Ǥ���</para>">
+
 <!ENTITY tm-attrib.freebsd "<para>FreeBSD ��
   Wind River Systems, Inc. ����Ͽ��ɸ�Ǥ���
   ����϶ᤤ�������Ѥ�븫���ߤǤ���</para>">
@@ -93,7 +105,11 @@
   ����ꥫ�罰�񤪤��/�ޤ��Ϥ���¾�ι�ˤ�����
   Iomega Corporation ����Ͽ��ɸ�ޤ��Ͼ�ɸ�Ǥ���</para>">
 
-<!ENTITY tm-attrib.linux "<para>Linux �ϥ���ꥫ�罰��ˤ�����
+<!ENTITY tm-attrib.lantronix "<para>Lantronix ����� EasyIO ��
+  Lantronix Corporation �ξ�ɸ�Ǥ���</para>">
+
+<!-- http://www.linuxmark.org/ -->
+<!ENTITY tm-attrib.linux "<para>Linux ��
   Linus Torvalds ����Ͽ��ɸ�Ǥ���</para>">
 
 <!-- http://www.lsilogic.com/trademrk.html -->
@@ -104,7 +120,7 @@
   ����ꥫ�罰�񤪤��/�ޤ��Ϥ���¾�ι�ˤ�����
   Macromedia, Inc. �ξ�ɸ�ޤ�����Ͽ��ɸ�Ǥ���</para>">
 
-<!ENTITY tm-attrib.microsoft "<para>Microsoft, FrontPage, MS-DOS,
+<!ENTITY tm-attrib.microsoft "<para>Microsoft, IntelliMouse, MS-DOS,
   Outlook, Windows, Windows Media ����� Windows NT ��
   ����ꥫ�罰�񤪤��/�ޤ��Ϥ���¾�ι�ˤ�����
   Microsoft Corporation ����Ͽ��ɸ�ޤ��Ͼ�ɸ�Ǥ���</para>">
@@ -113,6 +129,11 @@
   ����ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
   MIPS Technologies, Inc. ����Ͽ��ɸ�Ǥ���</para>">
 
+<!-- http://www.mysql.com/company/trademark.html -->
+<!ENTITY tm-attrib.mysql "<para>MySQL ��
+  ����ꥫ�罰��EU ����Ӥ���¾�ι�ˤ�����
+  MySQL AB ����Ͽ��ɸ�Ǥ���</para>">
+
 <!-- http://www.m-sys.com/content/LegalTerms.asp -->
 <!ENTITY tm-attrib.m-systems "<para>M-Systems ����� DiskOnChip ��
   M-Systems Flash Disk Pioneers, Ltd. �ξ�ɸ�ޤ�����Ͽ��ɸ�Ǥ���</para>">
@@ -121,6 +142,11 @@
   ����ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
   Netscape Communications Corporation ����Ͽ��ɸ�Ǥ���</para>">
 
+<!-- http://www.nexthop.com/legal.shtml -->
+<!ENTITY tm-attrib.nexthop "<para>GateD ����� NextHop ��
+  ����ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����
+  NextHop ����Ͽ��ɸ����Ӿ�ɸ�Ǥ���</para>">
+
 <!-- http://www.novell.com/company/legal/trademarks/tmlist.html -->
 <!ENTITY tm-attrib.novell "<para>NetWare, NetWare Loadable Module �����
   NLM �ϥ���ꥫ�罰�񤪤�Ӥ���¾�ι�ˤ�����