- rollback since the build script takes far too much time

svn path=/trunk/; revision=25135
2013-01-09 02:38:01 +00:00 · 2013-01-09 02:38:01 +00:00 · b3d035b5f8
commit b3d035b5f8
parent 066f6a4952
167 changed files with 3607 additions and 2054 deletions
--- a/about/legal/de/de.xsl
+++ b/about/legal/de/de.xsl
@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:element name="ul">
-      <xsl:for-each select="/buildinfo/document/set/person[@chapter_de='yes']">
+      <xsl:for-each select="/html/set/person[@chapter_de='yes']">
        <xsl:sort select="@id"/>
        <xsl:element name="li">
          <xsl:value-of select="name"/>
@ -16,4 +15,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/about/members.xsl
+++ b/about/members.xsl
@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:element name="ul">
-      <xsl:for-each select="/buildinfo/document/set/person[@association-member='yes']">
+      <xsl:for-each select="/html/set/person[@association-member='yes']">
        <xsl:sort select="@id"/>
        <xsl:element name="li">
          <xsl:element name="p">
@ -44,4 +43,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/about/printable/get_h1.xsl
+++ b/about/printable/get_h1.xsl
@ -9,4 +9,8 @@
    <xsl:if test="../@id='fsfe'"> - </xsl:if>
    <xsl:if test="../@id='free_software'"> - </xsl:if>
  </xsl:template>
+  
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:template>
 </xsl:stylesheet>
--- a/about/printable/get_moreinfo.xsl
+++ b/about/printable/get_moreinfo.xsl
@ -6,4 +6,8 @@
  <xsl:template match="a[@id='moreinfo']">
    <xsl:value-of select="@href"/>
  </xsl:template>
+  
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:template>
 </xsl:stylesheet>
--- a/about/printable/printable.xsl
+++ b/about/printable/printable.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -13,7 +12,7 @@
    <xsl:variable name="text-pdf-0"><xsl:value-of select="text[@id='pdf-0']"/></xsl:variable>
    <xsl:variable name="text-moreinfo"><xsl:value-of select="text[@id='moreinfo']"/></xsl:variable>

-    <xsl:for-each select="/buildinfo/document/set/printable[@type=$type]">
+    <xsl:for-each select="/html/set/printable[@type=$type]">
      <xsl:sort select="@id"/>
      <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>

@ -21,8 +20,8 @@
      <xsl:element name="h3">
        <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
        <xsl:choose>
-          <xsl:when test="translation[@lang=/buildinfo/@language]!=''">
-            <xsl:value-of select="translation[@lang=/buildinfo/@language]"/>
+          <xsl:when test="translation[@lang=/html/@lang]!=''">
+            <xsl:value-of select="translation[@lang=/html/@lang]"/>
          </xsl:when>
          <xsl:otherwise>
            <xsl:value-of select="translation[@lang='en']"/>
@ -128,5 +127,15 @@
      </xsl:element>
    </xsl:for-each>
  </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/about/team.xsl
+++ b/about/team.xsl
@ -3,8 +3,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  
  <xsl:import href="../tools/xsltsl/countries.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>
  
  <!-- 
    For documentation on tagging (e.g. display a people list), take a
@ -18,5 +17,15 @@
      <xsl:with-param name="team" select="'main'" />
    </xsl:call-template>
  </xsl:template>
+  
+  <!-- Do not copy <set> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/activities/ftf/avm-gpl-violation.xsl
+++ b/activities/ftf/avm-gpl-violation.xsl
@ -4,11 +4,10 @@
  
  <xsl:import href="../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="tagged-docs">
+  <xsl:template match="/html/body/tagged-docs">
    
    <xsl:call-template name="fetch-news">
      <xsl:with-param name="tag" select="'avmgplviolation'" />
@ -18,4 +17,15 @@
    </xsl:call-template>
    
  </xsl:template>
+
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>
--- a/activities/map/de/de.xsl
+++ b/activities/map/de/de.xsl
@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
-    <xsl:for-each select="/buildinfo/document/set/item[@type=$type]">
+    <xsl:for-each select="/html/set/item[@type=$type]">
      <xsl:element name="li">
        <xsl:apply-templates select="node()"/>
      </xsl:element>
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/activities/os/os.xsl
+++ b/activities/os/os.xsl
@ -4,8 +4,7 @@
  
  <xsl:import href="../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  
  <xsl:template match="fetch-news">
@ -15,16 +14,28 @@
    </xsl:call-template>
  </xsl:template>
  
+  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
 </xsl:stylesheet>
--- a/activities/wipo/wipo.xsl
+++ b/activities/wipo/wipo.xsl
@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:element name="ul">
-      <xsl:for-each select="/buildinfo/document/set/document">
+      <xsl:for-each select="/html/set/document">
        <xsl:sort select="@date" order="descending" />
        <xsl:element name="li">
          <xsl:element name="p">
@ -39,4 +38,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/activities/wipo/wiwo.de.xhtml
+++ b/activities/wipo/wiwo.de.xhtml
@ -76,16 +76,19 @@

 <h3>Unterzeichner</h3>

-<signatories/>
-
-<p>
-  Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
-  sehen wollen, kontaktieren Sie bitte 
-  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
   </body>
+   <text id="osig">Organisationen</text>
+   <text id="isig">Personen</text>

+   <text>
+     <footer>
+       <p>
+         Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste
+         sehen wollen, kontaktieren Sie bitte 
+         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>

   <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/activities/wipo/wiwo.el.xhtml
+++ b/activities/wipo/wiwo.el.xhtml
@ -62,16 +62,18 @@ WIPO, αλλά τι είδους οργανισμό χρειαζόμαστε γ


 <h2>Συμβαλλόμενα μέρη</h2>
-
-<signatories/>
-
-<p>
-  Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
-  σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
-  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
   </body>
+   <text id="osig">Οργανισμοί</text>
+   <text id="isig">Άτομα</text>
+   <text>
+     <footer>
+       <p>
+         Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται
+         σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο
+         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>

   <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/activities/wipo/wiwo.en.xhtml
+++ b/activities/wipo/wiwo.en.xhtml
@ -75,16 +75,19 @@


    <h2>Signatories</h2>
-    
-    <signatories/>
-    
-    <p>
-      If you wish to see your name or the name of your organisation
-      added to this list, please contact <a
-        href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-     </p>
-     
+
  </body>
+  <text id="osig">Organisations</text>
+  <text id="isig">Individuals</text>
+  <text>
+    <footer>
+      <p>
+        If you wish to see your name or the name of your organisation
+        added to this list, please contact <a
+          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+     </p>
+   </footer>
+ </text>
  <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
--- a/activities/wipo/wiwo.es.xhtml
+++ b/activities/wipo/wiwo.es.xhtml
@ -58,17 +58,19 @@ establecimiento de una agenda de desarrollo para la OMPI:
 <a href="http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf">http://www.wipo.int/documents/es/document/govbody/wo_gb_ga/pdf/wo_ga_31_11.pdf</a></li>
 </ol>

-    <h2>Firmantes</h2>
-    
-    <signatories/>
-    
-    <p>
-      Si desea que su nombre o el de su organización aparezca en 
-      esta lista, por favor contacte con
-      <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-    </p>
-    
+	 <h2>Firmantes</h2>
   </body>
+   <text id="osig">Organizaciones</text>
+   <text id="isig">Individuos</text>
+   <text>
+     <footer>
+       <p>
+	    Si desea que su nombre o el de su organización aparezca en 
+	    esta lista, por favor contacte con
+         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>

   <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/activities/wipo/wiwo.fr.xhtml
+++ b/activities/wipo/wiwo.fr.xhtml
@ -60,16 +60,18 @@ avoir, mais plut
      </li>
    </ol>

-  <h2>Signataires</h2>
-  
-  <signatories/>
-  
-  <p>
-    Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
-    href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-  </p>
-
-</body>
+<h2>Signataires</h2>
+   </body>
+   <text id="osig">Organisations</text>
+   <text id="isig">Individus</text>
+  <text>
+    <footer>
+      <p>
+        Si vous désirez ajouter votre nom ou celui de votre organisation à la liste des signataires, veuillez contacter <a
+          href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+     </p>
+   </footer>
+ </text>

   <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/activities/wipo/wiwo.hu.xhtml
+++ b/activities/wipo/wiwo.hu.xhtml
@ -30,12 +30,14 @@ href="http://www.cptech.org/ip/wipo/genevadeclaration.html">Genfi Deklaráció</


 <h2>Aláírók</h2>
-
-<signatories/>
-
-<p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
-
  </body>
+  <text id="osig">Szervezetek</text>
+  <text id="isig">Egyének</text>
+  <text>
+    <footer>
+      <p>Ha Ön is szerepeltetni szeretné saját vagy szervezete nevét e listán, kérjük jelezze a <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a> e-mail címen.</p>
+    </footer>
+  </text>

  <timestamp>$Date$ $Author$</timestamp>
  <translator>FSF.hu Alapítvány</translator>
--- a/activities/wipo/wiwo.it.xhtml
+++ b/activities/wipo/wiwo.it.xhtml
@ -60,16 +60,18 @@ piuttosto al tipo di organizzazione di cui abbiamo bisogno al suo posto.</p>


 <h2>Firmatari</h2>
-
-<signatories/>
-
-<p>
-  Per aggiungere il proprio nome, o quello della propria organizzazione,
-  a questa lista, si prega di contattare
-  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
   </body>
+   <text id="osig">Organizzazioni</text>
+   <text id="isig">Individui</text>
+   <text>
+     <footer>
+       <p>
+         Per aggiungere il proprio nome, o quello della propria organizzazione,
+         a questa lista, si prega di contattare
+         <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>

   <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/activities/wipo/wiwo.nl.xhtml
+++ b/activities/wipo/wiwo.nl.xhtml
@ -77,17 +77,22 @@
    </ol>

    <h2>Ondertekenaars</h2>
-    
-    <signatories/>
-    
-    <p>
-      Als je uw naam of de naam van uw organisatie aan de lijst
-      wil toevoegen meld dit dan via <a 
-      href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-    </p>
-    
+
    </body>

+
+   <text id="osig">Organisaties</text>
+   <text id="isig">Personen</text>
+   <text>
+     <footer>
+       <p>
+	 Als je uw naam of de naam van uw organisatie aan de lijst
+         wil toevoegen meld dit dan via <a 
+	 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>
+
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
--- a/activities/wipo/wiwo.pt.xhtml
+++ b/activities/wipo/wiwo.pt.xhtml
@ -57,16 +57,17 @@ nova organização, mas não o único e talvez nem mesmo o mais importante.</p>
 </ol>

 <h2>Assinantes</h2>
-
-<signatories/>
-
-<p>
-  Se deseja que o seu nome ou o nome da sua organização apareça
-  nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
   </body>
