Revise local menu handling

3 months ago · 06f757c6ab
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 localmenuinfo.en.xml
 d_year.en.xml
 d_month.en.xml
 d_day.en.xml
 .default.xsl
 tools/.texts-??.xml
 .fundraising.??.xml
 .localmenu.*.xml
 .*.xmllist
 tags/tagged-*.en.xhtml
 tags/.tags.??.xml
--- a/+ 4
+++ b/+ 4
@@ -60,21 +60,10 @@ $(SUBDIRS): .FORCE
 # Handle local menus
 # -----------------------------------------------------------------------------

 # FIXME: This runs when the makefile is parsed, before maybe new *.xhtml files
 # are created in the news/<year>/ and events/<year>/ directories. It would be
 # better to move this into a separate script tools/update-localmenus.sh. It
 # would also be better if there was a separate .localmenu.en.xml file for each
 # directory.
 MENUSOURCES := $(shell find -name '*.xhtml' -not -name "*-template.*" | xargs grep -l '<localmenu.*</localmenu>' | sort)

 all: localmenuinfo.en.xml
 localmenuinfo.en.xml: ./tools/buildmenu.xsl $(MENUSOURCES)
 	{ printf '<localmenuset>'; \
 	  grep -E '<localmenu.*</localmenu>' $^ \
          | sed -r 's;(.*/)?(.+)\.([a-z][a-z])\.xhtml:(.+);\
                    <menuitem language="\3"><dir>/\1</dir><link>\2.html</link>\4</menuitem>;'; \
 	  printf '</localmenuset>'; \
 	} | xsltproc -o $@ $< -
 .PHONY: localmenus
 all: localmenus
 localmenus: $(SUBDIRS)
 	tools/update_localmenus.sh

 # -----------------------------------------------------------------------------
 # Timestamp files for regular jobs and XML inclusion in various places
--- a/about/funds/2001.en.xhtml
+++ b/about/funds/2001.en.xhtml
@@ -9,8 +9,7 @@

  <body>
   
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2001">2001</localmenu>
 <localmenu set="year" id="2001">2001</localmenu>

 <h1>FSFE - Income and Expense 2001</h1>

--- a/about/funds/2001.fr.xhtml
+++ b/about/funds/2001.fr.xhtml
@@ -9,8 +9,7 @@

  <body>
   
     <localmenu set="return"/>
 <localmenu set="year" style="number" id="2001">2001</localmenu>
 <localmenu set="year" id="2001">2001</localmenu>

 <h1>FSFE - Recettes et dépenses 2001</h1>

--- a/about/funds/2001.it.xhtml
+++ b/about/funds/2001.it.xhtml
@@ -9,8 +9,7 @@

  <body>
   
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2001">2001</localmenu>
 <localmenu set="year" id="2001">2001</localmenu>

 <h1>FSFE - Entrate e uscite 2001</h1>

--- a/about/funds/2001.nl.xhtml
+++ b/about/funds/2001.nl.xhtml
@@ -9,8 +9,7 @@

      <body>
       
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2001">2001</localmenu>
    <localmenu set="year" id="2001">2001</localmenu>

    <h1>FSFE - Inkomsten en uitgaven 2001</h1>

--- a/about/funds/2001.ru.xhtml
+++ b/about/funds/2001.ru.xhtml
@@ -9,8 +9,7 @@

  <body>
   
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2001">2001</localmenu>
 <localmenu set="year" id="2001">2001</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2001 год</h1>

--- a/about/funds/2002.en.xhtml
+++ b/about/funds/2002.en.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2002">2002</localmenu>
 <localmenu set="year" id="2002">2002</localmenu>

 <h1>FSFE - Income and Expense 2002</h1>

--- a/about/funds/2002.fr.xhtml
+++ b/about/funds/2002.fr.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2002">2002</localmenu>

 <h1>FSFE - Recettes et dépenses 2002</h1>

