From owner-svn-doc-projects@FreeBSD.ORG  Fri Aug 24 10:52:18 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 606BC106566C;
	Fri, 24 Aug 2012 10:52:18 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 46E2E8FC0C;
	Fri, 24 Aug 2012 10:52:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7OAqIhu023158;
	Fri, 24 Aug 2012 10:52:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7OAqILp023150;
	Fri, 24 Aug 2012 10:52:18 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201208241052.q7OAqILp023150@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 24 Aug 2012 10:52:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39430 - in projects/sgml2xml:
	de_DE.ISO8859-1/share/sgml el_GR.ISO8859-7/share/sgml
	es_ES.ISO8859-1/share/sgml fr_FR.ISO8859-1/share/sgml
	hu_HU.ISO8859-2/share/sgml it_IT.ISO8859-15/sh...
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 10:52:18 -0000

Author: gabor
Date: Fri Aug 24 10:52:17 2012
New Revision: 39430
URL: http://svn.freebsd.org/changeset/doc/39430

Log:
  - Properly localize navibar entities
  - Fix enntities of beta releases
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent
  projects/sgml2xml/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent
  projects/sgml2xml/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent
  projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent
  projects/sgml2xml/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent
  projects/sgml2xml/ja_JP.eucJP/share/sgml/navibar.l10n.ent
  projects/sgml2xml/nl_NL.ISO8859-1/share/sgml/navibar.l10n.ent
  projects/sgml2xml/ru_RU.KOI8-R/share/sgml/navibar.l10n.ent
  projects/sgml2xml/share/sgml/navibar.ent
  projects/sgml2xml/tr_TR.ISO8859-9/share/sgml/navibar.l10n.ent
  projects/sgml2xml/zh_CN.GB2312/share/sgml/navibar.l10n.ent
  projects/sgml2xml/zh_TW.Big5/share/sgml/navibar.l10n.ent

Modified: projects/sgml2xml/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/de_DE.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -5,9 +5,8 @@
   basiert auf: 1.37
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigation-Menü</h2>
 <ul>
 <li><a href="&base;/about.html">Über FreeBSD</a></li>
@@ -27,12 +26,11 @@
 <li><a href="&enbase;/copyright/">Rechtliches</a></li>
 <li><a href="&enbase;/privacy.html">Privacy Policy</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">Community</a></li>
@@ -45,12 +43,11 @@
 <li><a href="&base;/community/webresources.html">Internetressourcen</a></li>
 <li><a href="&enbase;/community/social.html">Soziale Netzwerke</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/projects/index.html">Entwicklung</a></li>
@@ -62,12 +59,11 @@
 <li><a href="http://wiki.FreeBSD.org/IdeasPage">Projektvorschläge</a></li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">FreeBSD unterstützen</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">Dokumentation</a></li>
@@ -81,12 +77,25 @@
 <li><a href="&base;/docproj/">Documentation Project</a></li>
 <li><a href="https://doc.bsdgroup.de/index.html">German Documentation Project</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Testversion: &betarel.current;</a></li>
+'>
 ]]>
+<!ENTITY beta.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Testversion: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">FreeBSD Bezugsquellen</a></li>
@@ -94,25 +103,19 @@
 	<ul>
 		<li>Produktivversion: <a href="&u.rel.announce;">&rel.current;</a>
 		  <a href="&u.rel2.announce;">&rel2.current;</a></li>
-		<li>Alte Produktivversion:<br> <a href="&u.rel3.announce;">&rel3.current;</a></li>
+		<li>Alte Produktivversion:<br/> <a href="&u.rel3.announce;">&rel3.current;</a></li>
 		<li><a href="&base;/snapshots/">Snapshots</a></li>