-   
+   <text id="osig">Organizações</text>
+   <text id="isig">Indivíduos</text>
+   <text>
+     <footer>
+       <p>
+            Se deseja que o seu nome ou o nome da sua organização apareça
+            nesta lista, por favor entre em contacto com <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+       </p>
+     </footer>
+   </text>
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
--- a/activities/wipo/wiwo.ru.xhtml
+++ b/activities/wipo/wiwo.ru.xhtml
@ -62,13 +62,16 @@ http://www.wipo.int/edocs/mdocs/govbody/en/wo_ga_31/wo_ga_31_11.pdf</a></li>

 <h2>Присоединившиеся стороны</h2>

-<signatories/>
-
+</body>
+<text id="osig">Организации</text>
+<text id="isig">Частные лица</text>
+<text>
+<footer>
 <p>Если вы хотите внести свое имя или название организации в этот
 список, напишите по адресу <a
 href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.</p>
-
-</body>
+</footer>
+</text>
 <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--
--- a/activities/wipo/wiwo.xsl
+++ b/activities/wipo/wiwo.xsl
@ -3,23 +3,39 @@
 <xsl:stylesheet version="1.0"
                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml"
+           encoding="ISO-8859-1"
+           indent="yes"
+           />

-  <xsl:template match="signatories">
-    <h3 id="organisations">
-      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
-    </h3>
-    <ul>
-      <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
-    </ul>
-
-    <h3 id="individuals">
-      <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
-    </h3>
-    <ul>
-      <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
-    </ul>
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
  </xsl:template>

+  <xsl:template match="/html/body">
+    <body>
+      <xsl:apply-templates />
+      <h3><xsl:value-of select="/html/text[@id='osig']" /></h3>
+      <ul>
+        <xsl:apply-templates select="/html/set/osig/node()" />
+      </ul>
+
+      <h3><xsl:value-of select="/html/text[@id='isig']" /></h3>
+      <ul>
+        <xsl:apply-templates select="/html/set/isig/node()" />
+      </ul>
+      <xsl:apply-templates select="/html/text/footer/node()" />
+    </body>
+  </xsl:template>
+
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
 </xsl:stylesheet>
--- a/associates/associates.ca.xhtml
+++ b/associates/associates.ca.xhtml
@ -21,8 +21,6 @@ junts en campanyes i events com fires.</p>
 <p>Si voleu saber més sobre l'estatus d'associat, trobareu
 aquesta informació <a href="/associates/about.html">aquí</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.da.xhtml
+++ b/associates/associates.da.xhtml
@ -29,9 +29,6 @@
      læse om <a href="/associates/about.html">hvad det betyder, at være 
      tilknyttet FSFE og hvordan man bliver det</a>.
    </p>
-    
-    <associates/>
-    
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.de.xhtml
+++ b/associates/associates.de.xhtml
@ -29,8 +29,6 @@
    Organisation suchen, so lesen Sie was es bedeutet, <a href="/associates/about.html">assoziierte 
    Organisation zu sein und wie Ihre Organisation es werden kann</a>. 
    </p>
-    
-    <associates/>

  </body>

--- a/associates/associates.el.xhtml
+++ b/associates/associates.el.xhtml
@ -21,8 +21,6 @@
 <p>Αν ενδιαφέρεστε για την ιδιότητα του συνεργαζόμενου, παρακαλούμε διαβάστε
 <a href="/associates/about.html">τι σημαίνει συνεργαζόμενος με το FSFE και πώς θα γίνετε</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.en.xhtml
+++ b/associates/associates.en.xhtml
@ -26,9 +26,6 @@
    <p>
      If you are interested in the associate status, please consider to read <a href="/associates/about.html">what it means to be an associate of FSFE and how to become one</a>.
    </p>
-    
-    <associates/>
-    
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.es.xhtml
+++ b/associates/associates.es.xhtml
@ -21,8 +21,6 @@ en todos los aspectos (tales como afiliación, estatutos, finanzas, etc.)</p>

 <p>Si desea saber más sobre el estatus de asociado, lea nuestra <a href="/associates/about.html">explicación del significado del estatus de asociado y como puede volverselo</a>.</p>

-  <associates/>
-  
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.fi.xhtml
+++ b/associates/associates.fi.xhtml
@ -21,8 +21,6 @@ messuilla.</p>
 <p>Lisätietoja kumppanuudesta FSFE:n kanssa löydät 
 <a href="/associates/about.html">täältä</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.fr.xhtml
+++ b/associates/associates.fr.xhtml
@ -22,8 +22,6 @@ salons.</p>

 <p>Si vous êtes intéressé par le statut de partenaire, nous vous recommandons de considérer<a href="/associates/about.html">ce que cela signifie d'être partenaire de la FSFE et comment en devenir un</a>. </p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.hu.xhtml
+++ b/associates/associates.hu.xhtml
@ -17,8 +17,6 @@

 <p>Amennyiben többet szeretne tudni a társult szervezeti státusról, további információt találhat <a href="/associates/about.html">itt</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.it.xhtml
+++ b/associates/associates.it.xhtml
@ -23,8 +23,6 @@ esempio fiere e manifestazioni).</p>
 leggere <a href="/associates/about.html">cosa significa essere associati a FSFE
 e come diventarlo</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.nb.xhtml
+++ b/associates/associates.nb.xhtml
@ -21,8 +21,6 @@ også om kampanjer og begivenheter, som for eksempel messer.</p>
 <p>Ønsker du å vite mer, kan du lese mer om <a
 href="/associates/about.html">tilknyttingsstatusen</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.nl.xhtml
+++ b/associates/associates.nl.xhtml
@ -22,8 +22,6 @@ samenwerken voor campagnes en evenementen zoals handelsbeurzen.</p>
 <p>Als u meer wilt weten over de status als partnerorganisatie, kunt u dat
 <a href="/associates/about.html">hier</a> vinden.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.pt.xhtml
+++ b/associates/associates.pt.xhtml
@ -26,8 +26,6 @@
    <p>
      Se quiser saber mais sobre o estatuto de associado, você pode ler nossa <a href="/associates/about.html">exploração do significado do estatuto de aasociado e o guia para tornar-se associado da FSFE</a>.
    </p>
-    
-    <associates/>
  </body>

  <timestamp>$Date: 2010-01-23 16:58:15 +0000 (Sat, 23 Jan 2010) $ $Author: ato $</timestamp>
--- a/associates/associates.ro.xhtml
+++ b/associates/associates.ro.xhtml
@ -29,8 +29,6 @@ implica în activitãţile FSFE.</p>
 Dacã doriţi mai multe informaţii despre statutul asociaţilor, puteţi
 afla mai multe informaţii <a href="/associates/about.html">aici</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.ru.xhtml
+++ b/associates/associates.ru.xhtml
@ -24,8 +24,6 @@
 прочтите, пожалуйста, о том, <a href="/associates/about.html">что значит
 быть союзной организацией ЕФСПО и как стать такой организацией</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.sq.xhtml
+++ b/associates/associates.sq.xhtml
@ -26,9 +26,6 @@
    <p>
      Nëse jeni të interesuar rreth statusit të anëtarit shok, ju lutemi, mund të lexoni <a href="/associates/about.html">se ç'do të thotë të jesh anëtar shok i FSFE-së dhe se si të bëheni një i tillë</a>.
    </p>
-    
-    <associates/>
-    
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.sv.xhtml
+++ b/associates/associates.sv.xhtml
@ -26,8 +26,6 @@ FSFE aktiviteter att g
 <p>Om du vill veta mer om de associerades status så hittar du den
 informationen <a href="/associates/about.html">här</a>.</p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.tr.xhtml
+++ b/associates/associates.tr.xhtml
@ -27,8 +27,6 @@ Ortaklık statüsüyle ilgili daha fazla bilgi edinmek isterseniz,
 <a href="/associates/about.html">burada</a> aradığınızı bulabilirsiniz.
 </p>

-<associates/>
-
  </body>

  <timestamp>$Date$ $Author$</timestamp>
--- a/associates/associates.xsl
+++ b/associates/associates.xsl
@ -3,21 +3,29 @@
 <xsl:stylesheet version="1.0"
                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml"
+           encoding="ISO-8859-1"
+           indent="yes"
+           />

-  <xsl:template match="associates">
-    <xsl:for-each select="/buildinfo/document/set/associate">
-      <xsl:sort select="@id" />
-      <h3>
-        <xsl:call-template name="generate-id-attribute">
-          <xsl:with-param name="title" select="name" />
-        </xsl:call-template>
-        <a href="{link}"><xsl:value-of select="name" /></a>
-      </h3>
-      <xsl:apply-templates select="description/node()" />
-    </xsl:for-each>
+  <xsl:template match="/">
+    <html>
+      <xsl:apply-templates select="html/head" />
+      <body>
+        <xsl:apply-templates select="html/body/node()" />
+        <xsl:for-each select="/html/set/associate">
+          <xsl:sort select="@id" />
+          <h3><a href="{link}"><xsl:value-of select="name" /></a></h3>
+          <xsl:apply-templates select="description/node()" />
+        </xsl:for-each>
+      </body>
+    </html>
+  </xsl:template>
+
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
  </xsl:template>
-  
 </xsl:stylesheet>

--- a/at/at.xsl
+++ b/at/at.xsl
@ -7,8 +7,7 @@
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  <xsl:import href="../tools/xsltsl/countries.xsl" />
  <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- To localise this page to a new country, copy this file and change the following:
  
@ -61,7 +60,7 @@
  <!--define contact information-->
  
  <xsl:template match="contact-details">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">

    <xsl:if test="@id = 'DE'">
  
@ -146,5 +145,15 @@
            </xsl:with-param>
        </xsl:call-template>
    </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/campaigns/askyourcandidates/askyourcandidates.xsl
+++ b/campaigns/askyourcandidates/askyourcandidates.xsl
@ -4,8 +4,7 @@
  
  <xsl:import href="../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  
  <xsl:template match="fetch-news">
@ -15,16 +14,28 @@
    </xsl:call-template>
  </xsl:template>
  
+  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
 </xsl:stylesheet>
--- a/campaigns/finished.xsl
+++ b/campaigns/finished.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
-    <xsl:for-each select="/buildinfo/document/set/project [@status = 'finished']">
+    <xsl:for-each select="/html/set/project [@status = 'finished']">
      <xsl:sort select="@date" order="descending"/>

      <!-- Title -->
@ -27,4 +26,14 @@
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/ilovefs/2012/ilovefs.xsl
+++ b/campaigns/ilovefs/2012/ilovefs.xsl
@ -4,8 +4,7 @@
  
  <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  
  <xsl:template match="fetch-news">
@ -15,16 +14,28 @@
    </xsl:call-template>
  </xsl:template>
  
+  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
 </xsl:stylesheet>