--- a/about/funds/2002.it.xhtml
+++ b/about/funds/2002.it.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2002">2002</localmenu>
 <localmenu set="year" id="2002">2002</localmenu>

 <h1>FSFE - Entrate e uscite 2002</h1>

--- a/about/funds/2002.ru.xhtml
+++ b/about/funds/2002.ru.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2002">2002</localmenu>
 <localmenu set="year" id="2002">2002</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2002 год</h1>

--- a/about/funds/2003.de.xhtml
+++ b/about/funds/2003.de.xhtml
@@ -8,8 +8,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Einnahmen und Ausgaben 2003</h1>

--- a/about/funds/2003.el.xhtml
+++ b/about/funds/2003.el.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Έσοδα και Έξοδα 2003</h1>

--- a/about/funds/2003.en.xhtml
+++ b/about/funds/2003.en.xhtml
@@ -9,8 +9,7 @@

  <body>
    
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2003">2003</localmenu> 
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Income and Expense 2003</h1>

--- a/about/funds/2003.fr.xhtml
+++ b/about/funds/2003.fr.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Recettes et dépenses 2003</h1>

--- a/about/funds/2003.it.xhtml
+++ b/about/funds/2003.it.xhtml
@@ -9,8 +9,7 @@

  <body>
    
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2003">2003</localmenu> 
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Entrate e uscite 2003</h1>

--- a/about/funds/2003.nl.xhtml
+++ b/about/funds/2003.nl.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>FSFE - Inkomsten en uitgaven 2003</h1>

--- a/about/funds/2003.ru.xhtml
+++ b/about/funds/2003.ru.xhtml
@@ -9,8 +9,7 @@

  <body>
    
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2003">2003</localmenu> 
 <localmenu set="year" id="2003">2003</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2003 год</h1>

--- a/about/funds/2004.de.xhtml
+++ b/about/funds/2004.de.xhtml
@@ -8,8 +8,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>Einnahmen und Ausgaben 2004</h1>

--- a/about/funds/2004.el.xhtml
+++ b/about/funds/2004.el.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>FSFE - Έσοδα και Έξοδα 2004</h1>

--- a/about/funds/2004.en.xhtml
+++ b/about/funds/2004.en.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2004">2004</localmenu>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>FSFE - Income and Expense 2004</h1>

--- a/about/funds/2004.fr.xhtml
+++ b/about/funds/2004.fr.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>FSFE - Recettes et dépenses 2004</h1>

--- a/about/funds/2004.it.xhtml
+++ b/about/funds/2004.it.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2004">2004</localmenu>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>FSFE - Entrate e uscite 2004</h1>

--- a/about/funds/2004.nl.xhtml
+++ b/about/funds/2004.nl.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2004">2004</localmenu>

    <h1>FSFE - Inkomsten en uitgaven 2004</h1>

--- a/about/funds/2004.ru.xhtml
+++ b/about/funds/2004.ru.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2004">2004</localmenu>
 <localmenu set="year" id="2004">2004</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2004 год</h1>

--- a/about/funds/2005.de.xhtml
+++ b/about/funds/2005.de.xhtml
@@ -8,8 +8,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>Einkommen und Ausgaben 2005</h1>

--- a/about/funds/2005.el.xhtml
+++ b/about/funds/2005.el.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>FSFE - Έσοδα και Έξοδα 2005</h1>

--- a/about/funds/2005.en.xhtml
+++ b/about/funds/2005.en.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2005">2005</localmenu>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>FSFE - Income and Expense 2005</h1>

--- a/about/funds/2005.fr.xhtml
+++ b/about/funds/2005.fr.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>FSFE - Recettes et dépenses 2005</h1>

--- a/about/funds/2005.it.xhtml
+++ b/about/funds/2005.it.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2005">2005</localmenu>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>FSFE - Entrate e uscite 2005</h1>

--- a/about/funds/2005.nl.xhtml
+++ b/about/funds/2005.nl.xhtml
@@ -9,8 +9,7 @@

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>FSFE - Inkomsten en uitgaven 2005</h1>

