Browse Source

bugfix: do not add nested <body> structure by accident

svn path=/trunk/; revision=33408
paul 2 years ago
parent
commit
7c1247a32b
80 changed files with 137 additions and 5 deletions
  1. 1
    1
      build/xslt/fsfe_mainsection.xsl
  2. 1
    0
      campaigns/pdfreaders/petition.ar.xhtml
  3. 1
    0
      campaigns/pdfreaders/petition.cs.xhtml
  4. 1
    0
      campaigns/pdfreaders/petition.cz.xhtml
  5. 1
    0
      campaigns/pdfreaders/petition.de.xhtml
  6. 1
    0
      campaigns/pdfreaders/petition.el.xhtml
  7. 1
    0
      campaigns/pdfreaders/petition.en.xhtml
  8. 1
    0
      campaigns/pdfreaders/petition.es.xhtml
  9. 1
    0
      campaigns/pdfreaders/petition.et.xhtml
  10. 1
    0
      campaigns/pdfreaders/petition.fr.xhtml
  11. 1
    0
      campaigns/pdfreaders/petition.hr.xhtml
  12. 1
    0
      campaigns/pdfreaders/petition.it.xhtml
  13. 1
    0
      campaigns/pdfreaders/petition.nl.xhtml
  14. 1
    0
      campaigns/pdfreaders/petition.pl.xhtml
  15. 1
    0
      campaigns/pdfreaders/petition.pt.xhtml
  16. 1
    0
      campaigns/pdfreaders/petition.ro.xhtml
  17. 1
    0
      campaigns/pdfreaders/petition.ru.xhtml
  18. 1
    0
      campaigns/pdfreaders/petition.sv.xhtml
  19. 1
    1
      campaigns/pdfreaders/petition.xsl
  20. 2
    0
      events/events.ca.xhtml
  21. 2
    0
      events/events.da.xhtml
  22. 2
    0
      events/events.de.xhtml
  23. 2
    0
      events/events.el.xhtml
  24. 2
    0
      events/events.en.xhtml
  25. 2
    0
      events/events.es.xhtml
  26. 2
    0
      events/events.fi.xhtml
  27. 2
    0
      events/events.fr.xhtml
  28. 2
    0
      events/events.hr.xhtml
  29. 2
    0
      events/events.hu.xhtml
  30. 2
    0
      events/events.it.xhtml
  31. 2
    0
      events/events.nb.xhtml
  32. 2
    0
      events/events.nl.xhtml
  33. 2
    0
      events/events.pl.xhtml
  34. 2
    0
      events/events.pt.xhtml
  35. 2
    0
      events/events.ro.xhtml
  36. 2
    0
      events/events.ru.xhtml
  37. 2
    0
      events/events.sq.xhtml
  38. 2
    0
      events/events.sr.xhtml
  39. 1
    1
      events/events.xsl
  40. 2
    0
      news/news.ca.xhtml
  41. 2
    0
      news/news.cs.xhtml
  42. 2
    0
      news/news.da.xhtml
  43. 2
    0
      news/news.de.xhtml
  44. 2
    0
      news/news.el.xhtml
  45. 2
    0
      news/news.en.xhtml
  46. 2
    0
      news/news.es.xhtml
  47. 2
    0
      news/news.et.xhtml
  48. 2
    0
      news/news.fi.xhtml
  49. 2
    0
      news/news.hr.xhtml
  50. 2
    0
      news/news.hu.xhtml
  51. 2
    0
      news/news.it.xhtml
  52. 2
    0
      news/news.nb.xhtml
  53. 2
    0
      news/news.nl.xhtml
  54. 2
    0
      news/news.pt.xhtml
  55. 2
    0
      news/news.ro.xhtml
  56. 2
    0
      news/news.ru.xhtml
  57. 2
    0
      news/news.sl.xhtml
  58. 2
    0
      news/news.sq.xhtml
  59. 2
    0
      news/news.sr.xhtml
  60. 2
    0
      news/news.sv.xhtml
  61. 1
    1
      news/news.xsl
  62. 2
    0
      news/newsletter.ca.xhtml
  63. 2
    0
      news/newsletter.cs.xhtml
  64. 2
    0
      news/newsletter.da.xhtml
  65. 2
    0
      news/newsletter.de.xhtml
  66. 2
    0
      news/newsletter.el.xhtml
  67. 1
    0
      news/newsletter.en.xhtml
  68. 2
    0
      news/newsletter.es.xhtml
  69. 2
    0
      news/newsletter.fi.xhtml
  70. 2
    0
      news/newsletter.fr.xhtml
  71. 2
    0
      news/newsletter.hr.xhtml
  72. 2
    0
      news/newsletter.hu.xhtml
  73. 2
    0
      news/newsletter.it.xhtml
  74. 2
    0
      news/newsletter.nb.xhtml
  75. 2
    0
      news/newsletter.nl.xhtml
  76. 2
    0
      news/newsletter.pt.xhtml
  77. 2
    0
      news/newsletter.ru.xhtml
  78. 2
    0
      news/newsletter.sq.xhtml
  79. 2
    0
      news/newsletter.sv.xhtml
  80. 1
    1
      news/newsletter.xsl