--- a/campaigns/ilovefs/2012/unperfekthaus.xsl
+++ b/campaigns/ilovefs/2012/unperfekthaus.xsl
@ -4,8 +4,7 @@
  
  <xsl:import href="../../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  
  <xsl:template match="fetch-news">
@ -15,16 +14,28 @@
    </xsl:call-template>
  </xsl:template>
  
+  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
 </xsl:stylesheet>
--- a/campaigns/inactive.xsl
+++ b/campaigns/inactive.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
-    <xsl:for-each select="/buildinfo/document/set/project [@status = 'inactive']">
+    <xsl:for-each select="/html/set/project [@status = 'inactive']">
      <xsl:sort select="@date" order="descending"/>

      <!-- Title -->
@ -27,4 +26,14 @@
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/nledu/nledu.xsl
+++ b/campaigns/nledu/nledu.xsl
@ -4,8 +4,7 @@
  
  <xsl:import href="../../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  
  <xsl:template match="fetch-news">
@ -15,16 +14,28 @@
    </xsl:call-template>
  </xsl:template>
  
+  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-      <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
 </xsl:stylesheet>
--- a/campaigns/pdfreaders/buglist.xsl
+++ b/campaigns/pdfreaders/buglist.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>

  <!-- Fill dynamic index -->
  <xsl:template match="dynamic-index">
-    <xsl:for-each select="/buildinfo/document/set/buglist">
+    <xsl:for-each select="/html/set/buglist">
      <xsl:sort select="@country"/>

      <xsl:variable name="country">
@ -19,7 +18,7 @@
            <xsl:text>#</xsl:text>
            <xsl:value-of select="$country"/>
          </xsl:attribute>
-          <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
+          <xsl:value-of select="/html/set/country[@id=$country]"/>
        </xsl:element>
      </xsl:element>

@ -30,11 +29,11 @@
  <!-- fill in global figures -->
  
  <xsl:variable name="solved">
-    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] )" />
+    <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] )" />
  </xsl:variable>
  
  <xsl:variable name="total">
-    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug )" />
+    <xsl:value-of select="count( /html/set/buglist/bug )" />
  </xsl:variable>
  
  <xsl:template match="solved">
@ -50,18 +49,18 @@
  </xsl:template>
  
  
-  <!-- <xsl:key name="indivs-by-name" match="/buildinfo/document/set/buglist/bug/@name" use="normalize-space(.)" />
-  <xsl:key name="groups-by-name" match="/buildinfo/document/set/buglist/bug/@group" use="normalize-space(.)" /> -->
+  <!-- <xsl:key name="indivs-by-name" match="/html/set/buglist/bug/@name" use="normalize-space(.)" />
+  <xsl:key name="groups-by-name" match="/html/set/buglist/bug/@group" use="normalize-space(.)" /> -->
  
  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    
-    <!-- <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@closed != ''] ) " /><br/>
-    <xsl:value-of select="count( /buildinfo/document/set/buglist/bug ) " /><br/>
-    <xsl:value-of select="floor( count(/buildinfo/document/set/buglist/bug[@closed != '']) div count( /buildinfo/document/set/buglist/bug ) * 100)" /><br/>
+    <!-- <xsl:value-of select="count( /html/set/buglist/bug[@closed != ''] ) " /><br/>
+    <xsl:value-of select="count( /html/set/buglist/bug ) " /><br/>
+    <xsl:value-of select="floor( count(/html/set/buglist/bug[@closed != '']) div count( /html/set/buglist/bug ) * 100)" /><br/>
    -->
    
-    <xsl:for-each select="/buildinfo/document/set/buglist">
+    <xsl:for-each select="/html/set/buglist">
      <xsl:sort select="@country"/>
      
      <xsl:variable name="country">
@ -73,24 +72,24 @@
        <xsl:attribute name="id">
          <xsl:value-of select="$country"/>
        </xsl:attribute>
-        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
-        <xsl:variable name="nbsolved" select="count( /buildinfo/document/set/buglist[@country=$country]/bug[@closed != ''] )" />
-        <xsl:variable name="nbinst" select="count( /buildinfo/document/set/buglist[@country=$country]/bug )" />
+        <xsl:value-of select="/html/set/country[@id=$country]"/>
+        <xsl:variable name="nbsolved" select="count( /html/set/buglist[@country=$country]/bug[@closed != ''] )" />
+        <xsl:variable name="nbinst" select="count( /html/set/buglist[@country=$country]/bug )" />
        (<xsl:value-of select="$nbsolved" />/<xsl:value-of select="$nbinst" /> = <xsl:value-of select="floor($nbsolved div $nbinst * 100)" />%)
      </xsl:element>
      
      <!-- Table header -->
      <xsl:element name="table">
        <xsl:element name="tr">
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
-          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>-->
-          <!--<xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>-->
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closedby']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
+          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>-->
+          <!--<xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>-->
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closedby']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
        </xsl:element>
        
        <!-- Table rows -->
@ -104,7 +103,7 @@
                <xsl:attribute name="href">
                  <xsl:value-of select="@institution-url"/>
                </xsl:attribute>
-                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/buildinfo/document/text[@id='link']"/>-->
+                <xsl:value-of select="@institution-name"/><!--<xsl:value-of select="/html/text[@id='link']"/>-->
              </xsl:element>
            </xsl:element>
            <xsl:comment><xsl:element name="td"><xsl:value-of select="translate(@institution-address, '-', '–' )"/></xsl:element></xsl:comment>
@ -122,19 +121,19 @@
    
    <!-- List of participants -->
    <!-- 
-    <xsl:value-of select="count(/buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
+    <xsl:value-of select="count(/html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ])" />
    
    <xsl:element name="ul">
      
-      <xsl:for-each select=" /buildinfo/document/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
-        <xsl:sort select="count( /buildinfo/document/set/buglist/bug/@name = . )" data-type="number" />
+      <xsl:for-each select=" /html/set/buglist/bug/@group[ generate-id() = generate-id(key('groups-by-name', normalize-space(.))) ] ">
+        <xsl:sort select="count( /html/set/buglist/bug/@name = . )" data-type="number" />
        
        <xsl:variable name="name" select="." />
        
        <xsl:if test="position() &lt;= 5">
          
          <xsl:element name="li">
-            <xsl:value-of select="count( /buildinfo/document/set/buglist/bug[@group=$name] )" />
+            <xsl:value-of select="count( /html/set/buglist/bug[@group=$name] )" />
            <xsl:text>-</xsl:text>
            <xsl:value-of select="$name" />
          </xsl:element>
@ -148,4 +147,14 @@
    
  </xsl:template>

+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/pdfreaders/follow-up.de.xhtml
+++ b/campaigns/pdfreaders/follow-up.de.xhtml
@ -142,7 +142,7 @@ Dafür benötigen wir Ihre Geduld und Entschlossenheit.
 </p>

 </body>
-<timestamp>$Date: 2010-09-07 16:38:57 +0200 (Tue, 07 Sep 2010) $ $Author: maelle $</timestamp>
+<timestamp>$Date$ $Author$</timestamp>
 <translator>Martin Gollowitzer</translator>

 </html>
--- a/campaigns/pdfreaders/pdfreaders.xsl
+++ b/campaigns/pdfreaders/pdfreaders.xsl
@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  <xsl:template match="number-of-businesses">
-    <xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />
+    <xsl:value-of select="count(/html/set/bsig/li)" />
  </xsl:template>
  
  <xsl:template match="number-of-orgs">
-    <xsl:value-of select="count(/buildinfo/document/set/osig/li)" />
+    <xsl:value-of select="count(/html/set/osig/li)" />
  </xsl:template>
  
  <xsl:template match="number-of-individuals">
-    <xsl:value-of select="count(/buildinfo/document/set/isig/li)" />
+    <xsl:value-of select="count(/html/set/isig/li)" />
  </xsl:template>
  
  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
-    <xsl:for-each select="/buildinfo/document/set/buglist">
+    <xsl:for-each select="/html/set/buglist">
      <xsl:sort select="@country"/>

      <xsl:variable name="country">
@ -27,20 +26,20 @@

      <!-- Heading -->
      <xsl:element name="h3">
-        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]"/>
+        <xsl:value-of select="/html/set/country[@id=$country]"/>
      </xsl:element>

      <!-- Table header -->
      <xsl:element name="table">
        <xsl:element name="tr">
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-address']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='institution-url']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='opened']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='closed']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='name']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='group']"/></xsl:element>
-          <xsl:element name="th"><xsl:value-of select="/buildinfo/document/text[@id='comment']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-address']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='institution-url']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='opened']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='closed']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='name']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='group']"/></xsl:element>
+          <xsl:element name="th"><xsl:value-of select="/html/text[@id='comment']"/></xsl:element>
        </xsl:element>

        <!-- Table rows -->
@ -53,7 +52,7 @@
                <xsl:attribute name="href">
                  <xsl:value-of select="@institution-url"/>
                </xsl:attribute>
-                <xsl:value-of select="/buildinfo/document/text[@id='link']"/>
+                <xsl:value-of select="/html/text[@id='link']"/>
              </xsl:element>
            </xsl:element>
            <xsl:element name="td"><xsl:value-of select="@opened"/></xsl:element>
@ -68,4 +67,14 @@
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/pdfreaders/petition.xsl
+++ b/campaigns/pdfreaders/petition.xsl
@ -5,46 +5,64 @@
 	
 	<xsl:import href="../../tools/xsltsl/countries.xsl" />
 	
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml"
+           encoding="UTF-8"
+           indent="yes"
+           />

-  <xsl:template match="body">
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="/html/body">
+    <body>
      <xsl:apply-templates />
      
-      <h3 id="organisations">
-        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template>
-        (<xsl:value-of select="count(/buildinfo/document/set/osig/li)" />)
+      <h3>
+        <xsl:value-of select="/html/text[@id='osig']" />
+        (<xsl:value-of select="count(/html/set/osig/li)" />)
      </h3>
      <ul>
-        <xsl:apply-templates select="/buildinfo/document/set/osig/node()">
+        <xsl:apply-templates select="/html/set/osig/node()">
          <xsl:sort select="." />
        </xsl:apply-templates>
      </ul>
      
-      <h3 id="businesses">
-      	<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'bsig'" /></xsl:call-template>
-      	(<xsl:value-of select="count(/buildinfo/document/set/bsig/li)" />)
+      <h3>
+      	<xsl:value-of select="/html/text[@id='bsig']" />
+      	(<xsl:value-of select="count(/html/set/bsig/li)" />)
      </h3>
      <ul>
-        <xsl:apply-templates select="/buildinfo/document/set/bsig/node()">
+        <xsl:apply-templates select="/html/set/bsig/node()">
          <xsl:sort select="." />
        </xsl:apply-templates>
      </ul>
      
