- Merge the following from the English version:

r40335 -> r40361	head/ja_JP.eucJP/htdocs/index.xsl
	r40313 -> r40361	head/ja_JP.eucJP/share/xml/header.l10n.ent

ja_JP.eucJP/htdocs/index.xsl

@@ -5,7 +5,7 @@
 ]>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: r40335 -->
+<!-- Original revision: r40361 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -63,7 +63,7 @@
 			</div> <!-- TXTFRONTFEATURELINK -->
 
 			<div
-			  style="width:550px; margin: 16px 16px 16px 32px; auto">
+			  style="width:640px; margin: 16px 16px 16px 32px; auto">
 
 			  <h1>Security Notice</h1>
 
@@ -186,14 +186,6 @@
 
 		      <div class="frontnewroundbox">
 			<div class="frontnewtop"><div>&#160;</div>&#160;</div>
-			<div class="frontnewcontent">
-			  <a href="http://www.FreeBSDFoundation.org/donate/">FreeBSD ¤Ø¤Î´óÉí</a>
-			</div> <!-- frontnewcontent -->
-			<div class="frontnewbot"><div><b style="display: none">.</b></div></div>
-		      </div> <!-- frontnewroundbox -->
-
-		      <div class="frontnewroundbox">
-			<div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			<div class="frontnewcontent">
 			  <a href="&base;/projects/newbies.html">FreeBSD が初めてという方は、こちらへどうぞ</a>
 			</div> <!-- frontnewcontent -->
@@ -332,4 +324,15 @@
 		</div> <!-- FRONTMAIN -->
 	      </div> <!-- FRONTCONTAINER -->
   </xsl:template>
+
+  <xsl:template name="process.footer">
+	&copyright;
+
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+	<a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
+  </xsl:template>
 </xsl:stylesheet>

ja_JP.eucJP/share/xml/header.l10n.ent

@@ -5,7 +5,7 @@
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r40313 -->
+<!-- Original revision: r40361 -->
 
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">サイトマップ</a> |
   <a href="&base;/copyright/">知的財産権について</a> | <!-- &copy; -->(C) 1995&ndash;2012 The FreeBSD Project.
@@ -16,6 +16,17 @@
 <!ENTITY header2.word.donate '寄付・寄贈'>
 <!ENTITY header2.word.contact '連絡先'>
 
+<!ENTITY header2.donatebutton '
+  <div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
+    <div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
+      <div class="frontdonatecontent">
+	<a
+	  href="http://www.FreeBSDFoundation.org/donate/">FreeBSD への寄付</a>
+      </div>
+    <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
+  </div>
+'>
+
 <!ENTITY header2.topnav '
   <div xmlns="http://www.w3.org/1999/xhtml" id="menu">
     <ul class="first">
@@ -93,9 +104,9 @@
 <!ENTITY header2.searchnav '
       <div xmlns="http://www.w3.org/1999/xhtml" id="searchnav">
         <ul id="searchnavlist">
-          <li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>
+	<!--<li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>-->
 
-          <li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
+	<!--<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>-->
         </ul>
       </div> <!-- SEARCHNAV -->
 '>
@@ -103,5 +114,5 @@
 <!ENTITY lastmod '最終更新日: '>
 
 <!ENTITY webbuild '
-<p xmlns="http://www.w3.org/1999/xhtml">この文書は、FreeBSD Web ページを手動で CVS
+<p xmlns="http://www.w3.org/1999/xhtml">この文書は、FreeBSD Web ページを手動で Subversion
 リポジトリから構築して更新する方法を解説しています。</p>'>