+ 1
- 1
build/xslt/fsfe_mainsection.xsl View File

@@ -14,7 +14,7 @@
14 14
         </xsl:if>
15 15
   
16 16
         <!-- Here goes the actual content of the <body> node of the input file -->
17
-        <xsl:apply-templates select="body | /buildinfo/document/event/body | /buildinfo/document/news/body" />
17
+        <xsl:apply-templates select="/buildinfo/document/event/body | /buildinfo/document/news/body | /buildinfo/document/body/*" />
18 18
       
19 19
         <!-- Show tags if this is a news press release or an event -->
20 20
         <xsl:if test="/buildinfo/document/@newsdate or /buildinfo/document/event">

+ 1
- 0
campaigns/pdfreaders/petition.ar.xhtml View File

@@ -77,6 +77,7 @@
77 77
 	<h2>قائمة الموقعين</h2>
78 78
 	
79 79
 
80
+    <include-signatures/>
80 81
   </body>
81 82
   <translator>أسامة خالد</translator>
82 83
   <timestamp>$Date: 2010-09-07 16:38:57 +0200 (Tue, 07 Sep 2010) $ $Author: maelle $</timestamp>

+ 1
- 0
campaigns/pdfreaders/petition.cs.xhtml View File

@@ -87,6 +87,7 @@
87 87
 	
88 88
 	<h2>Seznam signatářů</h2>
89 89
 	
90
+    <include-signatures/>
90 91
   </body>
91 92
   
92 93
   <text id="bsig">Podniky</text>

+ 1
- 0
campaigns/pdfreaders/petition.cz.xhtml View File

@@ -86,6 +86,7 @@
86 86
 	
87 87
 	<h2>Seznam signatářů</h2>
88 88
 	
89
+    <include-signatures/>
89 90
   </body>
90 91
   
91 92
   <text id="bsig">Podniky</text>

+ 1
- 0
campaigns/pdfreaders/petition.de.xhtml View File

@@ -96,6 +96,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>-->
96 96
 
97 97
     <h2>Liste der Unterzeichner</h2>
98 98
 	
99
+    <include-signatures/>
99 100
   </body>
100 101
   
101 102
   <text id="osig">Organisationen</text>

+ 1
- 0
campaigns/pdfreaders/petition.el.xhtml View File

@@ -367,6 +367,7 @@
367 367
 	
368 368
 	<h2>Κατάλογος με τους συνυπογράφοντες</h2>
369 369
 	
370
+    <include-signatures/>
370 371
   </body>
371 372
   
372 373
   <text id="bsig">Επιχειρήσεις</text>

+ 1
- 0
campaigns/pdfreaders/petition.en.xhtml View File

@@ -87,6 +87,7 @@
87 87
 	
88 88
 	<h2>List of signatories</h2>
89 89
 	
90
+    <include-signatures/>
90 91
   </body>
91 92
   
92 93
   <text id="bsig">Businesses</text>

+ 1
- 0
campaigns/pdfreaders/petition.es.xhtml View File

@@ -89,6 +89,7 @@ multinacionales en detrimento del Software Libre.</p>
89 89
     <hr />-->
90 90
     <h2>Lista de firmantes</h2>
91 91
 	
92
+    <include-signatures/>
92 93
   </body>
93 94
   
94 95
   <text id="osig">Organizaciones</text>

+ 1
- 0
campaigns/pdfreaders/petition.et.xhtml View File

@@ -57,6 +57,7 @@
57 57
     <hr/>
58 58
     <p>Läbi selle ankeedi kogutud teavet kasutatakse ainult PDF-lugejate kampaania läbiviimiseks. Kui Te soovite oma nime eemaldamist allakirjutanute nimekirjast või lisainformatsiooni kogutud andmete hoiustamise kohta, siis võtke ühendust aadressil <a href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>-->
59 59
     <h2>Allakirjutanute nimekiri</h2>
60
+    <include-signatures/>
60 61
   </body>
61 62
   <text id="bsig">Ettevõtted</text>
62 63
   <text id="osig">Organisatsioonid</text>

+ 1
- 0
campaigns/pdfreaders/petition.fr.xhtml View File

@@ -91,6 +91,7 @@
91 91
 <p>Les informations recueillies par ce formulaire servent exclusivement à la gestion de la campagne PDF readers. Si vous souhaitez être retiré de la liste des signataires, ou obtenir des informations les données retenues, merci d'envoyer un mail à <a href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>
92 92
    --> <h2>Liste des signataires</h2>
93 93
 	