-      <h3 id="individuals">
-        <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template>
-        (<xsl:value-of select="count(/buildinfo/document/set/isig/li)" />)
+      <h3>
+        <xsl:value-of select="/html/text[@id='isig']" />
+        (<xsl:value-of select="count(/html/set/isig/li)" />)
      </h3>
      <ul>
-        <xsl:apply-templates select="/buildinfo/document/set/isig/node()">
+        <xsl:apply-templates select="/html/set/isig/node()">
          <xsl:sort select="." />
        </xsl:apply-templates>
      </ul>
-      <xsl:apply-templates select="/buildinfo/document/text/footer/node()" />
+      <xsl:apply-templates select="/html/text/footer/node()" />
+    </body>
  </xsl:template>
  
  <xsl:template match="country-list">
    <xsl:call-template name="country-list" />
  </xsl:template>
  
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
 </xsl:stylesheet>
--- a/campaigns/projects.xsl
+++ b/campaigns/projects.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
-    <xsl:for-each select="/buildinfo/document/set/project [@status = 'active']">
+    <xsl:for-each select="/html/set/project [@status = 'active']">
      <xsl:sort select="@date" order="descending"/>

      <!-- Title -->
@ -27,4 +26,14 @@
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/swpat/documents.xsl
+++ b/campaigns/swpat/documents.xsl
@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:element name="ul">
-      <xsl:for-each select="/buildinfo/document/set/document">
+      <xsl:for-each select="/html/set/document">
        <xsl:sort select="@date" order="descending" />
        <xsl:element name="li">
          <xsl:element name="p">
@ -39,4 +38,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/campaigns/swpat/memorandum.de.xhtml
+++ b/campaigns/swpat/memorandum.de.xhtml
@ -91,16 +91,17 @@ erlaubt, jedoch Softwarepatentierung eindeutig verhindert.</p>
 Präsident<br />
 Free Software Foundation Europe (FSFE)</p>

-<p>
-  Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
-  Listen hinzufügen möchten, kontaktieren sie bitte
-  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
-<signatories/>
+      <p>
+      	Wenn sie ihren Namen, oder den ihrer Organisation auf dieser
+	Listen hinzufügen möchten, kontaktieren sie bitte
+	<a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+      </p>

  </body>

+  <text id="osig">Organisationen</text>
+  <text id="isig">Privatpersonen</text>
+

  <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/campaigns/swpat/memorandum.el.xhtml
+++ b/campaigns/swpat/memorandum.el.xhtml
@ -89,17 +89,18 @@
 Πρόεδρος<br />
 Ευρωπαϊκό Ίδρυμα Ελεύθερου Λογισμικού (FSFE)</p>

-  <p>
-    Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
-    οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
-    επικοινωνήστε με τη διεύθυνση 
-    <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-  </p>
-  
-  <signatories/>
+      <p>
+        Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον
+        οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε
+        επικοινωνήστε με τη διεύθυνση 
+        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+      </p>

  </body>

+  <text id="osig">Οργανισμοί</text>
+  <text id="isig">Άτομα</text>
+

  <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/campaigns/swpat/memorandum.en.xhtml
+++ b/campaigns/swpat/memorandum.en.xhtml
@ -84,16 +84,17 @@ prevents software patenting.</p>
 President<br />
 Free Software Foundation Europe (FSFE)</p>

-<p>
-  If you wish to see your name or the name of your organisation added
-  to this list, please contact 
-  <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
-<signatories/>
+      <p>
+        If you wish to see your name or the name of your organisation added
+        to this list, please contact 
+        <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+      </p>

  </body>

+  <text id="osig">Organisations</text>
+  <text id="isig">Individuals</text>
+

  <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/campaigns/swpat/memorandum.it.xhtml
+++ b/campaigns/swpat/memorandum.it.xhtml
@ -107,15 +107,16 @@ esplicitamente la brevettabilit
 Presidente<br />
 Free Software Foundation Europe (FSFE)</p>

-<p>
-  Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
-  contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
-</p>
-
-<signatories/>
+      <p>
+        Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione,
+        contattate <a href="mailto:web@fsfeurope.org">web@fsfeurope.org</a>.
+      </p>

  </body>

+  <text id="osig">Organizzazioni</text>
+  <text id="isig">Individui</text>
+

  <timestamp>$Date$ $Author$</timestamp>
 </html>
--- a/campaigns/swpat/memorandum.xsl
+++ b/campaigns/swpat/memorandum.xsl
@ -3,22 +3,39 @@
 <xsl:stylesheet version="1.0"
                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:import href="../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml"
+           encoding="ISO-8859-1"
+           indent="yes"
+           />

-  <xsl:template match="signatories">
-      
-    <div class="indent">
-      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'osig'" /></xsl:call-template></b>
-      <ul>
-        <xsl:apply-templates select="/buildinfo/document/set/osig/node()" />
-      </ul>
-
-      <b><xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'isig'" /></xsl:call-template></b>
-      <ul>
-        <xsl:apply-templates select="/buildinfo/document/set/isig/node()" />
-      </ul>
-    </div>
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
  </xsl:template>

+  <xsl:template match="/html/body">
+    <body>
+      <xsl:apply-templates />
+      <div class="indent"><b><xsl:value-of select="/html/text[@id='osig']" /></b>
+      <ul>
+        <xsl:apply-templates select="/html/set/osig/node()" />
+      </ul>
+
+      <b><xsl:value-of select="/html/text[@id='isig']" /></b>
+      <ul>
+        <xsl:apply-templates select="/html/set/isig/node()" />
+      </ul></div>
+      <xsl:apply-templates select="/html/text/footer/node()" />
+    </body>
+  </xsl:template>
+
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
 </xsl:stylesheet>
--- a/campaigns/valentine/2011/valentine-2011.xsl
+++ b/campaigns/valentine/2011/valentine-2011.xsl
@ -4,8 +4,7 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:dt="http://xsltsl.org/date-time">
  
-  <xsl:import href="../../../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  <!-- 
    For documentation on tagging (e.g. fetching news and events), take a
@ -42,4 +41,14 @@
 	  </xsl:element>-->
  </xsl:template>
  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+  
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/contact/local.en.xml
+++ b/contact/local.en.xml
@ -4,7 +4,7 @@

 <contactset>
  <contact id="AT">
-    <homepage>/at</homepage>
+<homepage>/at</homepage>
    <email>austria@fsfeurope.org</email>
  </contact>

--- a/contact/local.xsl
+++ b/contact/local.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">
      <xsl:sort select="@id" />

      <xsl:variable name="country">
@ -14,32 +13,31 @@
      </xsl:variable>

      <!-- Heading -->
-      <h3>
-        <xsl:call-template name="generate-id-attribute" />
-        <xsl:value-of select="/buildinfo/document/set/country[@id=$country]" />
-      </h3>
+      <xsl:element name="h3">
+        <xsl:value-of select="/html/set/country[@id=$country]" />
+      </xsl:element>

      <!-- Team homepage -->
      <xsl:if test="homepage != ''">
-        <xsl:element name="strong">
-          <xsl:element name="a">
-            <xsl:attribute name="href">
-              <xsl:value-of select="homepage" />
-            </xsl:attribute>
-            Team Homepage
-          </xsl:element>
-        </xsl:element>
+	  <xsl:element name="strong">
+		  <xsl:element name="a">
+		    <xsl:attribute name="href">
+			<xsl:value-of select="homepage" />
+		    </xsl:attribute>
+		    Team Homepage
+		  </xsl:element>
+		</xsl:element>
      </xsl:if>

      <!-- Address -->
      <xsl:if test="address != ''">
-        <xsl:apply-templates select="address"/>
+      <xsl:apply-templates select="address"/>
      </xsl:if>

      <!-- Email -->
      <xsl:if test="email != ''">
        <xsl:element name="p">
-          <xsl:value-of select="/buildinfo/document/text[@id='email']" />
+          <xsl:value-of select="/html/text[@id='email']" />
          <xsl:text> </xsl:text>
          <xsl:element name="a">
            <xsl:attribute name="href">
@ -54,7 +52,7 @@
      <!-- Phone -->
      <xsl:if test="phone != ''">
        <xsl:element name="p">
-          <xsl:value-of select="/buildinfo/document/text[@id='phone']" />
+          <xsl:value-of select="/html/text[@id='phone']" />
          <xsl:text> </xsl:text>
          <xsl:value-of select="phone" />
        </xsl:element>
@ -63,7 +61,7 @@
      <!-- Fax -->
      <xsl:if test="fax != ''">
        <xsl:element name="p">
-          <xsl:value-of select="/buildinfo/document/text[@id='fax']" />
+          <xsl:value-of select="/html/text[@id='fax']" />
          <xsl:text> </xsl:text>
          <xsl:value-of select="fax" />
        </xsl:element>
@ -72,30 +70,30 @@
      <!-- Core team members -->
      <xsl:element name="p">
        <xsl:choose>
-          <xsl:when test="count(/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
-            <xsl:value-of select="/buildinfo/document/text[@id='members']" />
+          <xsl:when test="count(/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')])>0">
+            <xsl:value-of select="/html/text[@id='members']" />
            <xsl:text> </xsl:text>
-            <xsl:for-each select="/buildinfo/document/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
+            <xsl:for-each select="/html/set/person[count(country[text()=$country])>0 and contains(@teams, 'main')]">
              <xsl:if test="position()!=1">
                <xsl:text>, </xsl:text>
              </xsl:if>
-              <xsl:choose>
-                <xsl:when test="link != ''">
-                  <xsl:element name="a">
-                    <xsl:attribute name="href">
-                  <xsl:value-of select="link" />
-                    </xsl:attribute>
-                    <xsl:value-of select="name" />
-                  </xsl:element>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="name" />
-                </xsl:otherwise>
-              </xsl:choose>
+	      <xsl:choose>
+		<xsl:when test="link != ''">
+		  <xsl:element name="a">
+		    <xsl:attribute name="href">
+			<xsl:value-of select="link" />
+		    </xsl:attribute>
+		    <xsl:value-of select="name" />
+		  </xsl:element>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select="name" />
+		</xsl:otherwise>
+	      </xsl:choose>
            </xsl:for-each>
          </xsl:when>
          <xsl:otherwise>
-            <xsl:value-of select="/buildinfo/document/text[@id='nomembers']" />
+            <xsl:value-of select="/html/text[@id='nomembers']" />
          </xsl:otherwise>
        </xsl:choose>
      </xsl:element>
@ -103,4 +101,15 @@
    </xsl:for-each>
  </xsl:template>

+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="set" />
+  <xsl:template match="text" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/de/de.xsl
+++ b/de/de.xsl
@ -7,8 +7,7 @@
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  <xsl:import href="../tools/xsltsl/countries.xsl" />
  <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- To localise this page to a new country, copy this file and change the following:
  