-	      <![ %beta.testing; [
-		<li><a href="&u.betarel.schedule;">Testversion: &betarel.current;</a></li>
-              ]]>
-	      <![ %beta2.testing; [
-                <li><a href="&u.betarel2.schedule;">Testversion: &betarel2.current;</a></li>
-              ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&base;/ports/">Anwendungen (Ports)</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/ports/index.html">Allgemeines</a></li>
@@ -127,12 +130,11 @@
     <li><a href="&base;/ports/master-index.html">Alle Ports</a></li>
     <li><a href="&base;/ports/references.html">Weitere Informationen</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">Hilfe</a></li>
@@ -158,5 +160,5 @@
 </li>
 <li><a href="&base;/support/webresources.html">Internet-Ressourcen</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>

Modified: projects/sgml2xml/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/el_GR.ISO8859-7/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -7,10 +7,8 @@
   %SRCID%	1.27
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -30,13 +28,11 @@
     <li><a href="&base;/donations/">ÄůńĺÝň</a></li>
     <li><a href="&base;/copyright/">ĐíĺőěáôéęÜ Äéęáéţěáôá</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -50,13 +46,11 @@
     <li><a href="&base;/community/webresources.html">ĐçăÝň Web</a></li>
     <li><a href="&base;/community/social.html">ĘďéíůíéęÜ Äßęôőá</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -69,13 +63,11 @@
     <li><a href="&base;/projects/ideas/">ÉäÝĺň ăéá ÁíÜđôőîç</a></li>
     <li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Đţň íá ÓőíĺéóöÝńĺôĺ</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -89,13 +81,25 @@
     <li><a href="&base;/projects/newbies.html">Ăéá ÍÝďőň ×ńŢóôĺň</a></li>
     <li><a href="&base;/docproj/">ĎěÜäá Ôĺęěçńßůóçň</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Ç Ĺđüěĺíç ¸ęäďóç: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Ç Ĺđüěĺíç ¸ęäďóç: &betarel2.current;</a></li>
+'>
 ]]>
+<!ENTITY beta2.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
   <ul>
     <li><a href="&base;/where.html">ĘáôĺâÜóôĺ ôď FreeBSD</a></li>
@@ -104,22 +108,16 @@
         <li><a href="&u.rel.announce;">ÓôáčĺńŢ ¸ęäďóç: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">ÓôáčĺńŢ ¸ęäďóç (Legacy): &rel2.current;</a></li>
         <li><a href="&base;/snapshots/">Ĺęäüóĺéň Snapshot</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">Ç Ĺđüěĺíç ¸ęäďóç: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">Ç Ĺđüěĺíç ¸ęäďóç: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&base;/ports/">ĹöáńěďăÝň ăéá FreeBSD</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -143,13 +141,11 @@
         <li><a href="&base;/gnome/docs/faq226.html#q4">ĂíůóôÜ ĐńďâëŢěáôá</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
   <ul>
     <li><a href="&base;/ports/index.html">Đëçńďöďńßĺň ăéá ôá ports</a></li>
@@ -164,13 +160,11 @@
     <li><a href="&base;/ports/master-index.html">Ëßóôá źëůí ôůí Ports</a></li>
     <li><a href="&base;/ports/references.html">Đĺńéóóüôĺńĺň Đëçńďöďńßĺň</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Đĺńéĺ÷üěĺíá ÔěŢěáôďň</h2>
 
   <ul>
@@ -193,5 +187,5 @@
       </ul></li>
     <li><a href="&base;/support/webresources.html">ĐçăÝň Web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>

Modified: projects/sgml2xml/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/es_ES.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -4,10 +4,8 @@
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.20					-->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
 
   <ul>
@@ -26,13 +24,11 @@
     <li><a href="&enbase;/donations/">Donaciones</a></li>
     <li><a href="&base;/copyright/">Copyright</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por sección</h2>
 
   <ul>
@@ -44,13 +40,11 @@
     <li><a href="&enbase;/events/events.html">Eventos</a></li>
     <li><a href="&enbase;/community/webresources.html">Recursos web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
 
   <ul>
@@ -63,20 +57,18 @@
     <li><a href="&enbase;/projects/ideas/">Ideas de proyectos</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/articles/contributing/index.html">Contribuir a FreeBSD</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
 
   <ul>
     <li><a href="&base;/docs.html">Documentación</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/books/faq/">FAQ</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/books/handbook/">Manual de FreeBSD</a></li>
-    <li><a href="&cgibase;/man.cgi">Manuales en línea</a>
+    <li><a href="&cgibase;/man.cgi">Manuales en línea</a></li>
     <li><a href="&enbase;/docs/books.html">Libros y artículos en línea</a></li>
     <li><a href="&base;/publish.html">Publicaciones</a></li>
     <li><a href="&enbase;/docs/webresources.html">Recursos web</a></li>