94
+    <include-signatures/>
94 95
   </body>
95 96
   
96 97
   <text id="osig">Organisations</text>

+ 1
- 0
campaigns/pdfreaders/petition.hr.xhtml View File

@@ -78,6 +78,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>-->
78 78
 
79 79
 <h2>Popis potpisnika</h2>
80 80
 
81
+  <include-signatures/>
81 82
 </body>
82 83
 
83 84
 <text id="bsig">Tvrtke</text>

+ 1
- 0
campaigns/pdfreaders/petition.it.xhtml View File

@@ -95,6 +95,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a></p>-->
95 95
 
96 96
     <h2>List of signatories</h2>
97 97
 	
98
+    <include-signatures/>
98 99
   </body>
99 100
   
100 101
   <text id="osig">Organizzazioni</text>

+ 1
- 0
campaigns/pdfreaders/petition.nl.xhtml View File

@@ -74,6 +74,7 @@
74 74
 	
75 75
 	--><h2>Lijst van ondertekenaars</h2>
76 76
 	
77
+    <include-signatures/>
77 78
   </body>
78 79
   
79 80
   <text id="bsig">Bedrijven</text>

+ 1
- 0
campaigns/pdfreaders/petition.pl.xhtml View File

@@ -94,6 +94,7 @@ href="mailto:pdfreaders@lists.fsfe.org">pdfreaders@lists.fsfe.org</a>.</p>
94 94
 	
95 95
 -->	<h2>Lista sygnatariuszy</h2>
96 96
 	
97
+    <include-signatures/>
97 98
   </body>
98 99
   
99 100
   <text id="bsig">Firmy</text>

+ 1
- 0
campaigns/pdfreaders/petition.pt.xhtml View File

@@ -71,6 +71,7 @@
71 71
         <hr />
72 72
     <p><a title="Lista de signatários" href="">Os Abaixo-assinados</a>.</p>
73 73
 
74
+    <include-signatures/>
74 75
   </body>
75 76
   <text id="osig">Organizações</text>
76 77
   <text id="bsig">Empresas</text>

+ 1
- 0
campaigns/pdfreaders/petition.ro.xhtml View File

@@ -70,6 +70,7 @@
70 70
 
71 71
     <h2>Lista semnatarilor</h2>
72 72
 	
73
+    <include-signatures/>
73 74
   </body>
74 75
   
75 76
   <text id="osig">Organizations</text>

+ 1
- 0
campaigns/pdfreaders/petition.ru.xhtml View File

@@ -98,6 +98,7 @@ href="http://pdfreaders.org/graphics.ru.html">ссылаясь</a>
98 98
     
99 99
   -->  <h2>Список подписавших</h2>
100 100
 	
101
+    <include-signatures/>
101 102
   </body>
102 103
   
103 104
   <text id="osig">Организации</text>

+ 1
- 0
campaigns/pdfreaders/petition.sv.xhtml View File

@@ -85,6 +85,7 @@
85 85
 	
86 86
 -->	<h2>List of signatories</h2>
87 87
 	
88
+    <include-signatures/>
88 89
   </body>
89 90
   
90 91
   <text id="bsig">Businesses</text>

+ 1
- 1
campaigns/pdfreaders/petition.xsl View File

@@ -8,7 +8,7 @@
8 8
   <xsl:import href="../../fsfe.xsl" />
9 9
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
10 10
 
11
-  <xsl:template match="body">
11
+  <xsl:template match="/buildinfo/document/body/include-signatures">
12 12
       <xsl:apply-templates />
13 13
       
14 14
       <h3 id="organisations">

+ 2
- 0
events/events.ca.xhtml View File

@@ -16,6 +16,8 @@
16 16
       Els esdeveniments de l'FSFE estan també disponibles via
17 17
       <a href="events.rss" class="feed">subscripció RSS</a>.
18 18
     </p>
19
+
20
+    <include-events/>
19 21
   </body>
20 22
 
21 23
   <text id="current">Esdeveniments actuals</text>

+ 2
- 0
events/events.da.xhtml View File

@@ -17,6 +17,8 @@
17 17
       <a href="events.rss" class="feed">RSS-feed</a> samt som et 
18 18
       <a href="webcal://fsfe.org/events/events.en.ics">iCalendar-feed</a>.
19 19
     </p>
20
+
21
+    <include-events/>
20 22
   </body>
21 23
 
22 24
   <text id="current">Aktuelle arrangementer</text>

+ 2
- 0
events/events.de.xhtml View File

@@ -18,6 +18,8 @@
18 18
       <a href="events.rss" class="feed">RSS-Feed</a> verfügbar als auch
19 19
       anhand unseres <a href="webcal://fsfe.org/events/events.de.ics">iCalendars</a>.
20 20
     </p>
21
+
22
+    <include-events/>
21 23
   </body>
22 24
 
23 25
   <text id="current">Aktuelle Veranstaltungen</text>