--- a/about/funds/2005.ru.xhtml
+++ b/about/funds/2005.ru.xhtml
@@ -9,8 +9,7 @@

  <body>

 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2005">2005</localmenu>
 <localmenu set="year" id="2005">2005</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2005 год</h1>

--- a/about/funds/2006.de.xhtml
+++ b/about/funds/2006.de.xhtml
@@ -7,9 +7,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2006">2006</localmenu>

    <h1>FSFE - Einnahmen und Ausgaben 2006</h1>

--- a/about/funds/2006.el.xhtml
+++ b/about/funds/2006.el.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2006">2006</localmenu>

    <h1>FSFE - Έσοδα και Έξοδα 2006</h1>

--- a/about/funds/2006.en.xhtml
+++ b/about/funds/2006.en.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2006">2006</localmenu>
    <localmenu set="year" id="2006">2006</localmenu>

    <h1>FSFE - Income and Expense 2006</h1>

--- a/about/funds/2006.fr.xhtml
+++ b/about/funds/2006.fr.xhtml
@@ -8,11 +8,9 @@
  </head>

  <body>
    <localmenu set="year" id="2006">2006</localmenu>

    <localmenu set="return"/>
    <localmenu set="year"/>

 <h1>FSFE - Recettes et dépenses 2006</h1>
    <h1>FSFE - Recettes et dépenses 2006</h1>

    <table>
      <tr>
--- a/about/funds/2006.it.xhtml
+++ b/about/funds/2006.it.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2006">2006</localmenu>
    <localmenu set="year" id="2006">2006</localmenu>

    <h1>FSFE - Entrate e uscite 2006</h1>

--- a/about/funds/2006.nl.xhtml
+++ b/about/funds/2006.nl.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2006">2006</localmenu>

    <h1>FSFE - Inkomsten en uitgaven 2006</h1>

--- a/about/funds/2006.ru.xhtml
+++ b/about/funds/2006.ru.xhtml
@@ -8,11 +8,9 @@
  </head>

  <body>
    <localmenu set="year" id="2006">2006</localmenu>

    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2006">2006</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2006 год</h1>
    <h1>ЕФСПО – Доходы и расходы за 2006 год</h1>

    <table>
      <tr>
--- a/about/funds/2007.de.xhtml
+++ b/about/funds/2007.de.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>Einnahmen und Ausgaben 2007</h1>

--- a/about/funds/2007.el.xhtml
+++ b/about/funds/2007.el.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>FSFE - Έσοδα και Έξοδα 2007</h1>

--- a/about/funds/2007.en.xhtml
+++ b/about/funds/2007.en.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>
   
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2007">2007</localmenu>
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>FSFE - Income and Expense 2007</h1>

--- a/about/funds/2007.fr.xhtml
+++ b/about/funds/2007.fr.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>FSFE - Recettes et dépenses 2007</h1>

--- a/about/funds/2007.it.xhtml
+++ b/about/funds/2007.it.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>
   
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2007">2007</localmenu>
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>FSFE - Entrate e uscite 2007</h1>

--- a/about/funds/2007.nl.xhtml
+++ b/about/funds/2007.nl.xhtml
@@ -8,9 +8,7 @@
  </head>

  <body>

    <localmenu set="return"/>
    <localmenu set="year"/>  
    <localmenu set="year" id="2007">2007</localmenu>

    <h1>FSFE - Inkomsten en uitgaven 2007</h1>

--- a/about/funds/2007.ru.xhtml
+++ b/about/funds/2007.ru.xhtml
@@ -8,11 +8,9 @@
  </head>

  <body>
   
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2007">2007</localmenu>
    <localmenu set="year" id="2007">2007</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2007 год</h1>
    <h1>ЕФСПО – Доходы и расходы за 2007 год</h1>

    <table>
      <tr>
--- a/about/funds/2008.de.xhtml
+++ b/about/funds/2008.de.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Einkünfte und Ausgaben 2008</h1>

