- Merge the following from the English version:

	r51995 -> r52027	head/ja_JP.eucJP/share/xml/header.l10n.ent
	r39146 -> r43181	head/ja_JP.eucJP/share/xml/templates.oldnewsflash.xsl

2 files changed, 21 insertions, 7 deletions

diff --git a/ja_JP.eucJP/share/xml/header.l10n.ent b/ja_JP.eucJP/share/xml/header.l10n.ent
index c59cd4cc28..eda7ea075e 100644
--- a/ja_JP.eucJP/share/xml/header.l10n.ent
+++ b/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: r51995 -->
+<!-- Original revision: r52027 -->
 
 <!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;2018 The FreeBSD Project.
@@ -71,6 +71,7 @@
 	  <li><a href="https://forums.FreeBSD.org">フォーラム</a></li>
 	  <li><a href="&base;/usergroups.html">ユーザグループ</a></li>
 	  <li><a href="&base;/events/events.html">イベント</a></li>
+	  <li><a href="http://freebsdjournal.com">FreeBSD ジャーナル</a></li>
 	  <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (外部)</a></li>
 	</ul>
       </li>
diff --git a/ja_JP.eucJP/share/xml/templates.oldnewsflash.xsl b/ja_JP.eucJP/share/xml/templates.oldnewsflash.xsl
index 4d9e99ec2e..6e47e50510 100644
--- a/ja_JP.eucJP/share/xml/templates.oldnewsflash.xsl
+++ b/ja_JP.eucJP/share/xml/templates.oldnewsflash.xsl
@@ -6,7 +6,7 @@
 
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39146 -->
+<!-- Original revision: r43181 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -18,12 +18,12 @@
   <!-- Do not add last modified date for old news/press -->
   <xsl:variable name="date"/>
 
-  <xsl:variable name="title">&title;</xsl:variable>
-
   <xsl:variable name="year">
     <xsl:value-of select="descendant::year/name"/>
   </xsl:variable>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template match="p">
     <xsl:apply-templates select="." mode="copy.html"/>
   </xsl:template>
@@ -33,9 +33,23 @@
   </xsl:template>
 
   <xsl:template name="process.contentwrap">
+	<!-- Notice how entity references in SGML become variable references
+	     in the stylesheet, and that the syntax for referring to variables
+	     inside an attribute is "{$variable}".
+
+	     This is just dis-similar enough to Perl and the shell that you
+	     end up writing ${variable} all the time, and then scratch your
+	     head wondering why the stylesheet isn't working.-->
+
+	<!-- Also notice that because this is now XML and not SGML, empty
+             elements, like IMG, must have a trailing "/" just inside the
+   	     closing angle bracket, like this " ... />" -->
+	<img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
+	     height="144" alt="FreeBSD News"/>
+ 
 	<xsl:apply-templates select="/news/descendant::month"/>
 
-	<p>Other project news:
+	<p>他のプロジェクトニュース:
 	  <a href="&enbase;/news/2009/index.html">2009</a>,
 	  <a href="&enbase;/news/2008/index.html">2008</a>,
 	  <a href="&enbase;/news/2007/index.html">2007</a>,
@@ -85,8 +99,7 @@
 	  </xsl:attribute>
 	</a>
 
-	<b>
-	  <xsl:value-of select="ancestor::year/name"/>
+	<b><xsl:value-of select="ancestor::year/name"/>
 	  <xsl:text> 年 </xsl:text>
 	  <xsl:call-template name="transtable-lookup">
 	    <xsl:with-param name="word-group" select="'number-month'" />