+ 2
- 0
events/events.el.xhtml View File

@@ -22,6 +22,8 @@
22 22
         (ενημερωτικές περιλήψεις ιστοτόπων) καθώς επίσης και από τη
23 23
      <a href="webcal://fsfe.org/events/events.en.ics">ροή iCalendar</a>..
24 24
     </p>
25
+
26
+    <include-events/>
25 27
   </body>
26 28
 
27 29
   <text id="current">Τρέχουσες εκδηλώσεις</text>

+ 2
- 0
events/events.en.xhtml View File

@@ -20,6 +20,8 @@
20 20
       <a href="events.rss" class="feed">RSS feed</a> as well as an
21 21
       <a href="webcal://fsfe.org/events/events.en.ics">iCalendar feed</a>.
22 22
     </p>
23
+
24
+    <include-events/>
23 25
   </body>
24 26
 
25 27
   <text id="current">Current events</text>

+ 2
- 0
events/events.es.xhtml View File

@@ -16,6 +16,8 @@
16 16
       Los anuncios de los eventos de la FSFE están disponibles mediante un 
17 17
       <a href="events.rss" class="feed">feed RSS</a>, también como mediante un  <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>.
18 18
     </p>
19
+
20
+    <include-events/>
19 21
   </body>
20 22
 
21 23
   <text id="current">Eventos actuales</text>

+ 2
- 0
events/events.fi.xhtml View File

@@ -22,6 +22,8 @@
22 22
     
23 23
     <p>Kattavan kalenterin kaikista suomalaisista vapaisiin ohjelmistoihin liittyvistä tapahtumista löydät sivustolta <a href="http://coss.fi/kalenteri">coss.fi/kalenteri</a>.</p>
24 24
     
25
+
26
+    <include-events/>
25 27
   </body>
26 28
 
27 29
   <text id="current">Tämänhetkiset tapahtumat</text>

+ 2
- 0
events/events.fr.xhtml View File

@@ -20,6 +20,8 @@
20 20
       <a href="events.rss">flux RSS</a> ainsi qu'avec notre
21 21
       <a href="webcal://fsfe.org/events/events.fr.ics">iCalendar</a>.
22 22
     </p>
23
+
24
+    <include-events/>
23 25
   </body>
24 26
 
25 27
   <text id="current">Événements en cours</text>

+ 2
- 0
events/events.hr.xhtml View File

@@ -16,6 +16,8 @@
16 16
       Najave FSFE-ovih događanja također su dostupne putem
17 17
       <a href="events.rss" class="feed">RSS-a</a>.
18 18
     </p>
19
+
20
+    <include-events/>
19 21
   </body>
20 22
 
21 23
   <text id="current">Aktualna događanja</text>

+ 2
- 0
events/events.hu.xhtml View File

@@ -18,6 +18,8 @@
18 18
     <p>
19 19
       Az FSFE események hírei elérhetőek <a href="events.rss">RSS-csatornán</a> is.
20 20
     </p>
21
+
22
+    <include-events/>
21 23
   </body>
22 24
 
23 25
   <text id="current">Aktuális események</text>

+ 2
- 0
events/events.it.xhtml View File

@@ -15,6 +15,8 @@
15 15
       Gli annunci degli eventi riguardanti la FSFE sono disponibili anche
16 16
       tramite <a href="events.rss" class="feed">feed RSS</a>.
17 17
     </p>
18
+
19
+    <include-events/>
18 20
   </body>
19 21
 
20 22
   <text id="current">Eventi in corso</text>

+ 2
- 0
events/events.nb.xhtml View File

@@ -13,6 +13,8 @@
13 13
     <p>FSFE varsler også begivenheter via en <a
14 14
 href="events.rss" class="feed">>RSS-strøm</a>.</p>
15 15
 
16
+
17
+    <include-events/>
16 18
   </body>
17 19
   <text id="current">Pågående begivenheter</text>
18 20
   <text id="future">Kommende begivenheter</text>

+ 2
- 0
events/events.nl.xhtml View File

@@ -17,6 +17,8 @@
17 17
       <a href="events.rss" class="feed">RSS-</a> en
18 18
       <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>-formaat.
19 19
     </p>
20
+
21
+    <include-events/>
20 22
   </body>
21 23
 
22 24
   <text id="current">Huidige evenementen</text>

+ 2
- 0
events/events.pl.xhtml View File

@@ -19,6 +19,8 @@
19 19
       <a href="events.rss" class="feed">kanał RSS</a> oraz
20 20
       <a href="webcal://fsfe.org/events/events.en.ics">iCalendar</a>.
21 21
     </p>
22
+
23
+    <include-events/>
22 24
   </body>
23 25
 
24 26
   <text id="current">Obecne wydarzenia</text>

+ 2
- 0
events/events.pt.xhtml View File

