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

	1.24 -> 1.28	share/sgml/trademarks.ent
---
 ja_JP.eucJP/share/sgml/trademarks.ent | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ja_JP.eucJP/share/sgml/trademarks.ent b/ja_JP.eucJP/share/sgml/trademarks.ent
index a6b9bed5ed..14c994a775 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.24
+     Original revision: 1.28
 -->
 
 <!ENTITY tm-attrib.3com "<para>3Com ����� HomeConnect ��
@@ -75,8 +75,7 @@
   Seiko Epson Corporation ����Ͽ��ɸ�Ǥ���</para>">
 
 <!ENTITY tm-attrib.freebsd "<para>FreeBSD ��
-  Wind River Systems, Inc. ����Ͽ��ɸ�Ǥ���
-  ����϶ᤤ�������Ѥ�븫���ߤǤ���</para>">
+  The FreeBSD Foundation ����Ͽ��ɸ�Ǥ���</para>">
 
 <!-- http://www.heidelberg.com/hq/eng/small_print/trademarks.asp -->
 <!ENTITY tm-attrib.heidelberger "<para>Heidelberg, Helvetica,