--- a/about/funds/2008.el.xhtml
+++ b/about/funds/2008.el.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Έσοδα και Έξοδα 2008</h1>

--- a/about/funds/2008.en.xhtml
+++ b/about/funds/2008.en.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Income and Expense 2008</h1>

--- a/about/funds/2008.fr.xhtml
+++ b/about/funds/2008.fr.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Recettes et dépenses 2008</h1>

--- a/about/funds/2008.it.xhtml
+++ b/about/funds/2008.it.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Entrate e uscite 2008</h1>

--- a/about/funds/2008.nl.xhtml
+++ b/about/funds/2008.nl.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year"/>
    <localmenu set="year" id="2008">2008</localmenu>

    <h1>FSFE - Inkomsten en uitgaven 2008</h1>

--- a/about/funds/2008.ru.xhtml
+++ b/about/funds/2008.ru.xhtml
@@ -8,10 +8,9 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2008">2008</localmenu>
    <localmenu set="year" id="2008">2008</localmenu>

 <h1>ЕФСПО – Доходы и расходы за 2008 год</h1>
    <h1>ЕФСПО – Доходы и расходы за 2008 год</h1>

    <table>
      <tr>
--- a/about/funds/2009.el.xhtml
+++ b/about/funds/2009.el.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2009">2009</localmenu>
    <localmenu set="year" id="2009">2009</localmenu>

    <h1>FSFE - Έσοδα και Έξοδα 2009</h1>

--- a/about/funds/2009.en.xhtml
+++ b/about/funds/2009.en.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2009">2009</localmenu>
    <localmenu set="year" id="2009">2009</localmenu>

    <h1>FSFE - Income and Expense 2009</h1>

--- a/about/funds/2009.nl.xhtml
+++ b/about/funds/2009.nl.xhtml
@@ -7,8 +7,7 @@ FSFE - Over - Fondsen - Inkomsten en Uitgaven 2009
 </title>
 </head>
 <body>
 <localmenu set="return"/>
 <localmenu set="year" style="number" id="2009">
 <localmenu set="year" id="2009">
 2009
 </localmenu>
 <h1>
--- a/about/funds/2009.ru.xhtml
+++ b/about/funds/2009.ru.xhtml
@@ -8,8 +8,7 @@
  </head>

  <body>
    <localmenu set="return"/>
    <localmenu set="year" style="number" id="2009">2009</localmenu>
    <localmenu set="year" id="2009">2009</localmenu>

    <h1>ЕФСПО – Доходы и расходы за 2009 год</h1>

--- a/about/funds/2010.en.xhtml
+++ b/about/funds/2010.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2010">2010</localmenu>
    <localmenu set="year" id="2010">2010</localmenu>

    <h1>Income and Expenses 2010</h1>

--- a/about/funds/2011.en.xhtml
+++ b/about/funds/2011.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2011">2011</localmenu>
    <localmenu set="year" id="2011">2011</localmenu>

    <h1>Income and Expenses 2011</h1>

--- a/about/funds/2012.en.xhtml
+++ b/about/funds/2012.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2012">2012</localmenu>
    <localmenu set="year" id="2012">2012</localmenu>

    <h1>Income and Expenses 2012</h1>

--- a/about/funds/2013.en.xhtml
+++ b/about/funds/2013.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2013">2013</localmenu>
    <localmenu set="year" id="2013">2013</localmenu>

    <h1>Income and Expenses 2013</h1>

--- a/about/funds/2014.en.xhtml
+++ b/about/funds/2014.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2014">2014</localmenu>
    <localmenu set="year" id="2014">2014</localmenu>

    <h1>Income and Expenses 2014</h1>

--- a/about/funds/2015.en.xhtml
+++ b/about/funds/2015.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2015">2015</localmenu>
    <localmenu set="year" id="2015">2015</localmenu>

    <h1>Income and Expenses 2015</h1>