@@ -84,13 +76,25 @@
     <li><a href="&base;/docproj/">Proyecto de documentación</a></li>
     <li><a href="&enbase;/doc/es_ES.ISO8859-1/articles/fdp-es/">Proyecto de documentación en castellano</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Próxima release: &betarel.current;</a></li>
+'>
 ]]>
+<!ENTITY beta.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Próxima release: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
   <ul>
     <li><a href="&base;/where.html">Descargar</a></li>
@@ -99,22 +103,16 @@
         <li><a href="&u.rel.announce;">Release stable: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">Release stable (heredera): &rel2.current;</a></li>
         <li><a href="&enbase;/snapshots/">Instantáneas:</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">Próxima release: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">Próxima release: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&enbase;/ports/">Aplicaciones portadas</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
 
   <ul>
@@ -138,13 +136,11 @@
         <li><a href="&base;/gnome/docs/faq222.html#q4">Problemas conocidos</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
   <ul>
     <li><a href="&base;/ports/index.html">Sobre los ports</a></li>
@@ -159,13 +155,11 @@
     <li><a href="&base;/ports/master-index.html">Lista de todos los ports</a></li>
     <li><a href="&base;/ports/references.html">Más información</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div xmlns="http://www.w3.org/1999/xhtml" id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Navegación por secciones</h2>
 
   <ul>
@@ -178,15 +172,15 @@
       <li><a href="&enbase;/commercial/isp.html">ISP</a></li>
       <li><a href="&enbase;/commercial/misc.html">Otros</a></li>
     </ul></li>
-    <li><a href="&base;/security/index.html">Información de seguridad</a></li>
-    <li><ul>
+    <li><a href="&base;/security/index.html">Información de seguridad</a>
+    <ul>
       <li><a href="&base;/security/advisories.html">Avisos</a></li>
     </ul></li>
     <li><a href="&enbase;/support/bugreports.html">Informes de error</a>
-      <li><ul>
+      <ul>
         <li><a href="&base;/send-pr.html">Enviar un informe de error</a></li>
       </ul></li>
     <li><a href="&enbase;/support/webresources.html">Recursos web</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>

Modified: projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/about.html">A propos</a></li>
@@ -20,12 +19,11 @@
 <li><a href="&base;/donations/">Donations</a></li>
 <li><a href="&base;/copyright/">Informations légales</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/community.html">Communauté</a></li>
@@ -35,12 +33,11 @@
 <li><a href="&enbase;/usergroups.html">Groupes d&apos;utilisateurs</a></li>
 <li><a href="&base;/community/webresources.html">Ressources Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/projects/index.html">Développement</a></li>
@@ -64,12 +61,11 @@
 </li>
 <li><a href="&enbase;/doc/&url.doc.langcode;/articles/contributing/index.html">Contribuer</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/docs.html">Documentation</a></li>
@@ -86,12 +82,25 @@
 <li><a href="&base;/projects/newbies.html">Pour les débutants</a></li>
 <li><a href="&base;/docproj/">Projet de Documentation</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Version ŕ venir: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Version ŕ venir: &betarel2.current;</a></li>
+'>
 ]]>
+<!ENTITY beta2.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/where.html">Obtenir FreeBSD</a></li>
@@ -100,22 +109,17 @@
 		<li><a href="&enbase;/&u.rel.announce;">Version de production: &rel.current;</a></li>
 		<li><a href="&enbase;/&u.rel2.announce;">Version (ancienne) de production: &rel2.current;</a></li>
 		<li><a href="&base;/snapshots/">Instantanés</a></li>
