Implement templates for selectively picking up the latest

news items and putting them into the localized web pages.
If the translation is available it will be used, otherwise
the original (English) version of the news item will be used.

28 files changed, 667 insertions, 589 deletions

diff --git a/de/Makefile b/de/Makefile
index cd1cab98ec..98806253ad 100644
--- a/de/Makefile
+++ b/de/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Documentation Project
 # The FreeBSD German Documentation Project
-# $FreeBSD$
+# $FreeBSD: www/de/Makefile,v 1.18 2004/12/18 13:10:22 jkois Exp $
 # $FreeBSDde: de-www/Makefile,v 1.25 2004/11/22 19:29:20 jkois Exp $
 # basiert auf: 1.112
 
@@ -57,7 +57,9 @@ CLEANFILES+=	index.html
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -66,7 +68,9 @@ index.html: index.xsl ${XML_INCLUDES}\
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
diff --git a/de/index.xsl b/de/index.xsl
index 98053b2524..65d39c426a 100644
--- a/de/index.xsl
+++ b/de/index.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!--
-     $FreeBSD$
+     $FreeBSD: www/de/index.xsl,v 1.18 2004/12/18 13:10:22 jkois Exp $
      $FreeBSDde: de-www/index.xsl,v 1.37 2004/12/03 21:24:32 jkois Exp $
      basiert auf: 1.117
 -->
@@ -11,7 +11,7 @@
   <xsl:import href="includes.xsl"/>
   <xsl:import href="news/includes.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/de/index.xsl,v 1.18 2004/12/18 13:10:22 jkois Exp $'"/>
   <xsl:variable name="title" select="'Das FreeBSD Projekt'"/>
 
   <!-- these params should be externally bound. The values
@@ -19,7 +19,9 @@
   <xsl:param name="advisories.xml" select="'none'"/>
   <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
+  <xsl:param name="news.press.xml-master" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
+  <xsl:param name="news.project.xml-master" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -288,10 +290,11 @@
 			    <font size="-1">
 			      aktualisiert am:
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-			        <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+			        <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 			      <xsl:call-template name="html-index-news-project-items">
+			        <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			        <xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 			      <a href="news/newsflash.html">mehr ...</a>
@@ -302,10 +305,11 @@
 			    <font size="-1">
 			      aktualisiert im:
 			      <xsl:call-template name="html-index-news-press-items-lastmodified">
-			        <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+			        <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 			      <xsl:call-template name="html-index-news-press-items">
+			        <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			        <xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			      </xsl:call-template>
 			      <a href="news/press.html">mehr ...</a>
diff --git a/de/news/Makefile b/de/news/Makefile
index 45ae53138c..2a9322e982 100644
--- a/de/news/Makefile
+++ b/de/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/de/news/Makefile,v 1.2 2003/09/30 23:17:04 mheinen Exp $
+# $FreeBSD: www/de/news/Makefile,v 1.3 2004/05/15 12:39:08 brueffer Exp $
 # $FreeBSDde: de-www/news/Makefile,v 1.6 2004/05/02 00:21:16 brueffer Exp $
 # basiert auf: 1.39
 
@@ -18,28 +18,32 @@ SUBDIR= 	2002
 DATA=		newsflash.html news.rdf press.html
 CLEANFILES+=	newsflash.html news.rdf press.html
 
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/de/news/newsflash.xsl b/de/news/newsflash.xsl
index f8e4ec4a08..b263b44939 100644
--- a/de/news/newsflash.xsl
+++ b/de/news/newsflash.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!--
-     $FreeBSD$
+     $FreeBSD: www/de/news/newsflash.xsl,v 1.4 2004/05/15 12:39:08 brueffer Exp $
      $FreeBSDde: de-www/news/newsflash.xsl,v 1.11 2004/05/04 00:06:08 brueffer Exp $
      basiert auf: 1.11
 -->
@@ -19,6 +19,9 @@
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
+  <xsl:param name="news.project.xml-master" select="'none'" />
+  <xsl:param name="news.project.xml" select="'none'" />
+
   <xsl:output type="html" encoding="iso-8859-1"/>
 
   <xsl:template match="news">
@@ -69,16 +72,12 @@
 	<p>Die FreeBSD Sicherheitshinweise finden Sie auf der Seite
 	  <a href="{$enbase}/security/#adv">Security Information</a>.</p>
 
-	<xsl:apply-templates select="descendant::month"/>
+	<xsl:call-template name="html-news-list-newsflash">
+          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+	</xsl:call-template>
 
-	<p>&#196;ltere Ank&#252;ndigungen:
-	  <a href="2002/index.html">2002</a>,
-	  <a href="{$enbase}/news/2001/index.html">2001</a>,
-	  <a href="{$enbase}/news/2000/index.html">2000</a>,
-	  <a href="{$enbase}/news/1999/index.html">1999</a>,
-	  <a href="{$enbase}/news/1998/index.html">1998</a>,
-	  <a href="{$enbase}/news/1997/index.html">1997</a>,
-	  <a href="{$enbase}/news/1996/index.html">1996</a></p>
+        <xsl:call-template name="html-news-make-olditems-list" />
 
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
@@ -86,53 +85,26 @@
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
+  <!-- for l10n -->
+  <xsl:template name="html-news-datelabel">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+    <xsl:param name="day" />
 
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
+    <xsl:value-of select="concat($day, '. ', $month, ' ', $year, ':')" />
   </xsl:template>
 
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>.
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text> </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
+  <xsl:template name="html-news-make-olditems-list">
+    <p>&#196;ltere Ank&#252;ndigungen:
+      <a href="2002/index.html">2002</a>,
+      <a href="{$enbase}/news/2001/index.html">2001</a>,
+      <a href="{$enbase}/news/2000/index.html">2000</a>,
+      <a href="{$enbase}/news/1999/index.html">1999</a>,
+      <a href="{$enbase}/news/1998/index.html">1998</a>,
+      <a href="{$enbase}/news/1997/index.html">1997</a>,
+      <a href="{$enbase}/news/1996/index.html">1996</a></p>
   </xsl:template>
 
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the current
        value of the $base variable. -->
 
diff --git a/de/news/press.xsl b/de/news/press.xsl
index 4a5108f895..f6f7b3d126 100644
--- a/de/news/press.xsl
+++ b/de/news/press.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD$
+<!-- $FreeBSD: www/de/news/press.xsl,v 1.5 2004/05/17 22:41:54 mheinen Exp $
      $FreeBSDde: de-www/news/press.xsl,v 1.6 2004/05/17 20:32:17 mheinen Exp $
      basiert auf: 1.9
 -->
@@ -19,8 +19,20 @@
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
+  <xsl:param name="news.press.xml-master" select="'none'" />
+  <xsl:param name="news.press.xml" select="'none'" />
+
   <xsl:output type="html" encoding="iso-8859-1"/>
 