@@ -16,6 +16,8 @@
16 16
       Os anúncios dos eventos da FSFE também estão disponíveis
17 17
       <a href="events.rss" class="feed">via RSS</a>.
18 18
     </p>
19
+
20
+    <include-events/>
19 21
   </body>
20 22
 
21 23
   <text id="current">Eventos a decorrer</text>

+ 2
- 0
events/events.ro.xhtml View File

@@ -20,6 +20,8 @@
20 20
       Anunţurile evenimentelor FSFE sunt deasemenea disponibile via
21 21
       <a href="events.rss">RSS feed</a>.
22 22
     </p>
23
+
24
+    <include-events/>
23 25
   </body>
24 26
 
25 27
   <text id="current">Evenimente curente</text>

+ 2
- 0
events/events.ru.xhtml View File

@@ -19,6 +19,8 @@
19 19
 <p>Узнать о предстоящих событиях можно через <a href="events.rss">ленту
20 20
 RSS</a> и <a href="webcal://fsfe.org/events/events.en.ics">ленту
21 21
 iCalendar</a>.  </p>
22
+
23
+  <include-events/>
22 24
 </body>
23 25
 
24 26
 <text id="current">Текущие события</text>

+ 2
- 0
events/events.sq.xhtml View File

@@ -20,6 +20,8 @@
20 20
       <a href="events.rss" class="feed">një prurjeje RSS</a> si dhe përmes një
21 21
       <a href="webcal://fsfe.org/events/events.en.ics">prurjeje për iCalendar</a>.
22 22
     </p>
23
+
24
+    <include-events/>
23 25
   </body>
24 26
 
25 27
   <text id="current">Veprimtari të tanishme</text>

+ 2
- 0
events/events.sr.xhtml View File

@@ -20,6 +20,8 @@
20 20
     	<a href="events.rss" class="feed">RSS канала</a> као и преко
21 21
       <a href="webcal://fsfe.org/events/events.en.ics">iCalendar канала</a>.
22 22
     </p>
23
+
24
+    <include-events/>
23 25
   </body>
24 26
 
25 27
   <text id="current">Тренутна дешавања</text>

+ 1
- 1
events/events.xsl View File

@@ -34,7 +34,7 @@
34 34
   </xsl:template>
35 35
 
36 36
   <!-- In /html/body node, append dynamic content -->
37
-  <xsl:template match="body">
37
+  <xsl:template match="/buildinfo/document/body/include-events">
38 38
       <!-- First, include what's in the source file -->
39 39
       <xsl:apply-templates />
40 40
       

+ 2
- 0
news/news.ca.xhtml View File

@@ -31,6 +31,8 @@
31 31
       A part de les notícies llistades en aquesta pàgina, l'FSFE
32 32
       també publica <a href="newsletter.html">butlletins de notícies mensuals</a>.
33 33
     </p>
34
+
35
+    <include-news/>
34 36
   </body>
35 37
   <text id="more">Llegiu-ne més...</text>
36 38
   <translator>Rafael Carreras</translator>

+ 2
- 0
news/news.cs.xhtml View File

@@ -31,6 +31,8 @@
31 31
 	Mimo běžné novinky, zmíněné na teto stránce, vydává FSFE navíc 
32 32
       <a href="newsletter.html">měsíční zpravodaj</a>.
33 33
     </p>
34
+
35
+    <include-news/>
34 36
   </body>
35 37
 
36 38
   <text id="more">Přečtěte si více...</text>

+ 2
- 0
news/news.da.xhtml View File

@@ -33,6 +33,8 @@
33 33
       Som et supplement til de almindelige nyheder på denne side, udsender FSFE
34 34
       et <a href="newsletter.html">månedligt nyhedsbrev</a>.
35 35
     </p>
36
+
37
+    <include-news/>
36 38
   </body>
37 39
 
38 40
   <text id="more">Læs mere ...</text>

+ 2
- 0
news/news.de.xhtml View File

@@ -21,6 +21,8 @@
21 21
       erhältlich.
22 22
       <a href="news.rss" class="feed">RSS-Feed der Meldungen</a>
23 23
     </p>
24
+
25
+    <include-news/>
24 26
   </body>
25 27
 
26 28
   <text id="more">Mehr …</text>

+ 2
- 0
news/news.el.xhtml View File

@@ -18,6 +18,8 @@
18 18
       διαθέσιμες από τους
19 19
       <a href="/about/fsfnetwork.html">ομοθυγατρικούς οργανισμούς</a> του FSFE.
20 20
     </p>
21
+
22
+    <include-news/>
21 23
   </body>
22 24
 
23 25
   <text id="more">Διαβάστε περισσότερα...</text>

+ 2
- 0
news/news.en.xhtml View File

@@ -17,6 +17,8 @@
17 17
       available from FSFE's <a href="/about/fsfnetwork.html">sister
18 18
         organisations</a>.
19 19
     </p>