@ -61,7 +60,7 @@
  <!--define contact information-->
  
  <xsl:template match="contact-details">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">

    <xsl:if test="@id = 'DE'">
  
@ -146,5 +145,15 @@
            </xsl:with-param>
        </xsl:call-template>
    </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/documents/documents.xsl
+++ b/documents/documents.xsl
@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
    <xsl:variable name="type"><xsl:value-of select="@type" /></xsl:variable>
    <xsl:element name="ul">
-      <xsl:for-each select="/buildinfo/document/set/document [@type = $type]">
+      <xsl:for-each select="/html/set/document [@type = $type]">
        <xsl:sort select="@date" order="descending" />
        <xsl:element name="li">
          <xsl:element name="p">
@ -40,4 +39,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> to output at all -->
+  <xsl:template match="set" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/documents/whyfs.xsl
+++ b/documents/whyfs.xsl
@ -3,11 +3,22 @@
 <xsl:stylesheet version="1.0"
                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml"
+           encoding="UTF-8"
+           indent="yes"
+           />

  <xsl:template match="speakers">
-    <xsl:copy-of select="/buildinfo/document/set/table" />
+    <xsl:copy-of select="/html/set/table" />
+  </xsl:template>
+  
+  <!-- Do not copy <set> to output at all -->
+  <xsl:template match="set" />
+
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2001.xsl
+++ b/donate/thankgnus-2001.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2002.xsl
+++ b/donate/thankgnus-2002.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2003.xsl
+++ b/donate/thankgnus-2003.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2004.xsl
+++ b/donate/thankgnus-2004.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2005.xsl
+++ b/donate/thankgnus-2005.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2006.xsl
+++ b/donate/thankgnus-2006.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2007.xsl
+++ b/donate/thankgnus-2007.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2008.xsl
+++ b/donate/thankgnus-2008.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2009.xsl
+++ b/donate/thankgnus-2009.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2010.xsl
+++ b/donate/thankgnus-2010.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2011.xsl
+++ b/donate/thankgnus-2011.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus-2012.xsl
+++ b/donate/thankgnus-2012.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -10,7 +9,7 @@
    <xsl:choose>
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="tr">
              <xsl:element name="td">
                <xsl:element name="img">
@ -27,7 +26,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor">
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
            </xsl:element>
@ -36,5 +35,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/donate/thankgnus.xsl
+++ b/donate/thankgnus.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- $today = current date (given as <html date="...">) -->
  <xsl:variable name="today">
-    <xsl:value-of select="/buildinfo/@date"/>
+    <xsl:value-of select="/html/@date"/>
  </xsl:variable>

  <!-- $frommonth = date from which the list should start -->
@ -21,7 +20,7 @@
      <xsl:when test="$group='patrons'">
        <xsl:element name="table">
          <xsl:attribute name="id">patrons</xsl:attribute>
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
            <xsl:sort select="translate(node(),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
            <xsl:element name="tr">
              <xsl:element name="td">
@ -39,7 +38,7 @@
      </xsl:when>
      <xsl:otherwise>
        <xsl:element name="ul">
-          <xsl:for-each select="/buildinfo/document/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
+          <xsl:for-each select="/html/set/*[name(.)=$group]/donor[translate(@date,'-','')&gt;=translate($frommonth,'-','')]">
            <xsl:sort select="translate(node(),'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
            <xsl:element name="li">
              <xsl:apply-templates select="node()"/>
@ -49,5 +48,15 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
+
+  <!-- Do not copy <set> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

--- a/events/events.ics.xsl
+++ b/events/events.ics.xsl
@ -53,16 +53,16 @@
  </xsl:template>

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="body">
+  <xsl:template match="/html/body">
 	  <xsl:text>BEGIN:VCALENDAR</xsl:text><xsl:call-template name="nl" />
 	  <xsl:text>VERSION:2.0</xsl:text><xsl:call-template name="nl" />
 	  <xsl:text>PRODID:fsfe.org/events/events.ics.xsl</xsl:text><xsl:call-template name="nl" />
      <!-- $today = current date (given as <html date="...">) -->
      <xsl:variable name="today">
-        <xsl:value-of select="/buildinfo/@date" />
+        <xsl:value-of select="/html/@date" />
      </xsl:variable>
      <!-- Future events -->
-      <xsl:for-each select="/buildinfo/document/set/event
+      <xsl:for-each select="/html/set/event
        [translate (@start, '-', '') &gt;= translate ($today, '-', '')]">
        <xsl:sort select="@start" order="descending" />
        <xsl:call-template name="event">
--- a/events/events.rss.xsl
+++ b/events/events.rss.xsl
@ -11,7 +11,7 @@

  <!-- $today = current date (given as <html date="...">) -->
  <xsl:variable name="today">
-    <xsl:value-of select="/buildinfo/@date" />
+    <xsl:value-of select="/html/@date" />
  </xsl:variable>

  
@ -47,7 +47,7 @@
        </image>

        <!-- Event items -->
-        <xsl:for-each select="/buildinfo/document/set/event
+        <xsl:for-each select="/html/set/event
          [translate (@end, '-', '') &gt;= translate ($today, '-', '')]">
          <xsl:sort select="@start" />
          <xsl:if test="position() &lt; 11">
--- a/events/events.xsl
+++ b/events/events.xsl
@ -5,8 +5,7 @@
  xmlns:dt="http://xsltsl.org/date-time">

  <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  <!-- 
      For documentation on tagging (e.g. fetching news and events), take a
@ -14,27 +13,27 @@
        /tools/xsltsl/tagging-documentation.txt
  -->

+  <!-- Basically, copy everything -->
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
  <!-- we need to include some things for event maps -->
-  <xsl:template match="head">
-    <head>
-      <xsl:call-template name="fsfe-head" />
-      <xsl:element name="link">
-        <xsl:attribute name="rel">stylesheet</xsl:attribute>
-        <xsl:attribute name="href">/look/leaflet.css</xsl:attribute>
-      </xsl:element>
-      <xsl:element name="script">
-        <xsl:attribute name="type">text/javascript</xsl:attribute>
-        <xsl:attribute name="src">/scripts/leaflet.js</xsl:attribute>
-      </xsl:element>
-      <xsl:element name="script">
-        <xsl:attribute name="type">text/javascript</xsl:attribute>
-        <xsl:attribute name="src">/scripts/map.js</xsl:attribute>
-      </xsl:element>
-    </head>
+  <xsl:template match="/html/head">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+
+      <link rel="stylesheet" href="/look/leaflet.css" />
+      <script type="text/javascript" src="/scripts/leaflet.js"></script>
+      <script type="text/javascript" src="/scripts/map.js"></script>
+    </xsl:copy>
  </xsl:template>

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="body">
+  <xsl:template match="/html/body">
+    <xsl:element name="body">
      <!-- First, include what's in the source file -->
      <xsl:apply-templates />
      
@ -62,6 +61,18 @@
          <xsl:with-param name="display-year" select="'yes'" />
      </xsl:call-template>

+    </xsl:element>
+  </xsl:template>
+
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="set" />
+  <xsl:template match="text" />
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
  </xsl:template>

 </xsl:stylesheet>
--- a/fellowship/fellowship.xsl
+++ b/fellowship/fellowship.xsl
--- a/fellowship/index.xsl
+++ b/fellowship/index.xsl
@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="default.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

-  <xsl:template match="body">
+  <xsl:template match="/html/head">
+    <xsl:copy>
+      <xsl:element name="link">
+        <xsl:attribute name="href">/look/fellowship.css</xsl:attribute>
+        <xsl:attribute name="rel">stylesheet</xsl:attribute>
+      </xsl:element>
+
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="/html/body">
    <!-- xsl:attribute name="id">fellowship</xsl:attribute -->
+
+    <xsl:copy>
      <div id="fellowship">
        <xsl:apply-templates />
      </div>
+    </xsl:copy>
+  </xsl:template>
+
+  <!--
+  <xsl:template match="/html/body/div[@id='wrapper-inner']/div[@id='header']/div[@id='logo']/a/img">
+    <xsl:attribute name="src">/graphics/fellowship/logo.png</xsl:attribute>
+  </xsl:template>
+  -->
+
+  <xsl:template match="@* | node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()" />
+    </xsl:copy>
  </xsl:template>
 </xsl:stylesheet>
--- a/fi/fi.xsl
+++ b/fi/fi.xsl
@ -7,8 +7,7 @@
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  <xsl:import href="../tools/xsltsl/countries.xsl" />
  <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- To localise this page to a new country, copy this file and change the following:
  
@ -61,7 +60,7 @@
  <!--define contact information-->
  
  <xsl:template match="contact-details">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">

    <xsl:if test="@id = 'FI'">
  
@ -146,5 +145,15 @@
            </xsl:with-param>
        </xsl:call-template>
    </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/fr/fr.fr.xhtml
+++ b/fr/fr.fr.xhtml
@ -40,10 +40,11 @@ soutien de la liberté logicielle." />
    
    <div id="news" class="section">
      <h2>
-        <a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="Actualités RSS" title="flux RSS des nouvelles" /></a>
-        <a class="ical" href="http://identi.ca/fsfefrance"><img src="/graphics/identica.png" alt="identica" title="suivez l'équipe française de la FSFE sur identi.ca"/></a>
-        
-        <a href="/news/news.html"><news-label /></a>
+	<a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="Actualités RSS" title="flux RSS des nouvelles" /></a>
+	<a class="ical" href="http://identi.ca/fsfefrance"><img src="/graphics/identica.png" alt="identica" title="suivez l'équipe française de la FSFE sur identi.ca"/></a>
+	
+	<a href="/news/news.html"><news-label /></a>
+	
      </h2>
      
      <!-- this element fetches all news items which have the relevant country tag -->
--- a/fr/fr.xsl
+++ b/fr/fr.xsl
@ -7,8 +7,7 @@
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  <xsl:import href="../tools/xsltsl/countries.xsl" />
  <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- To localise this page to a new country, copy this file and change the following:
  
@ -61,7 +60,7 @@
  <!--define contact information-->
  
  <xsl:template match="contact-details">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">

    <xsl:if test="@id = 'FR'">
  
@ -146,5 +145,15 @@
            </xsl:with-param>
        </xsl:call-template>
    </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/fsfe.xsl
+++ b/fsfe.xsl
--- a/index.en.xhtml
+++ b/index.en.xhtml
@ -26,7 +26,7 @@

    <div id="feeds">
      <div id="news" class="section">
-        <h2 id="id-news">
+        <h2>
          <a class="rss-feed" href="/news/news.rss"><img src="/graphics/rss.png" alt="News RSS" title="news RSS feed" /></a>
          <a class="ical" href="http://identi.ca/fsfe"><img src="/graphics/identica.png" alt="identica" title="follow FSFE on identi.ca"/></a>
          <a href="/news/news.html"><news-label /></a>