+  <!-- for l10n -->
+  <xsl:template name="html-news-datelabel">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+    <xsl:param name="day" />
+
+    <xsl:value-of select="concat($day, '. ', $month, ' ', $year, ':')" />
+  </xsl:template>
+
   <xsl:template match="press">
     <html>
 
@@ -35,51 +47,14 @@
 	  <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> und
 	  wir nehmen den Artikel auf.</p>
 
-	<xsl:apply-templates select="//month"/>
+	<xsl:call-template name="html-news-list-press">
+	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	</xsl:call-template>
 
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>      
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-        select="name"/></b></a><br/>
-
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/en/Makefile b/en/Makefile
index a7f0219c6b..9c205a16e8 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/Makefile,v 1.115 2004/12/16 23:09:42 ceri Exp $
+# $FreeBSD: www/en/Makefile,v 1.116 2004/12/18 12:35:25 ceri Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -89,7 +89,9 @@ CLEANFILES+=	index.html
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -98,7 +100,9 @@ index.html: index.xsl ${XML_INCLUDES}\
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
diff --git a/en/index.xsl b/en/index.xsl
index 6b1d45c5bb..6aabad9c6a 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.120 2004/12/23 22:29:28 murray Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.121 2004/12/30 14:54:39 ceri Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
@@ -6,7 +6,7 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.120 2004/12/23 22:29:28 murray Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.121 2004/12/30 14:54:39 ceri Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <!-- these params should be externally bound. The values
@@ -14,7 +14,9 @@
   <xsl:param name="advisories.xml" select="'none'"/>
   <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
+  <xsl:param name="news.press.xml-master" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
+  <xsl:param name="news.project.xml-master" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -253,12 +255,13 @@
 			    <font color="#990000">(<a href="news/news.rdf">RSS</a>)</font><br/>
 			    <font size="-1">Latest update:
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-project-items">
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
@@ -269,12 +272,13 @@
 			    <font size="-1">
 			      Latest update:
 			      <xsl:call-template name="html-index-news-press-items-lastmodified">
-				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-press-items">
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			      </xsl:call-template>
 
diff --git a/en/news/Makefile b/en/news/Makefile
index e0c08270b0..e3f18d010f 100644
--- a/en/news/Makefile
+++ b/en/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/Makefile,v 1.38 2003/07/11 19:57:06 ceri Exp $
+# $FreeBSD: www/en/news/Makefile,v 1.39 2004/01/12 21:26:59 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -37,9 +37,13 @@ SUBDIR+=	status
 DATA=		newsflash.html news.rdf press.html
 CLEANFILES+=	newsflash.html news.rdf press.html
 
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
@@ -47,18 +51,18 @@ newsflash.html: newsflash.xsl news.xml\
 .endif
 
 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/news/news.xml b/en/news/news.xml
index 6351c5efe3..91110bd951 100644
--- a/en/news/news.xml
+++ b/en/news/news.xml
@@ -21,7 +21,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/news/news.xml,v 1.255 2004/12/23 09:42:12 simon Exp $
+      $FreeBSD: www/en/news/news.xml,v 1.256 2004/12/28 07:10:30 ahze Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -260,10 +260,7 @@
 	  href="mailto:kwm@FreeBSD.org">Koop Mast</a>
 	  (ports)</p>
 	</event>
-      </day>
 
-      <day>
-	<name>15</name>
 	<event>
 	  <p>New committer: <a
 	    href="mailto:delphij@FreeBSD.org">Xin Li</a>
diff --git a/en/news/newsflash.xsl b/en/news/newsflash.xsl
index 5cb91a459d..2cba62b113 100644
--- a/en/news/newsflash.xsl
+++ b/en/news/newsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/en/news/newsflash.xsl,v 1.10 2004/01/12 21:26:59 hrs Exp $ -->
+<!-- $FreeBSD: www/en/news/newsflash.xsl,v 1.11 2004/04/08 19:11:49 ceri Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -14,6 +14,9 @@
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name="news.project.xml-master" select="'none'" />
+  <xsl:param name="news.project.xml" select="'none'" />
   
   <xsl:output type="html" encoding="iso-8859-1"/>
 
@@ -63,70 +66,19 @@
 	<p>For FreeBSD Security Advisories, please refer to the 
 	  <a href="{$base}/security/#adv">Security Information</a> page.</p>
 	
-	<xsl:apply-templates select="descendant::month"/>
-	
-	<p>Older announcements:
-	  <a href="2002/index.html">2002</a>,
-	  <a href="2001/index.html">2001</a>,
-	  <a href="2000/index.html">2000</a>,
-	  <a href="1999/index.html">1999</a>,
-	  <a href="1998/index.html">1998</a>,
-	  <a href="1997/index.html">1997</a>,
-	  <a href="1996/index.html">1996</a></p>
-	
+	<xsl:call-template name="html-news-list-newsflash">
+          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+	  <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+	</xsl:call-template>
+
+        <xsl:call-template name="html-news-make-olditems-list" />
+
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
-  </xsl:template>
-
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the current
        value of the $base variable. -->
 
diff --git a/en/news/press.xsl b/en/news/press.xsl
index 77cfafd050..81014c0047 100644
--- a/en/news/press.xsl
+++ b/en/news/press.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/en/news/press.xsl,v 1.8 2004/04/07 11:40:48 phantom Exp $ -->
+<!-- $FreeBSD: www/en/news/press.xsl,v 1.9 2004/05/13 20:52:49 simon Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -14,6 +14,9 @@
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name="news.press.xml-master" select="'none'" />
+  <xsl:param name="news.press.xml" select="'none'" />
   
   <xsl:output type="html" encoding="iso-8859-1"/>
 
@@ -31,58 +34,14 @@
 	  <a href="mailto:www@FreeBSD.org">www@FreeBSD.org</a> so that we can
 	  include them.</p>
 
-	<xsl:apply-templates select="//month"/>
+	<xsl:call-template name="html-news-list-press">
+          <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+          <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	</xsl:call-template>
 