-	      <![ %beta.testing; [
-		<li><a href="&u.betarel.schedule;">Version &agrave; venir: &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [
-		<li><a href="&u.betarel2.schedule;">Version &agrave; venir: &betarel2.current;</a></li>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">Applications disponibles</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
@@ -137,12 +141,11 @@
 		<li><a href="&enbase;/gnome/docs/faq214.html#q5">Problčmes connus</a></li>
 	</ul></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/ports/index.html">Ŕ propos des ports</a></li>
@@ -156,14 +159,13 @@
 	</ul>
 </li>
 <li><a href="&base;/ports/master-index.html">Liste de Tous les Ports</a></li>
-<li><a href="&base;/ports/references.html">Pour Plus d'Informations</a></li>
+<li><a href="&base;/ports/references.html">Pour Plus d&apos;Informations</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Section Navigation</h2>
 <ul>
 <li><a href="&base;/support.html">Support</a></li>
@@ -184,5 +186,5 @@
 </li>
 <li><a href="&base;/support.html#general">Ressources Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>

Modified: projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -7,10 +7,8 @@
      %SRCID%	1.31
 -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
@@ -30,13 +28,11 @@
     <li><a href="&enbase;/donations/">Adományok</a></li>
     <li><a href="&base;/copyright/">Jogi megjegyzések</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
@@ -50,13 +46,11 @@
     <li><a href="&base;/community/webresources.html">Webes források</a></li>
     <li><a href="&enbase;/community/social.html">Ismertségi hálózatok</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
@@ -69,20 +63,18 @@
     <li><a href="&enbase;/projects/ideas/">Projektötletek</a></li>
     <li><a href="&enbase;/doc/en/articles/contributing/index.html">Hozzájárulás</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
     <li><a href="&base;/docs.html">Dokumentáció</a></li>
     <li><a href="&enbase;/doc/hu/books/faq/">GYIK</a></li>
     <li><a href="&enbase;/doc/hu/books/handbook/">Kézikönyv</a></li>
-    <li><a href="&cgibase;/man.cgi">Man oldalak</a>
+    <li><a href="&cgibase;/man.cgi">Man oldalak</a></li>
     <li><a href="&base;/docs/books.html">Könyvek és cikkek</a></li>
     <li><a href="&enbase;/publish.html">Publikációk</a></li>
     <li><a href="&base;/docs/webresources.html">Webes források</a></li>
@@ -90,13 +82,25 @@
     <li><a href="&base;/docproj/">Dokumentációs Projekt</a></li>
     <li><a href="&base;/docproj/hungarian.html">A Magyar Dokumentációs Projekt</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Következő kiadás: &betarel.current;</a></li>
+'>
 ]]>
+<!ENTITY beta.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Következő kiadás: &betarel2.current;</a></li>
+'>
+]]>
+<!ENTITY beta2.listitem ''>
+
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
   <ul>
     <li><a href="&base;/where.html">A &os; letöltése</a></li>
@@ -105,22 +109,16 @@
         <li><a href="&u.rel.announce;">Stabil kiadás: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">Stabil (kifutó) kiadás: &rel2.current;</a></li>
         <li><a href="&enbase;/snapshots/">Béta (időközi) kiadások</a></li>
-<![ %beta.testing; [
-        <li><a href="&u.betarel.schedule;">Következő kiadás: &betarel.current;</a></li>
-]]>
-<![ %beta2.testing; [
-        <li><a href="&u.betarel2.schedule;">Következő kiadás: &betarel2.current;</a></li>
-]]>
+	&beta.listitem;
+	&beta2.listitem;
       </ul></li>
     <li><a href="&enbase;/ports/">Portolt alkalmazások</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.gnome "IGNORE">