@ -36,7 +36,7 @@
      </div>

      <div id="newsletter" class="section">
-        <h2 id="id-newsletter"><a href="/news/newsletter.html"><newsletter-label /></a></h2>
+        <h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

        <div class="entry">
          <p>
@ -53,7 +53,7 @@
      </div>

      <div id="events" class="section">
-        <h2 id="id-events">
+        <h2>
          <a class="rss-feed" href="/events/events.rss"><img src="/graphics/rss.png" alt="Events RSS" title="events RSS feed" /></a>
          <a class="ical" href="webcal://fsfe.org/events/events.ics"><img src="/graphics/ical.png" alt="iCal" title="FSFE events as iCal feed" /></a>
          <a href="/events/events.html"><events-label /></a>
--- a/index.xsl
+++ b/index.xsl
@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:dt="http://xsltsl.org/date-time"
+  exclude-result-prefixes="dt">
  
  <xsl:import href="tools/xsltsl/date-time.xsl" />
  <xsl:import href="tools/xsltsl/tagging.xsl" />
  <xsl:import href="tools/xsltsl/translations.xsl" />
  <xsl:import href="tools/xsltsl/static-elements.xsl" />
  <xsl:import href="tools/xsltsl/quotes.xsl" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
-  <xsl:import href="fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
  
-  <xsl:template match="body">
+  <!-- The top level element of the input file is "buildinfo" -->
+  <xsl:template match="buildinfo">
+    <xsl:apply-templates select="node()"/>
+  </xsl:template>
+
+  <xsl:template match="/html/body">
+    <xsl:copy>
      <div id="frontpage">
        <xsl:apply-templates />
      </div>
+    </xsl:copy>
  </xsl:template>
  
  <xsl:template match="quote-box">
@ -212,4 +221,19 @@
    <xsl:call-template name="subscribe-nl" />
  </xsl:template>
  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags | text"/>
+  
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@* | node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="@dt:*">
+    <xsl:attribute name="{local-name()}">
+      <xsl:value-of select="." />
+    </xsl:attribute>
+  </xsl:template>
 </xsl:stylesheet>
--- a/it/it.xsl
+++ b/it/it.xsl
@ -7,8 +7,7 @@
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  <xsl:import href="../tools/xsltsl/countries.xsl" />
  <xsl:import href="../tools/xsltsl/translations.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />

  <!-- To localise this page to a new country, copy this file and change the following:
  
@ -61,7 +60,7 @@
  <!--define contact information-->
  
  <xsl:template match="contact-details">
-    <xsl:for-each select="/buildinfo/document/set/contact">
+    <xsl:for-each select="/html/set/contact">

    <xsl:if test="@id = 'IT'">
  
@ -146,5 +145,15 @@
            </xsl:with-param>
        </xsl:call-template>
    </xsl:template>
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/news/legal-news.xsl
+++ b/news/legal-news.xsl
@ -3,8 +3,13 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
  
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+  
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
  
  <xsl:template match="legal-news">
    <xsl:call-template name="fetch-news">
@ -12,4 +17,15 @@
    </xsl:call-template>
  </xsl:template>
  
+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+  
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+  
 </xsl:stylesheet>
--- a/news/news.rss.xsl
+++ b/news/news.rss.xsl
@ -16,7 +16,7 @@

  <!-- $today = current date (given as <html date="...">) -->
  <xsl:variable name="today">
-    <xsl:value-of select="/buildinfo/@date" />
+    <xsl:value-of select="/html/@date" />
  </xsl:variable>

  <!-- ======== -->
@ -130,7 +130,7 @@
        </xsl:element>
        
        <!-- News items -->
-        <xsl:for-each select="/buildinfo/document/set/news
+        <xsl:for-each select="/html/set/news
          [translate (@date, '-', '') &lt;= translate ($today, '-', '')]">
          <xsl:sort select="@date" order="descending"/>
          <xsl:if test="position() &lt; 11">
@ -280,4 +280,14 @@ Make a one time donation: http://fsfe.org/donate/donate.html</xsl:text>
    </xsl:element>
  </xsl:template>
  
+  <!-- Do not copy <body-complete> to output at all -->
+  <xsl:template match="body-complete"/>
+  
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+  
 </xsl:stylesheet>
--- a/news/news.xsl
+++ b/news/news.xsl
@ -2,21 +2,21 @@

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />

  <!-- In /html/body node, append dynamic content -->
-  <xsl:template match="body">
+  <xsl:template match="/html/body">
+    <xsl:copy>
      <!-- First, include what's in the source file -->
      <xsl:apply-templates />

      <!-- $today = current date (given as <html date="...">) -->
      <xsl:variable name="today">
-        <xsl:value-of select="/buildinfo/@date" />
+        <xsl:value-of select="/html/@date" />
      </xsl:variable>

      <!-- Show news except those in the future, but no newsletters -->
-      <xsl:for-each select="/buildinfo/document/set/news
+      <xsl:for-each select="/html/set/news
        [translate (@date, '-', '') &lt;= translate ($today, '-', '') and
         not (@type = 'newsletter')]">
        <xsl:sort select="@date" order="descending" />
@ -43,17 +43,29 @@
        <!-- End news entry -->

      </xsl:for-each>
+    </xsl:copy>
  </xsl:template>

+  <!-- Do not copy <set> and <text> to output at all -->
+  <xsl:template match="/html/set" />
+  <xsl:template match="/html/text" />
+
  <!-- How to show a link -->
-  <xsl:template match="/buildinfo/document/set/news/link">
+  <xsl:template match="/html/set/news/link">
    <xsl:element name="a">
      <xsl:attribute name="href">
        <xsl:value-of select="text()" />
      </xsl:attribute>
      <xsl:text>[</xsl:text>
-        <xsl:value-of select="/buildinfo/document/text[@id='more']" />
+      <xsl:value-of select="/html/text[@id='more']" />
      <xsl:text>]</xsl:text>
    </xsl:element>
  </xsl:template>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>
--- a/news/newsletter.xsl
+++ b/news/newsletter.xsl
@ -5,29 +5,44 @@
  <xsl:import href="../tools/xsltsl/translations.xsl" />
  <xsl:import href="../tools/xsltsl/static-elements.xsl" />
  
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/>

-  <xsl:template match="body">
-    <xsl:apply-templates />
-
-    <!-- $today = current date (given as <html date="...">) -->
-    <xsl:variable name="today">
-      <xsl:value-of select="/buildinfo/@date" />
-    </xsl:variable>
-
-    <xsl:for-each select="/buildinfo/document/set/news[translate(@date,'-','') &lt;= translate($today,'-','')]">
-      <xsl:sort select="@date" order="descending"/>
-      <p>
-        <b><xsl:value-of select="@date" /></b><br/>
-        <xsl:value-of select="body"/>
-        <xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
-        <xsl:if test="$link!=''">
-          [<a href="{link}"><xsl:value-of select="/buildinfo/document/text[@id='more']"/>]</a>
-        </xsl:if>
-      </p>
-    </xsl:for-each>
+  <xsl:template match="/">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
  </xsl:template>
+
+  <xsl:template match="/html/body">
+    <body>
+      <xsl:apply-templates />
+
+      <!-- $today = current date (given as <html date="...">) -->
+      <xsl:variable name="today">
+        <xsl:value-of select="/html/@date" />
+      </xsl:variable>
+
+      <xsl:for-each select="/html/set/news[translate(@date,'-','') &lt;= translate($today,'-','')]">
+        <xsl:sort select="@date" order="descending"/>
+        <p>
+         <b><xsl:value-of select="@date" /></b><br/>
+         <xsl:value-of select="body"/>
+         <xsl:variable name="link"><xsl:value-of select="link"/></xsl:variable>
+         <xsl:if test="$link!=''">
+           [<a href="{link}"><xsl:value-of select="/html/text[@id='more']"/>]</a>
+         </xsl:if>
+        </p>
+      </xsl:for-each>
+    </body>
+  </xsl:template>
+
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="set | tags"/>
  
  <!--translated sentence "receive-newsletter"-->
  <xsl:template match="receive-newsletter">
--- a/order/order.xsl
+++ b/order/order.xsl
@ -1,8 +1,7 @@
 <?xml version="1.0"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>

  <!-- Fill dynamic content -->
  <xsl:template match="dynamic-content">
@ -11,7 +10,7 @@
    <xsl:element name="table">
      <xsl:attribute name="id">merchandise</xsl:attribute>

-      <xsl:for-each select="/buildinfo/document/set/item [@type = $type]">
+      <xsl:for-each select="/html/set/item [@type = $type]">
        <xsl:sort select="@date" order="descending"/>
        <xsl:variable name="id"><xsl:value-of select="@id"/></xsl:variable>
        <xsl:variable name="price"><xsl:value-of select="@price"/></xsl:variable>
@ -42,14 +41,14 @@
            <xsl:attribute name="class">description</xsl:attribute>

            <xsl:element name="h3">
-              <xsl:value-of select="/buildinfo/document/set/info[@id=$id]/name"/>
+              <xsl:value-of select="/html/set/info[@id=$id]/name"/>
              <xsl:text> (€</xsl:text>
              <xsl:value-of select="@price"/>
              <xsl:text>)</xsl:text>
            </xsl:element>

            <xsl:apply-templates
-              select="/buildinfo/document/set/info[@id=$id]/description/node()"/>
+              select="/html/set/info[@id=$id]/description/node()"/>
          </xsl:element>

          <!-- Order quantity -->
@ -94,4 +93,14 @@
    </xsl:element>
  </xsl:template>

+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+  
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>
--- a/press/press.xsl
+++ b/press/press.xsl
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>

 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  <!-- $today = current date (given as <html date="...">) -->
  <xsl:variable name="today">
-    <xsl:value-of select="/buildinfo/@date"/>
+    <xsl:value-of select="/html/@date"/>
  </xsl:variable>

  <!-- Fill dynamic content -->
@ -15,7 +14,7 @@
      <xsl:attribute name="id">press-releases</xsl:attribute>

      <!-- Show news except those in the future, but no newsletters -->
-      <xsl:for-each select="/buildinfo/document/set/news[translate(@date,'-','')&lt;=translate($today,'-','') and not(@type='newsletter')]">
+      <xsl:for-each select="/html/set/news[translate(@date,'-','')&lt;=translate($today,'-','') and not(@type='newsletter')]">
        <xsl:sort select="@date" order="descending" />

        <!-- A news entry -->
@ -34,4 +33,14 @@
      </xsl:for-each>
    </xsl:element>
  </xsl:template>
+
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>
--- a/tags/tagged.xsl
+++ b/tags/tagged.xsl
@ -6,8 +6,7 @@
  
  <xsl:import href="../tools/xsltsl/date-time.xsl" />
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  <!-- 
    For documentation on tagging (e.g. fetching news and events), take a