--- a/about/funds/2016.en.xhtml
+++ b/about/funds/2016.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2016">2016</localmenu>
    <localmenu set="year" id="2016">2016</localmenu>

    <h1>Income and Expenses 2016</h1>

--- a/about/funds/2017.en.xhtml
+++ b/about/funds/2017.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2017">2017</localmenu>
    <localmenu set="year" id="2017">2017</localmenu>

    <h1>Income and Expenses 2017</h1>

--- a/about/funds/2017.nl.xhtml
+++ b/about/funds/2017.nl.xhtml
@@ -37,7 +37,7 @@
      <body>
        <p id="category"><a href="/about/funds/funds.html">Kasstroom</a></p>

        <localmenu set="year" style="number" id="2017">2017</localmenu>
        <localmenu set="year" id="2017">2017</localmenu>

        <h1>Inkomsten en uitgaven 2017</h1>

--- a/about/funds/2018.en.xhtml
+++ b/about/funds/2018.en.xhtml
@@ -37,7 +37,7 @@
  <body>
    <p id="category"><a href="/about/funds/funds.html">Cash flow</a></p>

    <localmenu set="year" style="number" id="2018">2018</localmenu>
    <localmenu set="year" id="2018">2018</localmenu>

    <h1>Income and Expenses 2018</h1>

--- a/build/xslt/fsfe_localmenu.xsl
+++ b/build/xslt/fsfe_localmenu.xsl
@@ -5,17 +5,7 @@
  <!-- Insert local menu -->
  <xsl:template match="localmenu">

    <xsl:variable name="dir">
      <xsl:choose>
        <xsl:when test="@dir">
          <xsl:value-of select="@dir"/>
        </xsl:when>
        <xsl:otherwise>
          <xsl:value-of select="/buildinfo/@dirname"/>
        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>

    <!-- Remember own set (default to 'default') -->
    <xsl:variable name="set">
      <xsl:choose>
        <xsl:when test="@set">
@@ -27,53 +17,31 @@
      </xsl:choose>
    </xsl:variable>

    <xsl:variable name="own_id">
      <xsl:value-of select="@id"/>
    </xsl:variable>

    <xsl:variable name="language">
      <xsl:value-of select="/buildinfo/@language"/>
    </xsl:variable>
    <!-- Remember own id -->
    <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>

    <!-- Add list of menu items -->
    <xsl:element name="ul">
      <xsl:attribute name="class">nav nav-tabs</xsl:attribute>
      <xsl:for-each select="/buildinfo/document/set/localmenuitems/menu[@dir=$dir and @set=$set]">
        <xsl:sort select="@id"/>

        <xsl:variable name="id">
          <xsl:value-of select="@id"/>
        </xsl:variable>

        <xsl:variable name="localmenutext">
          <xsl:choose>
            <xsl:when test="/buildinfo/document/set/translate/lang_part[@dir=$dir and @id=$id and @language=$language]">
              <xsl:value-of select="/buildinfo/document/set/translate/lang_part[@dir=$dir and @id=$id and @language=$language]"/>
            </xsl:when>
            <xsl:otherwise>
              <xsl:value-of select="/buildinfo/document/set/translate/lang_part[@dir=$dir and @id=$id and @language='en']"/>
            </xsl:otherwise>
          </xsl:choose>
        </xsl:variable>
      <xsl:for-each select="/buildinfo/document/set/localmenuitem[@set=$set]">
        <xsl:sort select="@id"/>

        <xsl:element name="li">
          <xsl:attribute name="role">presentation</xsl:attribute>

          <xsl:if test="$id=$own_id">
          <xsl:if test="@id=$id">
            <xsl:attribute name="class">active</xsl:attribute>
          </xsl:if>

          <xsl:element name="a">
            <xsl:attribute name="href">
              <xsl:value-of select="@dir"/>
              <xsl:value-of select="."/>
              <xsl:value-of select="@link"/>
            </xsl:attribute>
            <xsl:value-of select="$localmenutext"/>
          </xsl:element>
        </xsl:element><!-- /li -->

            <xsl:value-of select="node()"/>
          </xsl:element><!-- a -->
        </xsl:element><!-- li -->
      </xsl:for-each>
    </xsl:element><!-- /ul -->
  </xsl:template>
    </xsl:element><!-- ul -->

  </xsl:template>
 </xsl:stylesheet>