20
+
21
+    <include-news/>
20 22
   </body>
21 23
 
22 24
   <text id="more">Read more…</text>

+ 2
- 0
news/news.es.xhtml View File

@@ -22,6 +22,8 @@
22 22
       <a href="news.rss" class="feed">Canal de noticias RSS</a>
23 23
     </p>
24 24
     
25
+
26
+    <include-news/>
25 27
   </body>
26 28
 
27 29
   <text id="more">Leer más...</text>

+ 2
- 0
news/news.et.xhtml View File

@@ -31,6 +31,8 @@
31 31
       Lisaks regulaarsetele uudistele, FSFE
32 32
       omab <a href="newsletter.html">ka kuulist ajalehte</a>.
33 33
     </p>
34
+
35
+    <include-news/>
34 36
   </body>
35 37
 
36 38
   <text id="more">Veel...</text>

+ 2
- 0
news/news.fi.xhtml View File

@@ -20,6 +20,8 @@
20 20
     <p>
21 21
       Useimmat uutiset julkaistaan myös <a href="/press/index.html">lehdistötiedotteiden sähköpostilistoilla</a>, joille voit liittyä pysyäksesi FSFE:n toiminnasta ajan tasalla sähköpostitse. FSFE-uutiset ovat saatavilla myös <a href="news.rss">RSS-syötteenä</a>. Tavallisten tällä sivulla lueteltujen uutisten lisäksi FSFE julkaisee <a href="newsletter.html">kuukausittaista uutiskirjettä</a>. Maailmanlaajuisia uutisia vapaista ohjelmistoista löydät <a href="/about/fsfnetwork.html">sisarjärjestöiltämme</a>.
22 22
     </p>
23
+
24
+    <include-news/>
23 25
   </body>
24 26
 
25 27
   <text id="more">Lue lisää...</text>

+ 2
- 0
news/news.hr.xhtml View File

@@ -19,6 +19,8 @@
19 19
       <a href="news.rss" class="feed">Dostava vijesti RSS-om</a>
20 20
     </p>
21 21
     
22
+
23
+    <include-news/>
22 24
   </body>
23 25
 
24 26
   <text id="more">Pročitajte više...</text>

+ 2
- 0
news/news.hu.xhtml View File

@@ -23,6 +23,8 @@
23 23
       Europe hírleveleket is publikál, melyek <a href="newsletter.html">egy
24 24
       külön oldalon</a> találhatóak archiválva.
25 25
     </p>
26
+
27
+    <include-news/>
26 28
   </body>
27 29
 
28 30
   <text id="more">Bővebben...</text>

+ 2
- 0
news/news.it.xhtml View File

@@ -19,6 +19,8 @@
19 19
     <a href="news.rss" class="feed">News RSS feed</a>
20 20
     </p>
21 21
     
22
+
23
+    <include-news/>
22 24
   </body>
23 25
 
24 26
   <text id="more">Continua a leggere...</text>

+ 2
- 0
news/news.nb.xhtml View File

@@ -34,6 +34,8 @@
34 34
   <a href="newsletter.html">et månedlig nyhetsbrev</a>.
35 35
 </p>
36 36
 
37
+
38
+  <include-news/>
37 39
 </body>
38 40
 	<text id="more">Les mer...</text>
39 41
 	<translator>Andreas Tolf Tolfsen</translator>

+ 2
- 0
news/news.nl.xhtml View File

@@ -16,6 +16,8 @@ campagnes en activiteiten. Meld u aan op de <a
16 16
         nieuwsbrieven</a> beschikbaar. Wereldwijd Vrije Software-nieuws is
17 17
       beschikbaar van FSFE's <a href="/about/fsfnetwork.html">zusterorganisaties.</a>.
18 18
     </p>
19
+
20
+    <include-news/>
19 21
   </body>
20 22
 
21 23
   <text id="more">Lees meer…</text>

+ 2
- 0
news/news.pt.xhtml View File

@@ -20,6 +20,8 @@
20 20
       <a href="news.rss" class="feed">Canal de notícias RSS</a>
21 21
     </p>
22 22
     
23
+
24
+    <include-news/>
23 25
   </body>
24 26
 
25 27
   <text id="more">Ler mais...</text>

+ 2
- 0
news/news.ro.xhtml View File

@@ -24,6 +24,8 @@
24 24
 	<a href="newsletter.html">pe o pagina separată</a>.
25 25
     </p>
26 26
 	
27
+
28
+    <include-news/>
27 29
   </body>
28 30
   <text id="more">Citeşte mai mult...</text>
29 31
   <translator>Adi Roiban</translator>

+ 2
- 0
news/news.ru.xhtml View File

@@ -16,6 +16,8 @@
16 16
 обеспечения можно получить от <a
17 17
 href="/about/fsfnetwork.html">родственных организаций</a> ЕФСПО.</p>