-	<p>Older press publications:
-	  <a href="2002/press.html">2002</a>,
-	  <a href="2001/press.html">2001</a>,
-	  <a href="2000/press.html">2000</a>,
-	  <a href="1999/press.html">1999</a>,
-	  <a href="1998/press.html">1998-1996</a></p>
-	
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-      select="name"/></b></a><br/>
-	  
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/fr/Makefile b/fr/Makefile
index 3ebfa3daf2..564a7929f1 100644
--- a/fr/Makefile
+++ b/fr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/Makefile,v 1.6 2004/04/06 11:41:17 phantom Exp $
+# $FreeBSD: www/fr/Makefile,v 1.7 2004/10/06 12:55:04 stephane Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.107
@@ -92,15 +92,22 @@ CLEANFILES+=	index.html
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
-		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
+		${XML_MIRRORS} ${XML_TRANSTABLE} \
+		${XML_ADVISORIES} ${XML_NOTICES} \
+		${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param notices.xml "'${XML_NOTICES}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
diff --git a/fr/index.xsl b/fr/index.xsl
index f13bb1f938..5bafb1837e 100644
--- a/fr/index.xsl
+++ b/fr/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/fr/index.xsl,v 1.10 2004/02/29 13:20:40 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/index.xsl,v 1.11 2004/11/24 21:29:06 stephane Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
@@ -13,7 +13,7 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.10 2004/02/29 13:20:40 stephane Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/fr/index.xsl,v 1.11 2004/11/24 21:29:06 stephane Exp $'"/>
   <xsl:variable name="title" select="'Le Projet FreeBSD'"/>
 
   <!-- these params should be externally bound. The values
@@ -21,7 +21,9 @@
   <xsl:param name="advisories.xml" select="'none'"/>
   <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
+  <xsl:param name="news.press.xml-master" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
+  <xsl:param name="news.project.xml-master" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -281,12 +283,13 @@
              <font color="#990000">(<a href="news/news.rdf">RSS</a>)</font><br/>
 			    <font size="-1">Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-				     <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				     <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
-			      
+
 			      <xsl:call-template name="html-index-news-project-items">
+				     <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 				     <xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
@@ -298,12 +301,13 @@
 			    <font size="-1">
 			      Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name="html-index-news-press-items-lastmodified">
-				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-press-items">
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			      </xsl:call-template>
 			      
diff --git a/fr/news/Makefile b/fr/news/Makefile
index 8bd9385a62..78e44d4dad 100644
--- a/fr/news/Makefile
+++ b/fr/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/news/Makefile,v 1.6 2003/12/15 16:12:32 stephane Exp $
+# $FreeBSD: www/fr/news/Makefile,v 1.7 2004/02/29 13:20:40 stephane Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.39
@@ -40,28 +40,32 @@ SUBDIR+=	status
 DATA=		newsflash.html news.rdf press.html
 CLEANFILES+=	newsflash.html news.rdf press.html
 
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/fr/news/newsflash.xsl b/fr/news/newsflash.xsl
index 6539f3d022..854e2852b9 100644
--- a/fr/news/newsflash.xsl
+++ b/fr/news/newsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/fr/news/newsflash.xsl,v 1.5 2004/01/12 20:21:22 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/news/newsflash.xsl,v 1.6 2004/08/07 15:33:38 mat Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
@@ -24,6 +24,9 @@
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
+  <xsl:param name="news.project.xml-master" select="'none'" />
+  <xsl:param name="news.project.xml" select="'none'" />
+
   <xsl:output type="html" encoding="iso-8859-1"/>
 
   <xsl:template match="news">
@@ -72,70 +75,28 @@
 	<p>Pour les avis de s&#233;curit&#233; concernant FreeBSD, veuillez consulter la page
 	  <a href="{$base}/security/#adv">d'information sur la s&#233;curit&#233;</a>.</p>
 
-	<xsl:apply-templates select="descendant::month"/>
-
-	<p>Anciennes annonces :
-          <a href="2002/index.html">2002</a>,
-          <a href="2001/index.html">2001</a>,
-	  <a href="2000/index.html">2000</a>,
-	  <a href="1999/index.html">1999</a>,
-	  <a href="1998/index.html">1998</a>,
-	  <a href="1997/index.html">1997</a>,
-	  <a href="1996/index.html">1996</a></p>
-	
+	<xsl:call-template name="html-news-list-newsflash">
+          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+	</xsl:call-template>
+
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
+  <xsl:template name="html-news-make-olditems-list">
+    <p>Anciennes annonces :
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
   </xsl:template>
 
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the current
        value of the $base variable. -->
 
diff --git a/fr/news/press.xsl b/fr/news/press.xsl
index 8d2c3933b7..95ff39c957 100644
--- a/fr/news/press.xsl
+++ b/fr/news/press.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/fr/news/press.xsl,v 1.1 2002/12/08 16:45:35 stephane Exp $ -->
+<!-- $FreeBSD: www/fr/news/press.xsl,v 1.2 2004/01/08 00:26:44 stephane Exp $ -->
 
 <!-- 
    The FreeBSD French Documentation Project
@@ -23,6 +23,9 @@
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
+  <xsl:param name="news.press.xml-master" select="'none'" />
+  <xsl:param name="news.press.xml" select="'none'" />
+
   <xsl:output type="html" encoding="iso-8859-1"/>
 
   <xsl:template match="press">
@@ -41,46 +44,15 @@
 
 	<p>Vous pouvez &#233;galement consulter la page <a href="{$base}/java/press.html">FreeBSD/Java
 	    dans la Presse</a> pour des nouvelles sur le projet Java pour FreeBSD</p>
-	
-	<xsl:apply-templates select="//month"/>
-	
+
+	<xsl:call-template name="html-news-list-press">
+	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	</xsl:call-template>
+
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1><xsl:value-of select="name"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-      select="name"/></b></a><br/>
-	  
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/ja/Makefile b/ja/Makefile
index 03e517fb69..f997c9c7dd 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/Makefile,v 1.66 2004/04/26 21:05:53 simon Exp $
+# $FreeBSD: www/ja/Makefile,v 1.67 2004/12/09 19:48:57 rushani Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.114
 
@@ -87,15 +87,20 @@ REVCHECK=	yes
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
-		${XML_MIRRORS} ${XML_ADVISORIES} \
-		${XML_NOTICES} ${XML_NAVIGATION}
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
+		${XML_MIRRORS} ${XML_TRANSTABLE} \
+		${XML_ADVISORIES} ${XML_NOTICES} \
+		${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
diff --git a/ja/includes.xsl b/ja/includes.xsl
index 1e5acdfe30..c8746462ba 100644
--- a/ja/includes.xsl
+++ b/ja/includes.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD: www/ja/includes.xsl,v 1.21 2004/08/09 15:43:15 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/includes.xsl,v 1.22 2004/12/09 20:11:38 rushani Exp $ -->
 <!-- Original revision: 1.20 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -102,32 +102,32 @@
   <!-- template: "html-index-news-project-items-lastmodified" -->
 
   <xsl:template name="html-index-news-project-items-lastmodified">
-    <xsl:param name="news.project.xml" select="''" />
+    <xsl:param name="news.project.xml-master" select="''" />
 
-    <xsl:value-of select="document($news.project.xml)/descendant::year[position() = 1]/name"/>
+    <xsl:value-of select="document($news.project.xml-master)/descendant::year[position() = 1]/name"/>
     <xsl:text> ǯ </xsl:text>
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
-	<xsl:value-of select="document($news.project.xml)/descendant::month[position() = 1]/name"/>
+	<xsl:value-of select="document($news.project.xml-master)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select="document($news.project.xml)/descendant::day[position() = 1]/name"/>
+    <xsl:value-of select="document($news.project.xml-master)/descendant::day[position() = 1]/name"/>
     <xsl:text> Æü </xsl:text>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items-lastmodified" -->
 
   <xsl:template name="html-index-news-press-items-lastmodified">
-    <xsl:param name="news.press.xml" select="''" />
+    <xsl:param name="news.press.xml-master" select="''" />
 
-    <xsl:value-of select="document($news.press.xml)/descendant::year[position() = 1]/name"/>
+    <xsl:value-of select="document($news.press.xml-master)/descendant::year[position() = 1]/name"/>
     <xsl:text> ǯ </xsl:text>
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
-	<xsl:value-of select="document($news.press.xml)/descendant::month[position() = 1]/name"/>
+	<xsl:value-of select="document($news.press.xml-master)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
diff --git a/ja/index.xsl b/ja/index.xsl
index c9fe4c0d76..6b1343d1ce 100644
--- a/ja/index.xsl
+++ b/ja/index.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD: www/ja/index.xsl,v 1.37 2004/08/09 15:43:15 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/index.xsl,v 1.38 2004/12/09 19:48:57 rushani Exp $ -->
 <!-- Original revision: 1.100 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -10,7 +10,7 @@
 
   <xsl:variable name="base" select="'.'"/>
   <xsl:variable name="enbase" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/index.xsl,v 1.37 2004/08/09 15:43:15 hrs Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/index.xsl,v 1.38 2004/12/09 19:48:57 rushani Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <!-- these params should be externally bound. The values
@@ -18,7 +18,9 @@
   <xsl:param name="advisories.xml" select="'none'"/>
   <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
+  <xsl:param name="news.press.xml-master" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
+  <xsl:param name="news.project.xml-master" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
 
   <xsl:output type="html" encoding="EUC-JP"
@@ -32,7 +34,7 @@
 	<meta name="description" content="The FreeBSD Project"/>
 
 	<meta name="keywords" content="FreeBSD, BSD, UNIX, Support, Gallery,
-	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs, 
+	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
 	<link rel="icon" href="/favicon.ico" type="image/x-icon"/>
@@ -53,7 +55,7 @@
 		     alt="FreeBSD: ¤³¤Î¥Ñ¥ï¡¼¤ò¤¢¤Ê¤¿¤Î¤¿¤á¤Ë" border="0"/></a></td>
 
 	    <td align="right" valign="bottom">
-	      <form action="http://www.FreeBSD.org/cgi/mirror.cgi" 
+	      <form action="http://www.FreeBSD.org/cgi/mirror.cgi"
 		    method="get">
 
 		<br/>
@@ -63,7 +65,7 @@
 		<br/>
 
 		<select name="goto">
-		  <!--  Only list TRUE mirrors here! Native language pages 
+		  <!--  Only list TRUE mirrors here! Native language pages
 		        which are not mirrored should be listed in
 		        support.sgml.  -->
 
@@ -269,14 +271,15 @@
 			    <xsl:text> </xsl:text>
 			    <font color="#990000">(<a href="{$enbase}/news/news.rdf">RSS</a>)</font><br/>
 			    <font size="-1">
-			      ºÇ½ª¹¹¿·: 
+			      ºÇ½ª¹¹¿·:
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-project-items">
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
@@ -286,14 +289,15 @@
 			  <p><font size="+1" color="#990000"><b>FreeBSD Press</b></font><br/>
 
 			    <font size="-1">
-			      ºÇ½ª¹¹¿·: 
+			      ºÇ½ª¹¹¿·:
 			      <xsl:call-template name="html-index-news-press-items-lastmodified">
-				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-press-items">
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			      </xsl:call-template>
 
@@ -306,7 +310,7 @@
 			    <font color="#990000">(<a href="{$enbase}/security/advisories.rdf">RSS</a>)</font><br/>
 
 			    <font size="-1">
-			      ºÇ½ª¹¹¿·: 
+			      ºÇ½ª¹¹¿·:
 			      <xsl:call-template name="html-index-advisories-items-lastmodified">
 				<xsl:with-param name="advisories.xml" select="$advisories.xml" />
 				<xsl:with-param name="type" select="'advisory'" />
@@ -403,7 +407,7 @@
 		valign="top"><small><a href="{$base}/mailto.html">¤ªÌ䤤¹ç¤ï¤»Àè</a> : <a href="jabout.html">ÆüËܸ첽¤Ë¤Ä¤¤¤Æ</a><br/>
 		<xsl:value-of select="$date"/></small></td>
 
-	    <td align="right" 
+	    <td align="right"
 		valign="top"><small><a href="copyright/index.html">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a><br/> &#169; 1995-2004
 		The FreeBSD Project.<br/>
 		All rights reserved.</small></td>
diff --git a/ja/news/Makefile b/ja/news/Makefile
index 7d67325df5..41e1bb7700 100644
--- a/ja/news/Makefile
+++ b/ja/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/news/Makefile,v 1.34 2002/05/15 18:21:59 hrs Exp $
+# $FreeBSD: www/ja/news/Makefile,v 1.35 2003/09/21 17:18:14 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.38
 
@@ -37,22 +37,33 @@ SUBDIR+= 	1997
 #SUBDIR+=	status
 
 DATA=		newsflash.html press.html
-#+= news.rdf
 CLEANFILES+=	newsflash.html press.html
 
-newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
+newsflash.html: newsflash.xsl news.xml\
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
-news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
+news.rdf: news-rdf.xsl news.xml\
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
-press.html: press.xsl press.xml includes.xsl ../includes.xsl
+press.html: press.xsl press.xml\
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
@@ -60,5 +71,3 @@ press.html: press.xsl press.xml includes.xsl ../includes.xsl
 
 ### Revision checking
 REVCHECK=	YES
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/news/newsflash.xsl b/ja/news/newsflash.xsl
index 0374012efd..99e47794bd 100644
--- a/ja/news/newsflash.xsl
+++ b/ja/news/newsflash.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD: www/ja/news/newsflash.xsl,v 1.8 2003/07/08 18:19:54 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/news/newsflash.xsl,v 1.9 2003/11/03 11:41:05 rushani Exp $ -->
 <!-- Original revision: 1.9 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
@@ -16,6 +16,9 @@
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name="news.project.xml-master" select="'none'" />
+  <xsl:param name="news.project.xml" select="'none'" />
   
   <xsl:output type="html" encoding="EUC-JP"/>
 
@@ -64,54 +67,45 @@
 	<p>FreeBSD ¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="{$base}/security/#adv">
 	  ¥»¥­¥å¥ê¥Æ¥£¾ðÊó</a> ¤Î¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
 	
-	<xsl:apply-templates select="descendant::month"/>
-	
-	<p>Older announcements:
-	  <a href="{$enbase}/news/2002/index.html">2002</a>,
-	  <a href="{$enbase}/news/2001/index.html">2001</a>,
-	  <a href="2000/index.html">2000</a>,
-	  <a href="1999/index.html">1999</a>,
-	  <a href="1998/index.html">1998</a>,
-	  <a href="1997/index.html">1997</a>,
-	  <a href="1996/index.html">1996</a></p>
-	
+	<xsl:call-template name="html-news-list-newsflash">
+          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+	</xsl:call-template>
+
+        <xsl:call-template name="html-news-make-olditems-list" />
+
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1><xsl:value-of select="ancestor::year/name"/>
-      <xsl:text>ǯ </xsl:text>
-      <xsl:value-of select="name"/> ·î</h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
+  <!-- for l10n -->
+  <xsl:template name="html-news-datelabel">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+    <xsl:param name="day" />
+    <xsl:value-of select="concat($month, ' ', $day, ' Æü:')" />
   </xsl:template>
 
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
+  <!-- for l10n -->
+  <xsl:template name="html-news-month-headings">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
 
-	<b><xsl:value-of select="format-number(number(ancestor::year/name),'0000')"/>/<xsl:value-of select="format-number(number(ancestor::month/name),'00')"/>/<xsl:value-of select="format-number(number(ancestor::day/name),'00')"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
+    <xsl:value-of select="concat($year, ' ǯ ', $month)" />
   </xsl:template>
 
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
+  <xsl:template name="html-news-make-olditems-list">
+    <p>²áµî¤Î¥Ë¥å¡¼¥¹:
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
+  </xsl:template>
 
   <!-- When the href attribute contains a '$base', expand it to the current
        value of the $base variable. -->
diff --git a/ja/news/press.xsl b/ja/news/press.xsl
index 5258ef04fa..b43700a4ff 100644
--- a/ja/news/press.xsl
+++ b/ja/news/press.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
 <!--
-    $FreeBSD: www/ja/news/press.xsl,v 1.3 2002/07/30 12:43:21 hrs Exp $
+    $FreeBSD: www/ja/news/press.xsl,v 1.4 2003/11/03 11:41:05 rushani Exp $
     Original revision: 1.5
 -->
 
@@ -13,10 +13,21 @@
 
   <xsl:variable name="base" select="'..'"/>
   <xsl:variable name="title" select="'FreeBSD In The Press'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/news/press.xsl,v 1.3 2002/07/30 12:43:21 hrs Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/news/press.xsl,v 1.4 2003/11/03 11:41:05 rushani Exp $'"/>
+
+  <xsl:param name="news.press.xml-master" select="'none'" />
+  <xsl:param name="news.press.xml" select="'none'" />
   
   <xsl:output type="html" encoding="EUC-JP"/>
 
+  <!-- for l10n -->
+  <xsl:template name="html-news-month-headings">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+
+    <xsl:value-of select="concat($year, ' ǯ ', $month)" />
+  </xsl:template>
+
   <xsl:template match="press">
     <html>
       
@@ -35,43 +46,14 @@
 	  <a href="{$base}/java/press.html">FreeBSD/Java Press</a>
 	  ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
 	
-	<xsl:apply-templates select="//month"/>
-	
+	<xsl:call-template name="html-news-list-press">
+	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	</xsl:call-template>
+
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1><xsl:value-of select="ancestor::year/name"/> ǯ <xsl:value-of select="name"/> ·î</h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-      select="name"/></b></a><br/>
-	  
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/ru/Makefile b/ru/Makefile
index cd8eb71f2a..1d41b8db79 100644
--- a/ru/Makefile
+++ b/ru/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD$
+# $FreeBSD: www/ru/Makefile,v 1.41 2004/11/02 08:53:08 den Exp $
 # $FreeBSDru: frdp/www/ru/Makefile,v 1.38 2004/10/22 12:33:49 den Exp $
 #
 # Original revision: 1.114
@@ -82,7 +82,9 @@ CLEANFILES+=	index.html
 XML_NEWS_PRESS=		${XML_NEWS_PRESS_MASTER}
 
 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -91,7 +93,9 @@ index.html: index.xsl ${XML_INCLUDES}\
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
diff --git a/ru/index.xsl b/ru/index.xsl
index 4b0dc93cda..29f86f4192 100644
--- a/ru/index.xsl
+++ b/ru/index.xsl
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/index.xsl,v 1.22 2004/11/02 08:53:08 den Exp $
+     $FreeBSD: www/ru/index.xsl,v 1.23 2004/11/09 14:41:00 den Exp $
      $FreeBSDru: frdp/www/ru/index.xsl,v 1.38 2004/10/22 12:33:49 den Exp $
 
      Original revision: 1.116
@@ -15,7 +15,7 @@
   <xsl:import href="news/includes.xsl"/>
 
   <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ru/index.xsl,v 1.23 2004/11/09 14:41:00 den Exp $'"/>
   <xsl:variable name="title" select="'ðÒÏÅËÔ FreeBSD'"/>
 
   <!-- these params should be externally bound. The values
@@ -24,6 +24,8 @@
   <xsl:param name="notices.xml" select="'none'"/>
   <xsl:param name="mirrors.xml" select="'none'"/>
   <xsl:param name="news.press.xml" select="'none'"/>
+  <xsl:param name="news.press.xml-master" select="'none'"/>
+  <xsl:param name="news.project.xml-master" select="'none'"/>
   <xsl:param name="news.project.xml" select="'none'"/>
 
   <xsl:output type="html" encoding="koi8-r"
@@ -290,11 +292,12 @@
 			    <font size="-1">
 			      ðÏÓÌÅÄÎÉÅ ÉÚÍÅÎÅÎÉÑ: 
 			      <xsl:call-template name="html-index-news-project-items-lastmodified">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-project-items">
+				<xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
 				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			      </xsl:call-template>
 
@@ -306,12 +309,13 @@
 			    <font size="-1">
 			      ðÏÓÌÅÄÎÉÅ ÉÚÍÅÎÅÎÉÑ: 
 			      <xsl:call-template name="html-index-news-press-items-lastmodified">
-				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 			      </xsl:call-template>
 
 			      <br/>
 
 			      <xsl:call-template name="html-index-news-press-items">
+				<xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
 				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			      </xsl:call-template>
 
diff --git a/ru/news/Makefile b/ru/news/Makefile
index de95cb36d4..cccb21310d 100644
--- a/ru/news/Makefile
+++ b/ru/news/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: www/ru/news/Makefile,v 1.10 2004/04/09 12:08:13 phantom Exp $
 # The FreeBSD Russian Documentation Project
 # $FreeBSDru: frdp/www/ru/news/Makefile,v 1.10 2004/04/09 11:17:51 phantom Exp $
 # Original revision: 1.39
@@ -37,25 +37,31 @@ SUBDIR+=	status
 DATA=		newsflash.html news.rdf press.html
 CLEANFILES+=	newsflash.html news.rdf press.html
 
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 
 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
diff --git a/ru/news/newsflash.xsl b/ru/news/newsflash.xsl
index cb21c5b42b..03d3ff96bb 100644
--- a/ru/news/newsflash.xsl
+++ b/ru/news/newsflash.xsl
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: www/ru/news/newsflash.xsl,v 1.7 2004/04/09 11:57:33 phantom Exp $
      $FreeBSDru: frdp/www/ru/news/newsflash.xsl,v 1.12 2004/04/09 11:18:50 phantom Exp $
 
      Original revision: 1.11
@@ -74,16 +74,12 @@
 	<p>âÀÌÌÅÔÅÎÉ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ FreeBSD ÎÁÈÏÄÑÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ <a
 	  href="{$base}/security/#adv">éÎÆÏÒÍÁÃÉÉ Ï âÅÚÏÐÁÓÎÏÓÔÉ</a>.</p>
 
-	<xsl:apply-templates select="descendant::month"/>
+	<xsl:call-template name="html-news-list-newsflash">
+          <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+          <xsl:with-param name="news.project.xml" select="$news.project.xml" />
+	</xsl:call-template>
 
-	<p>áÎÏÎÓÙ ÐÒÏÛÌÙÈ ÌÅÔ:
-          <a href="2002/index.html">2002</a>,
-          <a href="2001/index.html">2001</a>,
-	  <a href="2000/index.html">2000</a>,
-	  <a href="1999/index.html">1999</a>,
-	  <a href="1998/index.html">1998</a>,
-	  <a href="1997/index.html">1997</a>,
-	  <a href="1996/index.html">1996</a></p>
+	<xsl:call-template name="html-news-make-olditems-list" />
 
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
@@ -91,53 +87,17 @@
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="day">
-    <xsl:apply-templates select="event"/>
+  <xsl:template name="html-news-make-olditems-list">
+    <p>áÎÏÎÓÙ ÐÒÏÛÌÙÈ ÌÅÔ:
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
   </xsl:template>
 
-  <xsl:template match="event">
-    <li><p><a>
-	  <xsl:attribute name="name">
-	    <xsl:call-template name="generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select="ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name="transtable-lookup">
-	    <xsl:with-param name="word-group" select="'number-month'" />
-	    <xsl:with-param name="word">
-	      <xsl:value-of select="ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select="p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the current
        value of the $base variable. -->
 
diff --git a/ru/news/press.xsl b/ru/news/press.xsl
index 5b14de9ca2..2899ca6e15 100644
--- a/ru/news/press.xsl
+++ b/ru/news/press.xsl
@@ -3,7 +3,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD$
+     $FreeBSD: www/ru/news/press.xsl,v 1.6 2004/04/09 11:56:13 phantom Exp $
      $FreeBSDru: frdp/www/ru/news/press.xsl,v 1.6 2004/04/09 10:59:01 phantom Exp $
 
      Original revision: 1.8
@@ -20,7 +20,10 @@
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
-  
+
+  <xsl:param name="news.press.xml-master" select="'none'" />
+  <xsl:param name="news.press.xml" select="'none'" />
+
   <xsl:output type="html" encoding="koi8-r"/>
 
   <xsl:template match="press">
@@ -40,14 +43,12 @@
           ÐÏÓÅÔÉ× ÓÔÒÁÎÉÞËÕ <a
           href="{$base}/java/press.html">FreeBSD/Java × ðÒÅÓÓÅ</a>.</p>
 
-	<xsl:apply-templates select="//month"/>
+	<xsl:call-template name="html-news-list-press">
+	  <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+	  <xsl:with-param name="news.press.xml" select="$news.press.xml" />
+	</xsl:call-template>
 
-	<p>ðÕÂÌÉËÁÃÉÉ ÐÒÏÛÌÙÈ ÌÅÔ:
-	  <a href="2002/press.html">2002</a>,
-	  <a href="2001/press.html">2001</a>,
-	  <a href="2000/press.html">2000</a>,
-	  <a href="1999/press.html">1999</a>,
-	  <a href="1998/press.html">1998-1996</a></p>
+	<xsl:call-template name="html-news-make-olditems-list" />
 
 	<xsl:copy-of select="$newshome"/>
 	<xsl:copy-of select="$footer"/>
@@ -55,43 +56,12 @@
     </html>
   </xsl:template>
 
-  <!-- Everything that follows are templates for the rest of the content -->
-  
-  <xsl:template match="month">
-    <h1>
-      <xsl:call-template name="transtable-lookup">
-	<xsl:with-param name="word-group" select="'number-month'" />
-	<xsl:with-param name="word">
-	  <xsl:value-of select="name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select="descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="story">
-    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
-    <xsl:variable name="site-url"><xsl:value-of
-    select="site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name="name">
-	  <xsl:call-template name="generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href="{$url}"><b><xsl:value-of
-      select="name"/></b></a><br/>
-	  
-	<a href="{$site-url}"><xsl:value-of
-	select="site-name"/></a>, <xsl:value-of select="author"/><br/>
-	<xsl:copy-of select="p/child::node()"/>
-      </p>
-    </li>
+  <xsl:template name="html-news-make-olditems-list">
+    <p>ðÕÂÌÉËÁÃÉÉ ÐÒÏÛÌÙÈ ÌÅÔ:
+      <a href="2002/press.html">2002</a>,
+      <a href="2001/press.html">2001</a>,
+      <a href="2000/press.html">2000</a>,
+      <a href="1999/press.html">1999</a>,
+      <a href="1998/press.html">1998-1996</a></p>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/share/sgml/includes.misc.xsl b/share/sgml/includes.misc.xsl
index b135deec7c..c435861d96 100644
--- a/share/sgml/includes.misc.xsl
+++ b/share/sgml/includes.misc.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.12 2004/06/27 08:28:21 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.misc.xsl,v 1.13 2004/06/27 19:18:00 simon Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
@@ -25,6 +25,13 @@
   <!--
      template name                               used in
 
+     html-news-list-newsflash                    news/newsflash.xsl
+     html-news-list-press                        news/press.xsl
+     html-news-list-datelabel                    news/newsflash.xsl (for l10n)
+     html-news-generate-anchor                   news/newsflash.xsl
+     html-news-make-olditems-list                news/newsflash.xsl (for l10n)
+     html-news-month-headings                    news/newsflash.xsl (for l10n)
+
      html-list-advisories                        security/mkindex.xsl
      html-list-advisories-putitems               security/mkindex.xsl
      html-list-advisories-release-label          security/mkindex.xsl (for l10n)
@@ -41,6 +48,248 @@
      html-index-mirrors-options-list             index.xsl
   -->
 
+  <!-- template: "html-news-make-olditems-list" -->
+  <xsl:template name="html-news-make-olditems-list">
+    <p>Old announcement:
+      <a href="2002/index.html">2002</a>,
+      <a href="2001/index.html">2001</a>,
+      <a href="2000/index.html">2000</a>,
+      <a href="1999/index.html">1999</a>,
+      <a href="1998/index.html">1998</a>,
+      <a href="1997/index.html">1997</a>,
+      <a href="1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <!-- template: "html-news-list-newsflash" -->
+  <xsl:template name="html-news-list-newsflash">
+    <xsl:param name="news.project.xml-master" select="'none'" />
+    <xsl:param name="news.project.xml" select="'none'" />
+
+    <xsl:for-each select="document($news.project.xml-master)//descendant::year">
+      <xsl:param name="year" select="name" />
+
+      <xsl:for-each select="month">
+	<xsl:param name="month" select="name" />
+
+	<h1>
+	  <!-- generate month headings -->
+	  <xsl:call-template name="html-news-month-headings">
+	    <xsl:with-param name="year" select="$year" />
+	    <xsl:with-param name="month">
+	      <xsl:call-template name="transtable-lookup">
+		<xsl:with-param name="word-group" select="'number-month'" />
+		<xsl:with-param name="word" select="$month" />
+	      </xsl:call-template>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</h1>
+
+	<ul>
+	  <xsl:for-each select="day">
+	    <xsl:param name="day" select="name" />
+	    <xsl:param name="index" select="position()" />
+
+	    <!-- search localized items per day basis -->
+	    <xsl:param name="localizeditems"
+	      select="document($news.project.xml)
+	              //descendant::year[name = $year]
+	              /month[name = $month]
+	              /day[name = $day and position() = $index]" />
+
+	    <xsl:choose>
+	      <xsl:when test="$localizeditems">
+		<!-- when localized item exists -->
+		<xsl:for-each select="$localizeditems/event">
+		  <xsl:param name="anchor-position" select="position()" />
+
+		  <li><p class="localized">
+		      <a><xsl:attribute name="name">
+			  <xsl:call-template name="html-news-generate-anchor">
+			    <xsl:with-param name="label" select="local-name()" />
+			    <xsl:with-param name="year" select="$year" />
+			    <xsl:with-param name="month" select="$month" />
+			    <xsl:with-param name="day" select="$day" />
+			    <xsl:with-param name="pos" select="$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <b><xsl:call-template name="html-news-datelabel">
+			  <xsl:with-param name="year" select="$year" />
+			  <xsl:with-param name="month">
+			    <xsl:call-template name="transtable-lookup">
+			      <xsl:with-param name="word-group" select="'number-month'" />
+			      <xsl:with-param name="word" select="$month" />
+			    </xsl:call-template>
+			  </xsl:with-param>
+			  <xsl:with-param name="day" select="$day" />
+			</xsl:call-template></b>
+		      <!-- put localized text -->
+		      <xsl:text> </xsl:text>
+		      <xsl:apply-templates select="p" />
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:when>
+
+	      <xsl:otherwise>
+		<!-- when localized item does not exist -->
+		<xsl:for-each select="event">
+		  <xsl:param name="anchor-position" select="position()" />
+
+		  <li><p class="original">
+		      <a><xsl:attribute name="name">
+			  <xsl:call-template name="html-news-generate-anchor">
+			    <xsl:with-param name="label" select="local-name()" />
+			    <xsl:with-param name="year" select="$year" />
+			    <xsl:with-param name="month" select="$month" />
+			    <xsl:with-param name="day" select="$day" />
+			    <xsl:with-param name="pos" select="$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <b><xsl:call-template name="html-news-datelabel">
+			  <xsl:with-param name="year" select="$year" />
+			  <xsl:with-param name="month">
+			    <xsl:call-template name="transtable-lookup">
+			      <xsl:with-param name="word-group" select="'number-month'" />
+			      <xsl:with-param name="word" select="$month" />
+			    </xsl:call-template>
+			  </xsl:with-param>
+			  <xsl:with-param name="day" select="$day" />
+			</xsl:call-template></b>
+		      <!-- put English text -->
+		      <xsl:text> </xsl:text>
+		      <xsl:apply-templates select="p" />
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:for-each>
+	</ul>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- template: "html-news-list-press" -->
+  <xsl:template name="html-news-list-press">
+    <xsl:param name="news.press.xml-master" select="'none'" />
+    <xsl:param name="news.press.xml" select="'none'" />
+
+    <xsl:for-each select="document($news.press.xml-master)//descendant::year">
+      <xsl:param name="year" select="name" />
+
+      <xsl:for-each select="month">
+	<xsl:param name="month" select="name" />
+
+	<h1>
+	  <!-- generate month headings -->
+	  <xsl:call-template name="html-news-month-headings">
+	    <xsl:with-param name="year" select="$year" />
+	    <xsl:with-param name="month">
+	      <xsl:call-template name="transtable-lookup">
+		<xsl:with-param name="word-group" select="'number-month'" />
+		<xsl:with-param name="word" select="$month" />
+	      </xsl:call-template>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</h1>
+
+	<ul>
+	  <xsl:for-each select="story">
+	    <xsl:variable name="url"><xsl:value-of select="url"/></xsl:variable>
+	    <xsl:variable name="site-url"><xsl:value-of select="site-url"/></xsl:variable>
+
+	    <!-- search localized items per story(URL) basis -->
+	    <xsl:param name="localizeditems"
+	      select="document($news.press.xml)
+	              //descendant::year[name = $year]
+	              /month[name = $month]
+	              /story[url = $url]" />
+
+	    <xsl:param name="anchor-position" select="position()" />
+
+	    <xsl:choose>
+	      <xsl:when test="$localizeditems">
+		<xsl:for-each select="$localizeditems">
+		  <li><p>
+		      <a><xsl:attribute name="name">
+			  <xsl:call-template name="html-news-generate-anchor">
+			    <xsl:with-param name="label" select="local-name()" />
+			    <xsl:with-param name="year" select="$year" />
+			    <xsl:with-param name="month" select="$month" />
+			    <xsl:with-param name="pos" select="$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
+		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
+		      <xsl:value-of select="author"/><br/>
+		      <xsl:copy-of select="p/child::node()"/>
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:when>
+
+	      <xsl:otherwise>
+		<xsl:for-each select=".">
+		  <li><p>
+		      <a><xsl:attribute name="name">
+			  <xsl:call-template name="html-news-generate-anchor">
+			    <xsl:with-param name="label" select="local-name()" />
+			    <xsl:with-param name="year" select="$year" />
+			    <xsl:with-param name="month" select="$month" />
+			    <xsl:with-param name="pos" select="$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+
+		      <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/>
+		      <a href="{$site-url}"><xsl:value-of select="site-name"/></a>,
+		      <xsl:value-of select="author"/><br/>
+		      <xsl:copy-of select="p/child::node()"/>
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:for-each>
+	</ul>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- template: "html-news-datelabel" (for l10n) -->
+  <xsl:template name="html-news-datelabel">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+    <xsl:param name="day" />
+
+    <xsl:value-of select="concat($day, ' ', $month, ', ', $year, ':')" />
+  </xsl:template>
+
+  <!-- template: "html-news-generate-anchor" (for l10n) -->
+  <xsl:template name="html-news-generate-anchor">
+    <xsl:param name="label" />
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+    <xsl:param name="day" />
+    <xsl:param name="pos" />
+
+    <xsl:value-of select="concat(
+      $label,
+      format-number($year, '0000'),
+      format-number($month, '00'))" />
+    <xsl:if test="$label = 'event'" >
+      <xsl:value-of select="format-number($day, '00')" />
+    </xsl:if>
+    <xsl:value-of select="format-number($pos, ':00')" />
+  </xsl:template>
+
+  <!-- template: "html-news-month-headings" (for l10n) -->
+  <xsl:template name="html-news-month-headings">
+    <xsl:param name="year" />
+    <xsl:param name="month" />
+
+    <xsl:value-of select="concat($month, ' ', $year)" />
+  </xsl:template>
+
   <!-- template: "html-list-advisories"
        generate a list of all security advisories -->
 
@@ -282,71 +531,135 @@
        pulls in the 5 most recent project items -->
 
   <xsl:template name="html-index-news-project-items">
-    <xsl:param name="news.project.xml" select="''" />
+    <xsl:param name="news.project.xml-master" select="'none'" />
+    <xsl:param name="news.project.xml" select="'none'" />
+
+    <xsl:for-each select="document($news.project.xml-master)/descendant::day[position() &lt;= 5]">
+      <xsl:param name="year" select="ancestor::year/name" />
+      <xsl:param name="month" select="ancestor::month/name" />
+      <xsl:param name="day" select="name" />
+
+      <!-- search localized items per day basis -->
+      <xsl:param name="localizeditems"
+	select="document($news.project.xml)
+	//descendant::year[name = $year]
+	/month[name = $month]
+	/day[name = $day]" />
+
+      <xsl:choose>
+	<xsl:when test="$localizeditems/event">
+	  <xsl:for-each select="$localizeditems/event">
+	    <xsl:value-of select="$leadingmark" /><a>
+	      <xsl:attribute name="href">
+		news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
+	      </xsl:attribute>
 
-    <xsl:for-each select="document($news.project.xml)/descendant::event[position() &lt;= 5]">
-      <xsl:value-of select="$leadingmark" /><a>
-	<xsl:attribute name="href">
-	  news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
-	</xsl:attribute>
-	<xsl:choose>
-	  <xsl:when test="count(child::title)">
-	    <xsl:value-of select="title"/><br/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="p"/><br/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </a>
+	      <xsl:choose>
+		<xsl:when test="count(child::title)">
+		  <xsl:value-of select="title"/><br/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select="p"/><br/>
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </a>
+	  </xsl:for-each>
+	</xsl:when>
+
+	<xsl:otherwise>
+	  <xsl:for-each select="event">
+	    <xsl:value-of select="$leadingmark" /><a>
+	      <xsl:attribute name="href">
+		news/newsflash.html#<xsl:call-template name="generate-event-anchor"/>
+	      </xsl:attribute>
+
+	      <xsl:choose>
+		<xsl:when test="count(child::title)">
+		  <xsl:value-of select="title"/><br/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select="p"/><br/>
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </a>
+	  </xsl:for-each>
+	</xsl:otherwise>
+      </xsl:choose>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-project-items-lastmodified" -->
 
   <xsl:template name="html-index-news-project-items-lastmodified">
-    <xsl:param name="news.project.xml" select="''" />
+    <xsl:param name="news.project.xml-master" select="''" />
 
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
-	<xsl:value-of select="document($news.project.xml)/descendant::month[position() = 1]/name"/>
+	<xsl:value-of select="document($news.project.xml-master)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select="document($news.project.xml)/descendant::day[position() = 1]/name"/>
+    <xsl:value-of select="document($news.project.xml-master)/descendant::day[position() = 1]/name"/>
     <xsl:text>, </xsl:text>
-    <xsl:value-of select="document($news.project.xml)/descendant::year[position() = 1]/name"/>
+    <xsl:value-of select="document($news.project.xml-master)/descendant::year[position() = 1]/name"/>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items"
        pulls in the 5 most recent press items -->
 
   <xsl:template name="html-index-news-press-items">
+    <xsl:param name="news.press.xml-master" select="'none'" />
     <xsl:param name="news.press.xml" select="''" />
 
-    <xsl:for-each select="document($news.press.xml)/descendant::story[position() &lt;= 5]">
-      <xsl:value-of select="$leadingmark" /><a>
+    <xsl:for-each select="document($news.press.xml-master)/descendant::story[position() &lt;= 5]">
+      <xsl:param name="year" select="../../year/name" />
+      <xsl:param name="month" select="../month/name" />
+      <xsl:param name="pos" select="position()" />
+      <xsl:param name="url" select="url" />
+      <xsl:param name="site-url" select="site-url" />
+
+      <!-- search localized items per story(URL) basis -->
+      <xsl:param name="localizeditems"
+	select="document($news.press.xml)
+	//descendant::year[name = $year]
+	/month[name = $month]
+	/story[url = $url]" />
+
+      <xsl:value-of select="$leadingmark" />
+      <a>
 	<xsl:attribute name="href">
 	  news/press.html#<xsl:call-template name="generate-story-anchor"/>
 	</xsl:attribute>
-	<xsl:value-of select="name"/>
-      </a><br/>
+
+	<xsl:choose>
+	  <xsl:when test="$localizeditems">
+	    <xsl:value-of select="$localizeditems/name"/>
+	  </xsl:when>
+
+	  <xsl:otherwise>
+	    <xsl:value-of select="name"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </a>
+
+      <br/>
     </xsl:for-each>
   </xsl:template>
 
   <!-- template: "html-index-news-press-items-lastmodified" -->
 
   <xsl:template name="html-index-news-press-items-lastmodified">
-    <xsl:param name="news.press.xml" select="''" />
+    <xsl:param name="news.press.xml-master" select="''" />
 
     <xsl:call-template name="transtable-lookup">
       <xsl:with-param name="word-group" select="'number-month'" />
       <xsl:with-param name="word">
-	<xsl:value-of select="document($news.press.xml)/descendant::month[position() = 1]/name"/>
+	<xsl:value-of select="document($news.press.xml-master)/descendant::month[position() = 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select="document($news.press.xml)/descendant::year[position() = 1]/name"/>
+    <xsl:value-of select="document($news.press.xml-master)/descendant::year[position() = 1]/name"/>
   </xsl:template>
 
   <!-- template: "html-index-navigation-link-list"