--- a/build/xslt/get_localmenu_dir.xsl
+++ b/build/xslt/get_localmenu_dir.xsl
@@ -0,0 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- ====================================================================== -->
 <!-- XSL script to extract the <localmenu> dir attribute of an XML file     -->
 <!-- ====================================================================== -->
 <!-- This XSL script outputs the "dir" attribute of the <localmenu> element -->
 <!-- of an XML file. It is used by the script tools/update_localmenus.sh.   -->
 <!-- ====================================================================== -->

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:output method="text" encoding="UTF-8"/>

  <xsl:template match="localmenu">
    <xsl:value-of select="@dir"/>
  </xsl:template>
  
  <!-- Suppress output of text nodes, which would be the default -->
  <xsl:template match="text()"/>
 </xsl:stylesheet>
--- a/build/xslt/get_localmenu_line.xsl
+++ b/build/xslt/get_localmenu_line.xsl
@@ -0,0 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- ====================================================================== -->
 <!-- XSL script to extract the <localmenu> element of an XML file           -->
 <!-- ====================================================================== -->
 <!-- This XSL script outputs a line for the .localmenu.en.xml file from the -->
 <!-- <localmenu> element of an .xhtml file. It is used by the script        -->
 <!-- tools/update_localmenus.sh.                                            -->
 <!-- ====================================================================== -->

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:output method="text" encoding="UTF-8"/>

  <xsl:template match="localmenu[@id]">
    <xsl:text>  &lt;localmenuitem set="</xsl:text>
    <xsl:choose>
      <xsl:when test="@set">
        <xsl:value-of select="@set"/>
      </xsl:when>
      <xsl:otherwise>
        <xsl:text>default</xsl:text>
      </xsl:otherwise>
    </xsl:choose>
    <xsl:text>" id="</xsl:text>
    <xsl:value-of select="@id"/>
    <xsl:text>" link="</xsl:text>
    <xsl:value-of select="$link"/>
    <xsl:text>"&gt;</xsl:text>
    <xsl:value-of select="normalize-space(node())"/>
    <xsl:text>&lt;/localmenuitem&gt;</xsl:text>
  </xsl:template>
  
  <!-- Suppress output of text nodes, which would be the default -->
  <xsl:template match="text()"/>
 </xsl:stylesheet>
--- a/donate/thankgnus-2001.cs.xhtml
+++ b/donate/thankgnus-2001.cs.xhtml
@@ -22,7 +22,7 @@
 nebo zůstaňte v anonymitě.
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Patroni FSFE</h2>

--- a/donate/thankgnus-2001.de.xhtml
+++ b/donate/thankgnus-2001.de.xhtml
@@ -21,7 +21,7 @@
      Spender-Grafiken </a> oder entscheiden Sie sich dafür, anonym zu bleiben. 
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Mäzene der FSFE</h2>

--- a/donate/thankgnus-2001.el.xhtml
+++ b/donate/thankgnus-2001.el.xhtml
@@ -20,7 +20,7 @@
    <a href="/about/graphics/sponsoring/sponsoring.html">τα γραφικά για τις χορηγίες</a> ή παραμείνετε ανώνυμοι.
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Ευεργέτες του FSFE</h2>

--- a/donate/thankgnus-2001.en.xhtml
+++ b/donate/thankgnus-2001.en.xhtml
@@ -21,7 +21,7 @@
      graphics</a> or remain anonymous.
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Patrons of the FSFE</h2>

--- a/donate/thankgnus-2001.it.xhtml
+++ b/donate/thankgnus-2001.it.xhtml
@@ -20,7 +20,7 @@
      rimanere anonimo.
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Benefattori della FSFE</h2>