@ -35,5 +34,16 @@
    </xsl:call-template>
 	
  </xsl:template>
+  
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/tags/tags.xsl
+++ b/tags/tags.xsl
@ -6,8 +6,7 @@
  
  <xsl:import href="../tools/xsltsl/date-time.xsl" />
  <xsl:import href="../tools/xsltsl/tagging.xsl" />
-  <xsl:import href="../fsfe.xsl" />
-  <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
+  <xsl:output method="xml" encoding="UTF-8" indent="yes" />
  
  <!-- 
    For documentation on tagging (e.g. fetching news and events), take a
@ -35,5 +34,16 @@
    <xsl:call-template name="all-tags-events"/>
 	
  </xsl:template>
+  
+  
+  <!-- Do not copy <set> or <text> to output at all -->
+  <xsl:template match="set | tags"/>
+
+  <!-- For all other nodes, copy verbatim -->
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>

 </xsl:stylesheet>
--- a/tools/build.pl
+++ b/tools/build.pl
@ -131,6 +131,11 @@ $SIG{CHLD} = 'IGNORE';
 my $parser = XML::LibXML->new('encoding'=>'utf-8');
 my $xslt_parser = XML::LibXSLT->new('encoding'=>'utf-8');

+# Parse the global stylesheet
+
+my $global_style_doc = $parser->parse_file($opts{i}."/fsfe.xsl");
+my $global_stylesheet = $xslt_parser->parse_stylesheet($global_style_doc);
+
 #
 # First topic of today: create all directories we need. Instead of creating
 # these as they are used, we create them in a batch at the beginning of each
@ -426,34 +431,25 @@ sub process {
          }
    	  }

-			if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
-						(stat($source))[9] && $opts{u} && ! -f "$xsl_file" ) {
-					next;
-			}
+        if ( (stat("$opts{o}/$dir/$file.$lang.html"))[9] >
+             (stat($source))[9] && $opts{u} && ! -f "$opts{i}/$file.xsl" ) {
+           next;
+        }

-      #
-      # Here begins automated magic for those pages which we need to
-      # assemble other sets of informations for first (automatically
-      # updated pages).
-      #
-      #
-      # choose the xsl file we will use
-      if (-f "$opts{i}/$file.xsl") {
-        $xsl_file = "$opts{i}/$file.xsl";
-      } elsif (-f "$opts{i}/$current_dir/default.xsl") {
-        $xsl_file = "$opts{i}/$current_dir/default.xsl";
-      } else {
-        $xsl_file = "$opts{i}/default.xsl";
-      }
-			
-			#
-			# Settle down please, children. First we remove all previous
-			# document leftovers.
-			#
-			foreach ($root->getElementsByTagName("document")) {
-				$root->removeChild($_);
-			}
-			$root->appendChild($document);
+        #
+        # Here begins automated magic for those pages which we need to
+        # assemble other sets of informations for first (automatically
+        # updated pages).
+        #
+      	if (-f "$opts{i}/$file.xsl") {
+          #
+          # Settle down please, children. First we remove all previous
+          # document leftovers.
+          #
+          foreach ($root->getElementsByTagName("document")) {
+	          $root->removeChild($_);
+          }
+          $root->appendChild($document);

          # Create the <timestamp> tag automatically for these documents
          my $timestamp = $dom->createElement("timestamp");
@ -491,229 +487,231 @@ sub process {
            }
          }

-      #
-      # With that information, we load the source document and create
-      # a new element in it, called <set>, which will hold the combined
-      # knowledge of all the sets in the source files.
-      #
-      my $sourcedoc = $parser->parse_file($source);
-      $sourcedoc->documentElement->setAttribute("date", $current_date);
-      $sourcedoc->documentElement->setAttribute("lang", $lang);
-      if ($sourcedoc->documentElement->getAttribute("external") eq "yes") {
-        $document->setAttribute("external", "yes");
-      }
-      if ($sourcedoc->documentElement->getAttribute("newsdate")) {
-        $document->setAttribute("newsdate", $sourcedoc->documentElement->getAttribute("newsdate"));
-      }
-      if ($sourcedoc->documentElement->getAttribute("type")) {
-        $document->setAttribute("type", $sourcedoc->documentElement->getAttribute("type"));
-      }
-      
-      
-      my $auto_data = $sourcedoc->createElement("set");
+          #
+          # With that information, we load the source document and create
+          # a new element in it, called <set>, which will hold the combined
+          # knowledge of all the sets in the source files.
+          #
+          my $sourcedoc = $parser->parse_file($source);
+          $sourcedoc->documentElement->setAttribute("date", $current_date);
+          $sourcedoc->documentElement->setAttribute("lang", $lang);
+          my $auto_data = $sourcedoc->createElement("set");

-			while (my ($base, $l) = each %files) {
-				if (($dir eq "global") && ($l ne $lang)) {
-					lock(*TRANSLATIONS);
-					print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
-					unlock(*TRANSLATIONS);
-				}
-				print STDERR "Loading $base.$l.xml\n" if $opts{d};
-				my $source_data = $parser->parse_file("$base.$l.xml");
-				foreach ($source_data->documentElement->childNodes) {
-					my $c = $_->cloneNode(1);
-					# add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
-					if (ref($c) eq "XML::LibXML::Element") {
-						$base =~ /.*[\/_]([^\/_]*$)/;
-						$c->setAttribute( "filename", $1 );
-					}
-					$auto_data->appendChild($c);
-				}
-			}
-			$sourcedoc->documentElement->appendChild($auto_data);
-			
-			foreach ($sourcedoc->documentElement->childNodes) {
-				my $c = $_->cloneNode(1);
-				$document->appendChild($c);
-			}
-			
-			# beginning of old fsfe.xsl addings
-			
-			#
-			# Find out if this translation is to be regarded as outdated or not.
-			# A translation is deemed outdated if it is more than 2 hours older
-			# than the original. This makes sure a translation committed together
-			# with the original (but maybe a second earlier) isn't marked outdated.
-			#
-			my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
-			if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
-						and not $cant_be_outdated{$file} ) {
-					$root->setAttribute("outdated", "yes");
-					if ($dir eq "global") {
-						lock(*TRANSLATIONS);
-						print TRANSLATIONS "$lang $source $originalsource\n";
-						unlock(*TRANSLATIONS);
-					}
+          while (my ($base, $l) = each %files) {
+              if (($dir eq "global") && ($l ne $lang)) {
+	              lock(*TRANSLATIONS);
+                print TRANSLATIONS "$lang $base.$lang.xml $base.$l.xml\n";
+      		      unlock(*TRANSLATIONS);
+              }
+              print STDERR "Loading $base.$l.xml\n" if $opts{d};
+              my $source_data = $parser->parse_file("$base.$l.xml");
+              foreach ($source_data->documentElement->childNodes) {
+                 my $c = $_->cloneNode(1);
+                 # add the filename to nodes (news, events, …) so that we can use it as an identifier (e.g. for RSS)
+                 if (ref($c) eq "XML::LibXML::Element") {
+                   $base =~ /.*[\/_]([^\/_]*$)/;
+                   $c->setAttribute( "filename", $1 );
+                 }
+                 $auto_data->appendChild($c);
+              }
+          }
+          $sourcedoc->documentElement->appendChild($auto_data);
+          
+          #
+          # Get the appropriate textset for this language. If one can't be
+          # found, use the English. (I hope this never happens)
+          #
+          my $textlang = $lang;
+          unless (-f $opts{i}."/tools/texts-content-$textlang.xml") {
+              $textlang = "en";
+          }
+          
+          my $textdoc = $sourcedoc->createElement("textset-content");
+          $auto_data->appendChild($textdoc);
+          clone_document($textdoc, $opts{i}."/tools/texts-content-$textlang.xml");
+          
+          # Get also backup texts from the English file
+          my $textdocbak = $sourcedoc->createElement("textset-content-backup");
+          $auto_data->appendChild($textdocbak);
+          clone_document($textdocbak, $opts{i}."/tools/texts-content-en.xml");
+          
+          # TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
+          # since it does not depend on the xsl file being treated, we should do it only once!
+          
+          #
+          # Transform the document using the XSL file and then push the
+          # result into the <document> element of the document we're building.
+          #
+          my $style_doc = $parser->parse_file("$opts{i}/$file.xsl");
+          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+          my $results = $stylesheet->transform($sourcedoc);
+
+          foreach ($results->documentElement->childNodes) {
+            my $c = $_->cloneNode(1);
+            $document->appendChild($c);
+          }
+
+          #
+          # Now, while we're just at it, we create the RSS feeds if we want any
+          #
+	        if (-f "$opts{i}/$file.rss.xsl") {
+            my $style_doc = $parser->parse_file("$opts{i}/$file.rss.xsl");
+	          my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+	          my $results = $stylesheet->transform($sourcedoc);
+	          $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.rss")
+    	      unless $opts{n};
+          }
+
+    		  #
+          # and possibly the corresponding iCal (ics) file
+          #
+  	      if (-f "$opts{i}/$file.ics.xsl") {
+            my $style_doc = $parser->parse_file("$opts{i}/$file.ics.xsl");
+			      my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
+			      my $results = $stylesheet->transform($sourcedoc);
+			      $stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.ics")
+			      unless $opts{n};
+          }
+          
+          } else {
+            #
+            # If this wasn't an automatically updating document, we simply
+            # clone the contents of the source file into the document.
+            #
+      	    clone_document($document, $source);
+          }
+
+          #
+          # Find out if this translation is to be regarded as outdated or not.
+          # A translation is deemed outdated if it is more than 2 hours older
+          # than the original. This makes sure a translation committed together
+          # with the original (but maybe a second earlier) isn't marked outdated.
+          #
+          my $originalsource = "$file.".$root->getAttribute("original").".xhtml";
+	        if (( stat("$opts{i}/$originalsource"))[9] > (stat($source))[9] + 7200
+	              and not $cant_be_outdated{$file} ) {
+	          $root->setAttribute("outdated", "yes");
+		        if ($dir eq "global") {
+			        lock(*TRANSLATIONS);
+		          print TRANSLATIONS "$lang $source $originalsource\n";
+			        unlock(*TRANSLATIONS);
+		        }
 			} else {
 				$root->setAttribute("outdated", "no");
 			}