18 18
 
19
+
20
+  <include-news/>
19 21
 </body>
20 22
 <text id="more">Подробнее...</text>
21 23
 <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
news/news.sl.xhtml View File

@@ -21,6 +21,8 @@
21 21
       Poleg rednih novic, najdenih na tej strani, FSFE izdaja
22 22
       <a href="newsletter.html">mesečni bilten</a>.
23 23
     </p>
24
+
25
+    <include-news/>
24 26
   </body>
25 27
 
26 28
   <text id="more">Več...</text>

+ 2
- 0
news/news.sq.xhtml View File

@@ -14,6 +14,8 @@
14 14
       pajtohuni te <a href="/news/news.rss">prurja jonë RSS</a> që të jeni
15 15
       të përditësuar rreth veprimtarive tona.  Ka të passhëm gjithashtu <a href="newsletter.html">buletine mujore</a>.   Lajme mbi Software-in e Lirë nga Bota mund të merren nga <a href="/about/fsfnetwork.html"> organizma simotra të FSFE-së</a>.
16 16
     </p>
17
+
18
+    <include-news/>
17 19
   </body>
18 20
 
19 21
   <text id="more">Lexoni më tepër…</text>

+ 2
- 0
news/news.sr.xhtml View File

@@ -14,6 +14,8 @@
14 14
     	Вести о Слободном Софверу широм света су доступни преко <a href="/about/fsfnetwork.html">сестринских 
15 15
     	организација</a> ФзССЕ-е.
16 16
     </p>
17
+
18
+    <include-news/>
17 19
   </body>
18 20
 
19 21
   <text id="more">Сазнај више…</text>

+ 2
- 0
news/news.sv.xhtml View File

@@ -33,6 +33,8 @@
33 33
       publicerar FSFE även ett <a href="newsletter.html">månatligt
34 34
       nyhetsbrev</a>.
35 35
     </p>
36
+
37
+    <include-news/>
36 38
   </body>
37 39
 
38 40
   <text id="more">Läs mer...</text>

+ 1
- 1
news/news.xsl View File

@@ -6,7 +6,7 @@
6 6
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
7 7
 
8 8
   <!-- In /html/body node, append dynamic content -->
9
-  <xsl:template match="body">
9
+  <xsl:template match="/buildinfo/document/body/include-news">
10 10
       <!-- First, include what's in the source file -->
11 11
       <xsl:apply-templates />
12 12
 

+ 2
- 0
news/newsletter.ca.xhtml View File

@@ -33,6 +33,8 @@
33 33
       Hi ha una altra pàgina que conté un arxiu de
34 34
       <a href="news.html">les notícies</a>.
35 35
     </p>
36
+
37
+    <include-newsletter/>
36 38
   </body>
37 39
   <text id="more">Llegiu-ne més...</text>
38 40
   <translator>Rafael Carreras</translator>

+ 2
- 0
news/newsletter.cs.xhtml View File

@@ -32,6 +32,8 @@
32 32
 Existuje ještě další stránka s archivem 
33 33
       <a href="news.html">běžných novinek</a>.
34 34
     </p>
35
+
36
+    <include-newsletter/>
35 37
   </body>
36 38
 
37 39
   <text id="more">Čtěte...</text>

+ 2
- 0
news/newsletter.da.xhtml View File

@@ -20,6 +20,8 @@
20 20
     </p>
21 21
 
22 22
     <subscribe-nl />
23
+
24
+    <include-newsletter/>
23 25
   </body>
24 26
 
25 27
   <text id="more">Læs ...</text>

+ 2
- 0
news/newsletter.de.xhtml View File

@@ -23,6 +23,8 @@
23 23
     <subscribe-nl />
24 24
 
25 25
 
26
+
27
+    <include-newsletter/>
26 28
   </body>
27 29
 
28 30
   <text id="more">Lesen …</text>

+ 2
- 0
news/newsletter.el.xhtml View File

@@ -21,6 +21,8 @@
21 21
     
22 22
     <subscribe-nl />
23 23
 
24
+
25
+    <include-newsletter/>
24 26
   </body>
25 27
 
26 28
   <text id="more">Διαβάστε...</text>

+ 1
- 0
news/newsletter.en.xhtml View File

@@ -22,6 +22,7 @@
22 22
     
23 23
     <subscribe-nl />
24 24
 
25
+    <include-newsletter/>
25 26
   </body>
26 27
 <text id="more">Read...</text> 
27 28
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
news/newsletter.es.xhtml View File

@@ -14,6 +14,8 @@
14 14
       Además de nuestras <a href="news.html">noticias regulares</a>, la FSFE publica un boletín mensual que recoge sus actividades más importantes. Usted puede recibirlos por correo electrónico uniéndose a la <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-es">lista de distribución de notas de prensa</a>.
15 15
     </p>
16 16
 
17
+
18
+    <include-newsletter/>
17 19
   </body>