--- a/donate/thankgnus-2001.nl.xhtml
+++ b/donate/thankgnus-2001.nl.xhtml
@@ -21,7 +21,7 @@
      of blijf anoniem.
    </p>

    <localmenu id="2001" style="number">2001</localmenu>
    <localmenu id="2001">2001</localmenu>

    <h2>Mecenassen van de FSFE</h2>

--- a/donate/thankgnus-2001.ru.xhtml
+++ b/donate/thankgnus-2001.ru.xhtml
@@ -22,7 +22,7 @@ href="/donate/donate.html">пожертвовании</a>, мы предлага
 href="/about/graphics/sponsoring/sponsoring.html">значками
 спонсоров</a>.</p>

 <localmenu id="2001" style="number">2001</localmenu>
 <localmenu id="2001">2001</localmenu>

 <h2>Меценаты ЕФСПО</h2>

--- a/donate/thankgnus-2001.sources
+++ b/donate/thankgnus-2001.sources
@@ -1,2 +1,2 @@
 donate/donors/donors-2001:[]
 localmenuinfo:[]
 donate/.localmenu:[]
--- a/donate/thankgnus-2002.cs.xhtml
+++ b/donate/thankgnus-2002.cs.xhtml
@@ -22,7 +22,7 @@
 nebo zůstaňte v anonymitě.
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Patroni FSFE</h2>

--- a/donate/thankgnus-2002.de.xhtml
+++ b/donate/thankgnus-2002.de.xhtml
@@ -21,7 +21,7 @@
      Spender-Grafiken </a> oder entscheiden Sie sich dafür, anonym zu bleiben. 
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Mäzene der FSFE</h2>

--- a/donate/thankgnus-2002.el.xhtml
+++ b/donate/thankgnus-2002.el.xhtml
@@ -20,7 +20,7 @@
    <a href="/about/graphics/sponsoring/sponsoring.html">τα γραφικά για τις χορηγίες</a> ή παραμείνετε ανώνυμοι.
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Ευεργέτες του FSFE</h2>

--- a/donate/thankgnus-2002.en.xhtml
+++ b/donate/thankgnus-2002.en.xhtml
@@ -21,7 +21,7 @@
      graphics</a> or remain anonymous.
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Patrons of the FSFE</h2>

--- a/donate/thankgnus-2002.it.xhtml
+++ b/donate/thankgnus-2002.it.xhtml
@@ -20,7 +20,7 @@
      rimanere anonimo.
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Benefattori della FSFE</h2>

--- a/donate/thankgnus-2002.nl.xhtml
+++ b/donate/thankgnus-2002.nl.xhtml
@@ -21,7 +21,7 @@
      of blijf anoniem.
    </p>

    <localmenu id="2002" style="number">2002</localmenu>
    <localmenu id="2002">2002</localmenu>

    <h2>Mecenassen van de FSFE</h2>

--- a/donate/thankgnus-2002.ru.xhtml
+++ b/donate/thankgnus-2002.ru.xhtml
@@ -22,7 +22,7 @@ href="/donate/donate.html">пожертвовании</a>, мы предлага
 href="/about/graphics/sponsoring/sponsoring.html">значками
 спонсоров</a>.</p>

 <localmenu id="2002" style="number">2002</localmenu>
 <localmenu id="2002">2002</localmenu>

 <h2>Меценаты ЕФСПО</h2>

--- a/donate/thankgnus-2002.sources
+++ b/donate/thankgnus-2002.sources
@@ -1,2 +1,2 @@
 donate/donors/donors-2002:[]
 localmenuinfo:[]
 donors/.localmenu:[]
--- a/donate/thankgnus-2003.cs.xhtml
+++ b/donate/thankgnus-2003.cs.xhtml
@@ -22,7 +22,7 @@
 nebo zůstaňte v anonymitě.
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Patroni FSFE</h2>