-			#
-			# Get the appropriate textset for this language. If one can't be
-			# found, use the English. (I hope this never happens)
-			#
-			my $textlang = $lang;
-			unless (-f $opts{i}."/tools/texts-$textlang.xml") {
-					$textlang = "en";
-			}
-
-			my $textdoc = $dom->createElement("textset");
-			$root->appendChild($textdoc);
-			clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
-			
-			#
-			# Read the fundraising text, if it exists.
-			#
-			if (-f $opts{i}."/fundraising.$lang.xml") {
-				my $fundraisingdoc = $dom->createElement("fundraising");
-				$root->appendChild($fundraisingdoc);
-				clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
-			} elsif (-f $opts{i}."/fundraising.en.xml") {
-				my $fundraisingdoc = $dom->createElement("fundraising");
-				$root->appendChild($fundraisingdoc);
-				clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
-			}
-
-
-			#
-			# And then we do the same thing for the menues. But first we take the
-			# global menu here, then we add any information that is specific to
-			# the focus.
-			#
-			foreach ($root->getElementsByTagName("menuset")) {
-					$root->removeChild($_);
-			}
-
-			my %menu;
-			foreach ('global', $dir) {
-					if (-f $opts{i}."/tools/menu-$_.xml") {
-				my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
-				foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
-						$menu{$n->getAttribute("id")} = $n;
-				}
-					}
-			}
-			my $menuroot = $dom->createElement("menuset");
-			while (my ($id, $n) = each %menu) {
-								my $m = $n->cloneNode(1);
-					$menuroot->appendChild($m);
-			}
-			$root->appendChild($menuroot);
-			
-			#
-			# Do the actual transformation.
-			#
-			#my $results = $global_stylesheet->transform($dom);
-			
-			# TODO: optimise getting texts-content-xx.xml and texts-content-en.xml,
-			# since it does not depend on the xsl file being treated, we should do it only once!
-			
-			if ( $file eq $toCompile and $lang eq "en" ) {
-				open (TEST, ">/home/nicolas/FSFE/fsfe-web-out/test.xml");
-				print TEST $dom->toString();
-				close (TEST);
-			}
-			
-			#
-			# Transform the document using the XSL file and then push the
-			# result into the <document> element of the document we're building.
-			#
-			my $style_doc = $parser->parse_file($xsl_file);
-			my $stylesheet = $xslt_parser->parse_stylesheet($style_doc);
-			my $results = $stylesheet->transform($dom);
-			
-# 			foreach ($results->documentElement->childNodes) {
-# 				my $c = $_->cloneNode(1);
-# 				$document->appendChild($c);
-# 			}
-
-			#
-			# Now, while we're just at it, we create the RSS feeds if we want any
-			#
-			if (-f "$opts{i}/$file.rss.xsl") {
-				my $style_doc_rss = $parser->parse_file("$opts{i}/$file.rss.xsl");
-				my $stylesheet_rss = $xslt_parser->parse_stylesheet($style_doc_rss);
-				my $results_rss = $stylesheet_rss->transform($sourcedoc);
-				$stylesheet_rss->output_file($results_rss, "$opts{o}/$dir/$file.$lang.rss") unless $opts{n};
-			}
-			
-			#
-			# and possibly the corresponding iCal (ics) file
-			#
-			if (-f "$opts{i}/$file.ics.xsl") {
-				my $style_doc_ics = $parser->parse_file("$opts{i}/$file.ics.xsl");
-				my $stylesheet_ics = $xslt_parser->parse_stylesheet($style_doc_ics);
-				my $results_ics = $stylesheet_ics->transform($sourcedoc);
-				$stylesheet_ics->output_file($results_ics, "$opts{o}/$dir/$file.$lang.ics") unless $opts{n};
-			}
-
-			#
-			# In post-processing, we replace links pointing back to ourselves
-			# so that they point to the correct language.
-			#
-# 			if (0) {
-			foreach ($results->documentElement->getElementsByTagName("a")) {
-				my $href = $_->getAttribute("href");
-				if ($href =~ /^http:\/\/www.fsfe.org/) {
-					if ($_->textContent != "Our global work") {
-						$href =~ s/http:\/\/www.fsfe.org//;
-					}
-				}
-				if (($href !~ /^http/) && ($href !~ /^#/)) {
-					# Save possible anchor and remove it from URL
-					my $anchor = $href;
-					if (!($anchor =~ s/.*#/#/)) {
-						$anchor = "";
-					}
-					$href =~ s/#.*//;
-					# process URL
-					if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
-						$href =~ s/\.html$/\.$lang.html/;
-					} elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
-						$href =~ s/\.rss$/\.$lang.rss/;
-					} elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
-						$href =~ s/\.ics$/\.$lang.ics/;
-					} else {
-						if (-d $opts{i}."/$href") {
-							$href =~ s/\/?$/\/index.$lang.html/;
-						} elsif ($href =~ /\/\w+$/) {
-							$href .= ".$lang.html";
-						}
-					}
-					# replace anchor
-					$href .= $anchor;
-					# For pages running on an external server, use full URL
-					if ($document->getAttribute("external")) {
-						$href = "http://fsfe.org$href";
-					}
-					$_->setAttribute("href", $href);
-				}
-			}
-# 			}
-			
-			print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
-			
-			$stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html") unless $opts{n};
-			# Add foo.html.xx link which is used by Apache's MultiViews option when
-			# a user enters foo.html as URL.
-			link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang") unless $opts{n};
-		}
+	#
+	# Get the appropriate textset for this language. If one can't be
+	# found, use the English. (I hope this never happens)
+	#
+	my $textlang = $lang;
+	unless (-f $opts{i}."/tools/texts-$textlang.xml") {
+	    $textlang = "en";
 	}
-	print STDERR "\n" unless $opts{q};
+
+	my $textdoc = $dom->createElement("textset");
+	$root->appendChild($textdoc);
+	clone_document($textdoc, $opts{i}."/tools/texts-$textlang.xml");
+	
+	#
+	# Read the fundraising text, if it exists.
+	#
+	if (-f $opts{i}."/fundraising.$lang.xml") {
+	    my $fundraisingdoc = $dom->createElement("fundraising");
+	    $root->appendChild($fundraisingdoc);
+	    clone_document($fundraisingdoc, $opts{i}."/fundraising.$lang.xml");
+	} elsif (-f $opts{i}."/fundraising.en.xml") {
+	    my $fundraisingdoc = $dom->createElement("fundraising");
+	    $root->appendChild($fundraisingdoc);
+	    clone_document($fundraisingdoc, $opts{i}."/fundraising.en.xml");
+        }
+
+
+	#
+	# And then we do the same thing for the menues. But first we take the
+	# global menu here, then we add any information that is specific to
+	# the focus.
+	#
+	foreach ($root->getElementsByTagName("menuset")) {
+	    $root->removeChild($_);
+	}
+
+	my %menu;
+	foreach ('global', $dir) {
+	    if (-f $opts{i}."/tools/menu-$_.xml") {
+		my $menudoc = $parser->parse_file($opts{i}."/tools/menu-$_.xml");
+		foreach my $n ($menudoc->documentElement->getElementsByTagName("menu")) {
+		    $menu{$n->getAttribute("id")} = $n;
+		}
+	    }
+	}
+	my $menuroot = $dom->createElement("menuset");
+	while (my ($id, $n) = each %menu) {
+            my $m = $n->cloneNode(1);
+	    $menuroot->appendChild($m);
+	}
+	$root->appendChild($menuroot);
+
+        #
+        # Do the actual transformation.
+        #
+        my $results = $global_stylesheet->transform($dom);
+
+        #
+        # In post-processing, we replace links pointing back to ourselves
+        # so that they point to the correct language.
+        #
+        foreach ($results->documentElement->getElementsByTagName("a")) {
+          my $href = $_->getAttribute("href");
+          if ($href =~ /^http:\/\/www.fsfe.org/) {
+            if ($_->textContent != "Our global work") {
+              $href =~ s/http:\/\/www.fsfe.org//;
+            }
+          }
+          if (($href !~ /^http/) && ($href !~ /^#/)) {
+	    # Save possible anchor and remove it from URL
+	    my $anchor = $href;
+	    if (!($anchor =~ s/.*#/#/)) {
+	      $anchor = "";
+	    }
+	    $href =~ s/#.*//;
+	    # process URL
+	    if (($href =~ /\.html$/) && ($href !~ /\.[a-z][a-z]\.html$/)) {
+              $href =~ s/\.html$/\.$lang.html/;
+            } elsif (($href =~ /\.rss$/) && ($href !~ /\.[a-z][a-z]\.rss$/)) {
+              $href =~ s/\.rss$/\.$lang.rss/;
+            } elsif (($href =~ /\.ics$/) && ($href !~ /\.[a-z][a-z]\.ics$/)) {
+              $href =~ s/\.ics$/\.$lang.ics/;
+            } else {
+              if (-d $opts{i}."/$href") {
+                $href =~ s/\/?$/\/index.$lang.html/;
+              } elsif ($href =~ /\/\w+$/) {
+                $href .= ".$lang.html";
+              }
+            }
+	    # replace anchor
+	    $href .= $anchor;
+            # For pages running on an external server, use full URL
+            if ($document->getAttribute("external")) {
+              $href = "http://www.fsfe.org$href";
+            }
+            $_->setAttribute("href", $href);
+          }
+        }
+
+	print "Writing: $opts{o}/$dir/$file.$lang.html\n" if $opts{d};
+
+	$global_stylesheet->output_file($results, "$opts{o}/$dir/$file.$lang.html")
+		unless $opts{n};
+        # Add foo.html.xx link which is used by Apache's MultiViews option when
+        # a user enters foo.html as URL.
+        link("$opts{o}/$dir/$file.$lang.html", "$opts{o}/$dir/$file.html.$lang")
+		unless $opts{n};
+    }
+  }
+  print STDERR "\n" unless $opts{q};
 }

-
-
 # Close the logfile for outdated and missing translations
 close (TRANSLATIONS);

--- a/tools/texts-ar.xml
+++ b/tools/texts-ar.xml
@ -47,10 +47,4 @@
  <text id="menu4/sisters/fsf">إف&#8204;إس&#8204;إف</text>
  <text id="menu4/sisters/fsf_india">إف&#8204;إس&#8204;إف الهند</text>
  <text id="menu4/sisters/fsf_la">إف&#8204;إس&#8204;إف أمريكا اللاتينية</text>
-  
-  <text id="news">آخر الأخبار</text>
-  <text id="events">أحداث قادمة</text>
-  <text id="morenews">أخبار أخرى…</text>
-  <text id="moreevents">أحداث أخرى…</text>
-  
 </textset>
--- a/tools/texts-bg.xml
+++ b/tools/texts-bg.xml
@ -51,9 +51,4 @@
  <text id="menu3/sisters/fsf">FSF</text>
  <text id="menu3/sisters/fsf_india">FSF India</text>
  <text id="menu3/sisters/fsf_la">FSF Latin America</text>
-  
-  <text id="news">Последни новини</text>
-  <text id="events">Предстоящи събития</text>
-  <text id="morenews">Още новини…</text>
-  <text id="moreevents">Още събития…</text>
 </textset>
--- a/Show More
+++ b/Show More