18 20
 
19 21
   <text id="more">Leer más...</text>

+ 2
- 0
news/newsletter.fi.xhtml View File

@@ -28,6 +28,8 @@
28 28
     
29 29
     <subscribe-nl />
30 30
 
31
+
32
+    <include-newsletter/>
31 33
   </body>
32 34
 
33 35
   <text id="more">Lue lisää...</text>

+ 2
- 0
news/newsletter.fr.xhtml View File

@@ -20,6 +20,8 @@
20 20
     
21 21
     <subscribe-nl />
22 22
   
23
+
24
+    <include-newsletter/>
23 25
   </body>
24 26
 
25 27
   <text id="more">Lire la suite...</text>

+ 2
- 0
news/newsletter.hr.xhtml View File

@@ -22,6 +22,8 @@
22 22
     
23 23
     <subscribe-nl />
24 24
 
25
+
26
+    <include-newsletter/>
25 27
   </body>
26 28
 
27 29
   <text id="more">Pročitajte...</text>

+ 2
- 0
news/newsletter.hu.xhtml View File

@@ -26,6 +26,8 @@
26 26
       Ezen az oldalon az eddigiekben kiadott hírleveleink találhatóak meg. <a
27 27
       href="news.html">Rendszeres híreink</a> archívuma külön oldalon van.
28 28
     </p>
29
+
30
+    <include-newsletter/>
29 31
   </body>
30 32
 
31 33
   <text id="more">Tovább...</text>

+ 2
- 0
news/newsletter.it.xhtml View File

@@ -16,6 +16,8 @@
16 16
       alla <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-it">mailing list delle newsletter</a>.
17 17
     </p>
18 18
 
19
+
20
+    <include-newsletter/>
19 21
   </body>
20 22
 
21 23
   <text id="more">Leggi...</text>

+ 2
- 0
news/newsletter.nb.xhtml View File

@@ -29,6 +29,8 @@ e-post.</p>
29 29
 Det finnes en annen side som arkiverer <a
30 30
 href="news.html">vanlige nyhetsartkler</a>.</p>
31 31
 
32
+
33
+  <include-newsletter/>
32 34
 </body>
33 35
 	<text id="more">Les...</text>
34 36
 	<translator>Andreas Tolf Tolfsen</translator>

+ 2
- 0
news/newsletter.nl.xhtml View File

@@ -35,6 +35,8 @@
35 35
       overzicht van al de verzonden <a href="news.html">
36 36
       persberichten</a>.
37 37
     </p>
38
+
39
+    <include-newsletter/>
38 40
   </body>
39 41
 
40 42
   <text id="more">Lees meer...</text>

+ 2
- 0
news/newsletter.pt.xhtml View File

@@ -14,6 +14,8 @@
14 14
       Além das nossas <a href="news.html">notícias regulares</a>, a FSFE publica um boletim mensal que recolhe as suas atividades mais importantes. Você pode recebê-los por correio eletrônico unindo-se à <a href="https://mail.fsfeurope.org/mailman/listinfo/newsletter-pt">lista de distribuição de comunicados de imprensa</a>.
15 15
     </p>
16 16
 
17
+
18
+    <include-newsletter/>
17 19
   </body>
18 20
 
19 21
   <text id="more">Ler mais...</text>

+ 2
- 0
news/newsletter.ru.xhtml View File

@@ -22,6 +22,8 @@
22 22
     
23 23
 <subscribe-nl />
24 24
 
25
+
26
+  <include-newsletter/>
25 27
 </body>
26 28
 
27 29
 <text id="more">Подробнее...</text>

+ 2
- 0
news/newsletter.sq.xhtml View File

@@ -22,6 +22,8 @@
22 22
     
23 23
     <subscribe-nl />
24 24
 
25
+
26
+    <include-newsletter/>
25 27
   </body>
26 28
 <text id="more">Lexojeni...</text> 
27 29
   <timestamp>$Date$ $Author$</timestamp>

+ 2
- 0
news/newsletter.sv.xhtml View File

@@ -33,6 +33,8 @@
33 33
       en annan sida som innehåller arkivet för våra
34 34
       <a href="news.html">vanliga nyheter</a>.
35 35
     </p>
36
+
37
+    <include-newsletter/>
36 38
   </body>
37 39
 
38 40
   <text id="more">Läs...</text>

+ 1
- 1
news/newsletter.xsl View File

@@ -7,7 +7,7 @@
7 7
 
8 8
   <xsl:output method="html" encoding="utf-8" indent="yes" doctype-system="about:legacy-compat" />
9 9
 
10
-  <xsl:template match="body">
10
+  <xsl:template match="/buildinfo/document/body/include-newsletter">
11 11
     <xsl:apply-templates />
12 12
 
13 13
     <!-- $today = current date (given as <html date="...">) -->

Loading…
Cancel
Save