-<![ %navinclude.gnome; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.gnome '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
@@ -144,13 +142,11 @@
         <li><a href="&base;/gnome/docs/faq232.html#q4">Ismert problémák</a></li>
       </ul></li>
     </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.ports "IGNORE">
-<![ %navinclude.ports; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.ports '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
   <ul>
     <li><a href="&base;/ports/index.html">A portokról</a></li>
@@ -165,13 +161,11 @@
     <li><a href="&base;/ports/master-index.html">Az összes port</a></li>
     <li><a href="&base;/ports/references.html">Bővebb információ</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.support "IGNORE">
-<![ %navinclude.support; [
-<!ENTITY nav '
-<div id="SIDENAV">
+<!ENTITY nav.support '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Fejezetek közti navigáció</h2>
 
   <ul>
@@ -186,19 +180,17 @@
 	<li><a href="&enbase;/commercial/misc.html">Egyéb</a></li>
       </ul>
     </li>
-    <li><a href="&base;/security/index.html">Biztonsági tudnivalók</a></li>
-    <li>
+    <li><a href="&base;/security/index.html">Biztonsági tudnivalók</a>
       <ul>
 	<li><a href="&base;/security/advisories.html">Biztonsági figyelmeztetések</a></li>
       </ul>
     </li>
     <li><a href="&base;/support/bugreports.html">Hibajelentések</a>
-    <li>
       <ul>
 	<li><a href="&base;/send-pr.html">Hibajelentések küldése</a></li>
       </ul>
     </li>
     <li><a href="&base;/support/webresources.html">Webes források</a></li>
   </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>

Modified: projects/sgml2xml/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent
==============================================================================
--- projects/sgml2xml/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent	Fri Aug 24 10:47:48 2012	(r39429)
+++ projects/sgml2xml/it_IT.ISO8859-15/share/sgml/navibar.l10n.ent	Fri Aug 24 10:52:17 2012	(r39430)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % navinclude.about "IGNORE">
-<![ %navinclude.about; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.about '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Sezione di Navigazione</h2>
 <ul>
 <li><a href="&base;/about.html">Info</a></li>
@@ -20,12 +19,11 @@
 <li><a href="&enbase;/donations/">Donazioni</a></li>
 <li><a href="&base;/copyright/">Note Legali</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.community "IGNORE">
-<![ %navinclude.community; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.community '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&base;/community.html">Comunitŕ</a></li>
@@ -35,12 +33,11 @@
 <li><a href="&enbase;/usergroups.html">Gruppi Utenti</a></li>
 <li><a href="&enbase;/community/webresources.html">Risorse Web</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.developers "IGNORE">
-<![ %navinclude.developers; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.developers '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&enbase;/projects/index.html">Sviluppo</a></li>
@@ -65,12 +62,11 @@
 <li><a href="&enbase;/projects/ideas/">Idee</a></li>
 <li><a href="&enbase;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contribuire</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
+</div> <!-- SIDENAV -->
+'>
 
-<!ENTITY % navinclude.docs "IGNORE">
-<![ %navinclude.docs; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.docs '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Sezione di Navigazione</h2>
 <ul>
 <li><a href="&base;/docs.html">Documentazione</a></li>
@@ -89,12 +85,25 @@
 <li><a href="&enbase;/projects/newbies.html">Per i Neofiti</a></li>
 <li><a href="&enbase;/docproj/">Documentation Project</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
+</div> <!-- SIDENAV -->
+'>
+
+<![ %beta.testing; [
+<!ENTITY beta.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&enbase;/&u.betarel.schedule;">Prossima Release: &betarel.current;</a></li>
+'>
+]]>
+<!ENTITY beta.listitem ''>
+
+<![ %beta2.testing; [
+<!ENTITY beta2.listitem '
+  <li xmlns="http://www.w3.org/1999/xhtml"><a href="&u.betarel2.schedule;">Prossima Release: &betarel2.current;</a></li>
+'>
 ]]>
+<!ENTITY beta2.listitem ''>
 
-<!ENTITY % navinclude.download "IGNORE">
-<![ %navinclude.download; [
-<!ENTITY nav '<div id="SIDENAV">
+<!ENTITY nav.download '
+<div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
 <h2 class="blockhide">Navigazione della Sezione</h2>
 <ul>
 <li><a href="&base;/where.html">Ottenere FreeBSD</a></li>
@@ -103,26 +112,17 @@
 		<li><a href="&u.rel.announce;">Release di Produzione: &rel.current;</a></li>
 		<li><a href="&u.rel2.announce;">Release di Produzione (Legacy): &rel2.current;</a></li>
 		<li><a href="&enbase;/snapshots/">Snapshot delle Release</a></li>
-	      <![ %beta.testing; [
-		<li><a href="&u.betarel.schedule;">Prossima Release: &betarel.current;</a></li>
-	      ]]>
-	      <![ %beta2.testing; [
-		<li><a href="&u.betarel2.schedule;">Prossima Release: &betarel2.current;</a></li>
-	      ]]>
+		&beta.listitem;
+		&beta2.listitem;
 	</ul>
 </li>
 <li><a href="&enbase;/ports/">Applicazioni Portate</a></li>
 </ul>
-</div> <!-- SIDENAV -->'>
-]]>
-
-<!ENTITY % navinclude.gnome "IGNORE">

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***