--- a/donate/thankgnus-2003.de.xhtml
+++ b/donate/thankgnus-2003.de.xhtml
@@ -21,7 +21,7 @@
      Spender-Grafiken </a> oder entscheiden Sie sich dafür, anonym zu bleiben. 
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Mäzene der FSFE</h2>

--- a/donate/thankgnus-2003.el.xhtml
+++ b/donate/thankgnus-2003.el.xhtml
@@ -20,7 +20,7 @@
    <a href="/about/graphics/sponsoring/sponsoring.html">τα γραφικά για τις χορηγίες</a> ή παραμείνετε ανώνυμοι.
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Ευεργέτες του FSFE</h2>

--- a/donate/thankgnus-2003.en.xhtml
+++ b/donate/thankgnus-2003.en.xhtml
@@ -21,7 +21,7 @@
      graphics</a> or remain anonymous.
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Patrons of the FSFE</h2>

--- a/donate/thankgnus-2003.it.xhtml
+++ b/donate/thankgnus-2003.it.xhtml
@@ -20,7 +20,7 @@
      rimanere anonimo.
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Benefattori della FSFE</h2>

--- a/donate/thankgnus-2003.nl.xhtml
+++ b/donate/thankgnus-2003.nl.xhtml
@@ -21,7 +21,7 @@
      of blijf anoniem.
    </p>

    <localmenu id="2003" style="number">2003</localmenu>
    <localmenu id="2003">2003</localmenu>

    <h2>Mecenassen van de FSFE</h2>

--- a/donate/thankgnus-2003.ru.xhtml
+++ b/donate/thankgnus-2003.ru.xhtml
@@ -22,7 +22,7 @@ href="/donate/donate.html">пожертвовании</a>, мы предлага
 href="/about/graphics/sponsoring/sponsoring.html">значками
 спонсоров</a>.</p>

 <localmenu id="2003" style="number">2003</localmenu>
 <localmenu id="2003">2003</localmenu>

 <h2>Меценаты ЕФСПО</h2>

--- a/donate/thankgnus-2003.sources
+++ b/donate/thankgnus-2003.sources
@@ -1,2 +1,2 @@
 donate/donors/donors-2003:[]
 localmenuinfo:[]
 donors/.localmenu:[]
--- a/donate/thankgnus-2004.cs.xhtml
+++ b/donate/thankgnus-2004.cs.xhtml
@@ -22,7 +22,7 @@
 nebo zůstaňte v anonymitě.
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Patroni FSFE</h2>

--- a/donate/thankgnus-2004.de.xhtml
+++ b/donate/thankgnus-2004.de.xhtml
@@ -21,7 +21,7 @@
      Spender-Grafiken </a> oder entscheiden Sie sich dafür, anonym zu bleiben. 
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Mäzene der FSFE</h2>

--- a/donate/thankgnus-2004.el.xhtml
+++ b/donate/thankgnus-2004.el.xhtml
@@ -20,7 +20,7 @@
    <a href="/about/graphics/sponsoring/sponsoring.html">τα γραφικά για τις χορηγίες</a> ή παραμείνετε ανώνυμοι.
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Ευεργέτες του FSFE</h2>

--- a/donate/thankgnus-2004.en.xhtml
+++ b/donate/thankgnus-2004.en.xhtml
@@ -21,7 +21,7 @@
      graphics</a> or remain anonymous.
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Patrons of the FSFE</h2>

--- a/donate/thankgnus-2004.it.xhtml
+++ b/donate/thankgnus-2004.it.xhtml
@@ -20,7 +20,7 @@
      rimanere anonimo.
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Benefattori della FSFE</h2>

--- a/donate/thankgnus-2004.nl.xhtml
+++ b/donate/thankgnus-2004.nl.xhtml
@@ -21,7 +21,7 @@
      of blijf anoniem.
    </p>

    <localmenu id="2004" style="number">2004</localmenu>
    <localmenu id="2004">2004</localmenu>

    <h2>Mecenassen van de FSFE</h2>