Change tag syntax

Old: `<tag content="Human Readable Text">internal-id</tag>`
New: `<tag key="internal-id">Human Readable Text</tag>`

Fixes #826
Fixes #1095

activities/ftf/reporting-fixing-violations.el.xhtml

@@ -136,9 +136,6 @@
 
   <timestamp>$Date$ 
   $Author$</timestamp>
-  <tags>
-    <tag>GNU GPL</tag>
-  </tags>
   <legal type="cc-license">
     <license>http://creativecommons.org/licenses/by-nd/3.0/</license>
     <notice>

activities/ftf/reporting-fixing-violations.en.xhtml

@@ -104,9 +104,6 @@
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>
-  <tags>
-    <tag>GNU GPL</tag>
-  </tags>
   <legal type="cc-license">
     <license>http://creativecommons.org/licenses/by-nd/3.0/</license>
     <notice>

activities/ftf/reporting-fixing-violations.it.xhtml

@@ -100,10 +100,6 @@ e poco aiutano a risolvere la violazione. Verificando i tuoi dati di fatto, puoi
 </body>
 <timestamp>$Date$ $Author$</timestamp>
 <translator>Sebastiano Pistore</translator>
-
-<tags>
-    <tag>GNU GPL</tag>
-  </tags>
   <legal type="cc-license">
     <license>http://creativecommons.org/licenses/by-nd/3.0/</license>
     <notice>

activities/os/bsa-letter-analysis.el.xhtml

@@ -382,9 +382,6 @@
   </body>
 
   <timestamp>$Date: 2010-10-05 16:30:51 +0200 (Tue, 05 Oct 2010) $ $Author: samtuke $</timestamp>
-<tags> 
-<tag>openstandards</tag>
-</tags>
   <author id="gerloff" />
   <author id="piana" />
   <author id="tuke" />

activities/os/eifv2.el.xhtml

@@ -638,10 +638,6 @@ Framework, EIF version 2), υπογραμμίζει τους διαφορετι
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>
-
-<tags> 
-<tag>openstandards</tag>
-</tags>
 <author id="roy" />
 <author id="gerloff" />
 <date>

activities/os/eifv2.fr.xhtml

@@ -527,9 +527,6 @@
 
   <timestamp>$Date: 2010-07-31 22:07:39 +1000 (sam. 31 juil. 2010) $ $Author: hugo $</timestamp>
 <translator>Hugo Roy, Jil Larner (Mont Blanc), Nicolas Jean</translator>
-<tags>
-<tag>openstandards</tag>
-</tags>
 <author id="roy" />
 <author id="gerloff" />
 <date>

activities/os/minimalisticstandards.de.xhtml

@@ -223,9 +223,6 @@
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>
-<tags>
-<tag>openstandards</tag>
-</tags>
 <legal type="cc-license">
  <license>https://creativecommons.org/licenses/by-sa/3.0/</license><notice>Neben der Standardlizenz der Webseite steht dieser Artikel unter der Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)</notice>
 </legal>

activities/os/minimalisticstandards.en.xhtml

@@ -224,9 +224,6 @@ Anna F J Morris .
   </body>
 
   <timestamp>$Date: 2012-11-10 23:10:43 +0000 (Sat, 10 Nov 2012) $ $Author: bernhard $</timestamp>
-<tags>
-<tag>openstandards</tag>
-</tags>
 <legal type="cc-license">
  <license>https://creativecommons.org/licenses/by-sa/3.0/</license><notice>Neben der Standardlizenz der Webseite steht dieser Artikel unter der Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)</notice>
 </legal>

activities/os/msooxml-questions.en.xhtml

@@ -232,12 +232,6 @@
       <li><a href="/documents/msooxml-questions-for-ms.html">Questions for Microsoft on Open Formats</a></li>
     </ul>
   </body>
-  
-<tags>
-<tag>Policy</tag>
-<tag content="Open Standards">OpenStandards</tag>
-</tags>
-
   <timestamp>$Date$ $Author$</timestamp>
 </html>
 <!--

activities/os/ps.el.xhtml

@@ -616,10 +616,6 @@
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>
-
-<tags> 
-<tag>openstandards</tag> 
-</tags>
 <author id="greve" />
 <date>
   <original content="2008-12-02" />

activities/os/ps.en.xhtml

@@ -614,9 +614,6 @@ Strike the Right Balance between Public and Private Interests in IPR in ICT
   </body>
 
   <timestamp>$Date$ $Author$</timestamp>
-<tags>
-<tag>openstandards</tag>
-</tags>
 <author id="greve" />
 <date>
   <original content="2008-12-02" />

activities/os/uk-standards-consultation.en.xhtml

@@ -188,11 +188,6 @@
 	<date>
 		<original content="2012-04-26" />
 	</date>
-	<tags>
-	        <tag>openstandards</tag>
-	        <tag>gb</tag>
-	</tags>
-
 	<timestamp>$Date$ $Author$</timestamp>
 	
 </html>

activities/policy/eu/20140305-copyright-rules.en.xhtml

@@ -122,11 +122,6 @@
 
     </div><!--/e-content-->
   </body>
-  <tags>
-      <tag>copyright</tag>
-      <tag>legal</tag>
-      <tag>eu</tag>
-  </tags>
   <sidebar promo="about-fsfe">
     <div id="related-content">
         <h3>Related</h3>

build/xslt/fsfe_mainsection.xsl

@@ -4,27 +4,6 @@
   <xsl:include href="sharebuttons.xsl" />
   <xsl:include href="fsfe_sidebar.xsl" />
 
-  <xsl:template name="taglinks">
-    <xsl:param name="prefix" />
-
-    <ul class="taglist"><xsl:for-each select="/buildinfo/document/tags/tag[not(. = 'front-page' or @key = 'front-page')]">
-      <xsl:variable name="keyname"
-           select="translate(@key,'ABCDEFGHIJKLMNOPQRSTUVWXYZ /:','abcdefghijklmnopqrstuvwxyz_')"/>
-      <xsl:variable name="tagname"
-           select="translate(.,'ABCDEFGHIJKLMNOPQRSTUVWXYZ /:','abcdefghijklmnopqrstuvwxyz_')"/>
-
-      <xsl:choose><xsl:when test="@key and .">
-        <li><a href="/tags/tagged-{$keyname}.html"><xsl:value-of select="."/></a></li>
-      </xsl:when><xsl:when test="@content and not(@content = '')"> <!-- Legacy -->
-        <li><a href="/tags/tagged-{$tagname}.html"><xsl:value-of select="@content"/></a></li>
-      </xsl:when><xsl:when test="@key"> <!-- bad style -->
-        <li><a href="/tags/tagged-{$keyname}.html"><xsl:value-of select="@key"/></a></li>
-      </xsl:when><xsl:otherwise> <!-- Legacy and bad style -->
-        <li><a href="/tags/tagged-{$tagname}.html"><xsl:value-of select="."/></a></li>
-      </xsl:otherwise></xsl:choose>
-    </xsl:for-each></ul>
-  </xsl:template>
-
   <xsl:template name="fsfe_mainsection">
     <xsl:element name="section">
       <xsl:attribute name="id">main</xsl:attribute>
@@ -57,13 +36,17 @@
 
         <!-- Show tags if this is a news press release or an event -->
         <xsl:if test="(/buildinfo/document/@newsdate or /buildinfo/document/event)
-                      and /buildinfo/document/tags/tag[not(. = 'front-page' or @key = 'front-page')]">
+                      and /buildinfo/document/tags/tag[not(@key='front-page')]">
           <aside id="tags">
             <h2><xsl:call-template name="fsfe-gettext">
               <xsl:with-param name="id" select="'tags'" />
             </xsl:call-template></h2>
 
-            <xsl:call-template name="taglinks"/>
+            <ul class="taglist">
+              <xsl:for-each select="/buildinfo/document/tags/tag[not(@key='front-page')]">
+                <li><a href="/tags/tagged-{@key}.{/buildinfo/@language}.html"><xsl:value-of select="."/></a></li>
+              </xsl:for-each>
+            </ul>
           </aside>
         </xsl:if> <!-- /tags -->
 

build/xslt/get_tags.xsl

@@ -12,14 +12,12 @@
   <xsl:output method="text" encoding="UTF-8"/>
 
   <xsl:template match="tag">
-    <!-- Output canonicalized tag name -->
-    <xsl:value-of select="translate(.,
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZ /:',
-        'abcdefghijklmnopqrstuvwxyz_')"/>
+    <!-- Output tag name with some safeguarding against invalid characters -->
+    <xsl:value-of select="translate(@key, ' /:', '---')"/>
     <!-- Output a blank -->
     <xsl:text> </xsl:text>
     <!-- Output tag label -->
-    <xsl:value-of select="@content"/>
+    <xsl:value-of select="."/>
     <!-- Append a newline -->
     <xsl:text>&#xa;</xsl:text>
   </xsl:template>

campaigns/pdfreaders/pdfreaders.de.xhtml

@@ -119,11 +119,5 @@ Selbst wenn eine bestimmte Software kostenlos verfügbar ist, kann das Unternehm
 </sidebar>
 
 <followup>subscribe-nl</followup>
-
-<tags> 
-<tag>PDFreaders</tag> 
-<tag content="Öffentliche Verwaltung">PublicAdministration</tag>
-<tag content="Kampagnen">Campaigns</tag>
-</tags>
 <timestamp>$LastChangedDate$ $Author$</timestamp>
 </html>

campaigns/pdfreaders/pdfreaders.el.xhtml

@@ -181,11 +181,6 @@
   </ul>
         </sidebar>
         <followup>subscribe-nl</followup>
-<tags>
-        <tag>PDFreaders</tag>
-        <tag content="Public administration">PublicAdministration</tag>
-        <tag content="campaign">Campaigns</tag>
-</tags>
 <timestamp>$LastChangedDate: 2015-10-13 11:11:53 +0300 (Tue, 13 Oct 2015) $ $Author: mk $ </timestamp>
 </html>
 

campaigns/pdfreaders/pdfreaders.en.xhtml

@@ -157,11 +157,6 @@ they respect our freedom.</p>
   </ul>
 	</sidebar>
 	<followup>subscribe-nl</followup>
-<tags>
-	<tag>PDFreaders</tag>
-	<tag content="Public administration">PublicAdministration</tag>
-	<tag content="campaign">Campaigns</tag>
-</tags>
 <timestamp>$LastChangedDate$ $Author$ </timestamp>
 </html>
 

campaigns/pdfreaders/pdfreaders.pt.xhtml

@@ -157,11 +157,6 @@ informação sobre o Software Livre na administração pública.</p>
   </ul>
 	</sidebar>
 	<followup>subscrever-nl</followup>
-<tags>
-	<tag>leitores de PDF</tag>
-	<tag content="Administrações Públicas">PublicAdministration</tag>
-	<tag content="Campanhas">Campaign</tag>
-</tags>
 <timestamp>$LastChangedDate: 2016-03-01 21:00:07 +0100 (Tue, 01 Mar 2016) $ $Author: max.mehl $ </timestamp>
 </html>
 

campaigns/pdfreaders/pdfreaders.ru.xhtml

@@ -196,10 +196,5 @@ href="https://twitter.com/nasko/status/469595752734269440"> исходные
 </ul>
 </sidebar>
 <followup>subscribe-nl</followup>
-<tags>
-<tag>PDFreaders</tag>
-<tag content="Общественная администрация">PublicAdministration</tag>
-<tag content="Кампании">Campaigns</tag>
-</tags>
 <timestamp>$LastChangedDate$ $Author$ </timestamp>
 </html>

campaigns/swpat/how-the-eu-patent-system-works.en.xhtml

@@ -60,7 +60,6 @@
      </ul>
 
  </sidebar>
- <tags><tag>patents</tag></tags>
 </html>
 
 <!--

community/tools/event-YYYYMMDD-01.LC.xml

@@ -8,7 +8,7 @@
     </body> 
       <link>Insert a link to the event here</link>
     <tags>
-      <tag>localgroup</tag>
+      <tag key="localgroup"/>
     </tags>
   </event>
 </eventset>

contribute/template.en.xhtml

@@ -350,9 +350,6 @@
     </div><!--/e-content-->
 
   </body>
-<tags>
-  <tag>webmaster</tag>
-</tags>
 <sidebar news="ilovefs" promo="about-fsfe">
     <div id="related-content">
         <h3>Get involved</h3>

contribute/web/campaigns-frontpage.en.xhtml

@@ -82,10 +82,6 @@
     <original content="2014-01-24"/>
 </date>
 <author id="roy" />
-<tags>
-    <tag>webmaster</tag>
-</tags>
-
   <timestamp>$Date: 2013-09-26 15:32:30 +0200 (Thu 26 Sep 2013) $ $Author: paul $</timestamp>
 
 </html>

contribute/web/css.en.xhtml

@@ -109,10 +109,6 @@
     <original content="2014-01-24"/>
 </date>
 <author id="roy" />
-<tags>
-    <tag>webmaster</tag>
-</tags>
-
   <timestamp>$Date: 2013-09-26 15:32:30 +0200 (Thu 26 Sep 2013) $ $Author: paul $</timestamp>
 
 </html>

contribute/web/tagging.en.xhtml

@@ -33,29 +33,14 @@
     <h2>Basic instructions</h2>
 
     <p>
-      A tag should be in <a href="https://en.wikipedia.org/wiki/CamelCase">CamelCase</a> except for special tags like <code>front-page</code>, <code>newsletter</code>. So for instance, the tag “very important subject” should be <code>VeryImportantSubject</code>. 
-      A tag should contain a <code>content</code> attribute except for special tags. <bold>This attribute should be translated and human readable</bold>, because it will be shown on certain pages. For instance, if you tag a page about the Windows Tax.
+      A tag key should be in lowercase and not contain any spaces, colons, and slashes. So for instance, the key for the tag “very important subject” should be <code>very-important-subject</code>. 
+      The content of the tag should be translated and human readable, because it will be shown on certain pages. For instance, if you tag a page about the Windows Tax.
     </p>
 
     <pre class="file">
-      &lt;tag content="Windows Tax"&gt;WindowsTax&lt;/tag&gt;
+      &lt;tag key="windows-tax"&gt;Windows Tax&lt;/tag&gt;
     </pre>
 
-    <p>
-    If you are translating, you should never edit what is “here” between <code>&lt;tag&gt;here&lt;/tag&gt;</code> but you can add a translated <code>content</code> attribute. For instance, take an English file with:</p>
-
-    <pre class="file">
-      &lt;tag&gt;Ruling&lt;/tag&gt;
-    </pre>
-
-    <p>“Ruling” in French would be “Décision de justice” so you should do:</p>
-
-    <pre class="file">
-      &lt;tag content="Décision de justice"&gt;Ruling&lt;/tag&gt;
-    </pre>
-
-
-
     <h2>Tag pages, news and events</h2>
     
     <p>For most pages (when your file has the <var>xhtml</var>), the tags must be added within &lt;html&gt; &lt;/html&gt; usually at the end.</p>
@@ -73,9 +58,9 @@
       &lt;news&gt;
       [...]
       &lt;tags&gt;
-      &lt;tag&gt;front-page&lt;/tag&gt;
-      &lt;tag content="Software Patents"&gt;Swpats&lt;/tag&gt;
-      &lt;tag content="Novell"&gt;Novell&lt;/tag&gt;
+      &lt;tag key="front-page"/&gt;
+      &lt;tag key="swpat"&gt;Software Patents&lt;/tag&gt;
+      &lt;tag key="novell"&gt;Novell&lt;/tag&gt;
       &lt;/tags&gt;
       &lt;/news&gt;
     </pre>
@@ -88,8 +73,8 @@
       &lt;event&gt;
       [...]
       &lt;tags&gt;
-      &lt;tag&gt;front-page&lt;/tag&gt;
-      &lt;tag content="Italy"&gt;it&lt;/tag&gt;
+      &lt;tag key="front-page"/&gt;
+      &lt;tag key="it"&gt;Italy&lt;/tag&gt;
       &lt;/tags&gt;
       &lt;/event&gt;
     </pre>
@@ -98,8 +83,8 @@
     will appear on the front page of fsfe.org!</p>
     
     <p>
-    Tags should all be written in English; there is no need for translation
-    since the tags do not appear online, but are used internally for
+    Tag keys should all be written in English; there is no need for translation
+    since they do not appear online, but are used internally for
     filtering news items or events.
     </p>
     
@@ -281,10 +266,6 @@
         </ul>
     </div>
 </sidebar>
-<tags>
-    <tag>webmaster</tag>
-</tags>
-
   <timestamp>$Date: 2010-07-07 05:16:55 +0200 (Wed, 07 Jul 2010) $ $Author: hugo $</timestamp>
 </html>
 <!--

contribute/web/web.en.xhtml

@@ -145,9 +145,6 @@
         </ul>
     </div>
 </sidebar>
-<tags>
-    <tag>webmaster</tag>
-</tags>
 <timestamp>$Date$ $Author$</timestamp>
 
 </html>

contribute/web/web.fr.xhtml

@@ -150,9 +150,6 @@
         </ul>
     </div>
 </sidebar>
-<tags>
-    <tag>webmaster</tag>
-</tags>
 <timestamp>$Date$ $Author$</timestamp>
 <translator>Michel Roche (Vercors - France), Jil Larner (Mont Blanc, France), Cryptie, roidelapluie, Stéphane, MDDN, Thibault et Vincent</translator>
 </html>

contribute/web/web.nl.xhtml

@@ -138,9 +138,6 @@ zulke pagina's zijn de <a href="/">startpagina</a>, de
             </ul>
         </div>
     </sidebar>
-    <tags>
-        <tag>webmaster</tag>
-    </tags>
     <timestamp>$Date$ $Author$</timestamp>
 <translator>André Ockers</translator>
     </html>

contribute/web/web.sq.xhtml

@@ -134,9 +134,6 @@
         </ul>
     </div>
 </sidebar>
-<tags>
-    <tag>webmaster</tag>
-</tags>
 <timestamp>$Date$ $Author$</timestamp>
 
 </html>

events/2004/FISL/fisl.en.xhtml

@@ -79,8 +79,8 @@
   <timestamp>$Date$ $Author$</timestamp>
 
 <tags>
-<tag>education</tag>
-<tag>br</tag>
+<tag key="education"/>
+<tag key="br"/>
     </tags>
 
 

events/2004/FISL/fisl.it.xhtml

@@ -81,8 +81,8 @@
   <timestamp>$Date$ $Author$</timestamp>
 
 <tags>
-<tag>education</tag>
-<tag>br</tag>
+<tag key="education"/>
+<tag key="br"/>
     </tags>
 
 </html>

events/2004/FISL/fisl.sv.xhtml

@@ -81,8 +81,8 @@
   <timestamp>$Date$ $Author$</timestamp>
 
 <tags>
-<tag>education</tag>
-<tag>br</tag>
+<tag key="education"/>
+<tag key="br"/>
     </tags>
 
 </html>

events/2005/event-20050302.en.xml

@@ -14,7 +14,7 @@
           </body>
 
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
           <page>http://www.foss2005.org</page>

events/2005/event-20050302.it.xml

@@ -15,7 +15,7 @@
           </body>
 
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
 

events/2006/event-20060429-01.en.xml

@@ -16,7 +16,7 @@
     <page>http://www.ifso.ie/events/2006-04-29/</page>
 
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
 

events/2006/event-20060429-01.nl.xml

@@ -15,7 +15,7 @@ zelf ook een uiteenzetting geven over de GPLv3: het proces en de grootste kans.
     <page>http://www.ifso.ie/events/2006-04-29/</page>
 
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
 

events/2006/event-20060709.en.xml

@@ -11,7 +11,7 @@
   <page>http://www.isoc.nl/SELF/kickoff/</page>
 
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
 

events/2006/event-20060709.it.xml

@@ -17,7 +17,7 @@
           </body>
   <page>http://www.isoc.nl/SELF/kickoff/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
     </event>  

events/2006/event-20060709.nl.xml

@@ -10,7 +10,7 @@
           </body>
   <page>http://www.isoc.nl/SELF/kickoff/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
     </event>  

events/2007/event-20070126-01.ca.xml

@@ -18,7 +18,7 @@
     </body>
     <page>http://self.gnowledge.org</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>  

events/2007/event-20070126-01.da.xml

@@ -18,7 +18,7 @@
     </body>
     <page>http://self.gnowledge.org</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>  

events/2007/event-20070126-01.en.xml

@@ -14,7 +14,7 @@ George Greve and Jonas Oberg, president and vice president of the FSFE, will be
     </body>
     <page>http://self.gnowledge.org</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>  

events/2007/event-20070126-01.nl.xml

@@ -18,7 +18,7 @@
     </body>
     <page>http://self.gnowledge.org</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>  

events/2007/event-20070607-02.de.xml

@@ -23,7 +23,7 @@
       zu Wissen) in Beziehung steht.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2007/event-20070607-02.el.xml

@@ -24,7 +24,7 @@
       και την πρωτοβουλία Πρόσβαση στη Γνώση.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2007/event-20070607-02.en.xml

@@ -22,7 +22,7 @@
       initiative.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2007/event-20070607-02.nl.xml

@@ -20,7 +20,7 @@
       globale politieke trend om kennis te monopoliseren, en het Access to Knowledge initiatief.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080210.de.xml

@@ -17,7 +17,7 @@
     </body>
     <page>http://www.selfproject.eu/sofia</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080210.el.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://www.selfproject.eu/sofia</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080210.en.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://www.selfproject.eu/sofia</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080210.it.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://www.selfproject.eu/sofia</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080210.nl.xml

@@ -17,7 +17,7 @@
     </body>
     <page>http://www.selfproject.eu/sofia</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080716-01.el.xml

@@ -17,7 +17,7 @@
     </body>
     <page>http://fkft.eu/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080716-01.en.xml

@@ -16,7 +16,7 @@
     </body>
     <page>http://fkft.eu/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080716-01.nl.xml

@@ -20,7 +20,7 @@
     </body>
     <page>http://fkft.eu/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20080716-02.nl.xml

@@ -20,6 +20,6 @@
       zal opleveren voor de Vrije Softwaregemeenschap.
     </body>
     <page>http://fkft.eu/</page>
-<tag>education</tag>
+<tag key="education"/>
   </event>
 </eventset>

events/2008/event-20081113-01.de.xml

@@ -9,7 +9,7 @@
 	Am 13. November findet das monatliche Fellowshiptreffen in Berlin statt. Wir treffen uns um 19:30 im Newthinking-Store in der Tucholskystraße 48 in Berlin-Mitte. Themen werden u.a. sein: BLIT review, FSCONS Bericht, "Wie können wir mit Aktionen zu Freier Software und Bildung kooperieren?" und Vorträge 2009. Wir freuen uns auf Euer erscheinen..
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
   </event>
 </eventset>

events/2008/event-20081113-01.el.xml

@@ -17,7 +17,7 @@
 Περιμένουμε να σας υποδεχτούμε στις 13.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20081113-01.en.xml

@@ -9,7 +9,7 @@
 	    The monthly Fellowship meeting is going to take place on the 13th of November. We will meet at 7:30pm at the NewThinking store in Berlin-Mitte (Tucholskystraße 48). Topics include: BLIT review, FSCONS report, "How can we collaborate with the different organizations around Free Software and Education?" and presentation 2009. We like to welcome you on the 13th.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20081113-01.fr.xml

@@ -10,7 +10,7 @@ Le 13 novembre a lieu la rencontre mensuelle de la Fellowship à Berlin. Nous no
 au Newthinking-Store dans la Tucholskystrasse à Berlin-Mitte. Nous parlerons, entre autres de : revue du BLIT, reportage sur FSCONS, "Comment pouvons nous agir sur le plan du Logiciel Libre et de l'Education ?" et les plans pour 2009. Nous nous réjouissons de votre venue !
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
   </event>
 </eventset>

events/2008/event-20081113-01.it.xml

@@ -10,7 +10,7 @@
 Berlin-Mitte (Tucholskystraße 48). Tra gli argomenti: recensione di BLIT, cronaca del FSCONS, "Come collaborare con altre organizzazioni a favore del Software Libero e dell'educazione?" ed una introduzione al 2009. Siete i benvenuti il 13 novembre.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2008/event-20081113-01.nl.xml

@@ -14,7 +14,7 @@
       Software en Onderwijs?" en voorstelling van 2009. Iedereen is welkom.
     </body>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20090415-01.de.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://lug.krems.cc/index.php?id=56</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20090415-01.el.xml

@@ -16,7 +16,7 @@
     </body>
     <page>http://lug.krems.cc/index.php?id=56</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20090415-01.en.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://lug.krems.cc/index.php?id=56</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20090415-01.nl.xml

@@ -16,7 +16,7 @@
     </body>
     <page>http://lug.krems.cc/index.php?id=56</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20091118-01.de.xml

@@ -12,7 +12,7 @@
     </body>
 	<page>http://blogs.fsfe.org/blog/2009/11/03/fellowship-jabber-meeting-about-fsfes-education-activities-wednesday-18-november-2000-cest/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20091118-01.el.xml

@@ -13,7 +13,7 @@
     </body>
 	<page>http://blogs.fsfe.org/blog/2009/11/03/fellowship-jabber-meeting-about-fsfes-education-activities-wednesday-18-november-2000-cest/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2009/event-20091118-01.en.xml

@@ -12,7 +12,7 @@
     </body>
 	<page>http://blogs.fsfe.org/blog/2009/11/03/fellowship-jabber-meeting-about-fsfes-education-activities-wednesday-18-november-2000-cest/</page>
 <tags>
-<tag>education</tag>
+<tag key="education"/>
     </tags>
 
   </event>

events/2010/event-20100114-01.de.xml

@@ -18,7 +18,7 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100114-01.en.xml

@@ -18,7 +18,7 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100115-01.de.xml

@@ -9,7 +9,7 @@
 	Dieses Mal findet das Wiener Fellowship-Treffen wieder in der Bibliothek im <a href="http://metalab.at/wiki/Lage" title="Metalab location">Metalab</a>, in der Rathausstraße 6 im 1. Bezirk in Wien statt. Wir treffen uns ab 18:00 Uhr - die Agenda starten wir um 19:00 Uhr. Wie immer richtet sich die Einladung an alle, die sich für die FSFE oder für Freie Software interessieren. Wir freuen uns auf eine große Teilnehmerzahl!
     </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100115-01.en.xml

@@ -9,7 +9,7 @@
 	This month, the Vienna Fellowship meeting will be in <a href="http://metalab.at/wiki/Lage" title="Metalab location">the Metalab</a>, located in the Rathausstraße 6 in the 1st district of Vienna. We'll be there from 18:00, with agenda related discussions starting at 19:00. As usual, this invitation is for everyone interested in the FSFE or Free Software. We're looking forward to seeing you there!
     </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100125-01.de.xml

@@ -17,7 +17,7 @@
     </body>
     <page>http://www.wipo.int/meetings/fr/details.jsp?meeting_id=17461</page>
   <tags>
-    <tag>ch</tag>
+    <tag key="ch"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100125-01.en.xml

@@ -16,7 +16,7 @@
     </body>
     <page>http://www.wipo.int/meetings/fr/details.jsp?meeting_id=17461</page>
   <tags>
-    <tag>ch</tag>
+    <tag key="ch"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100130-01.de.xml

@@ -18,7 +18,7 @@
     </body>
     <page>http://www.stuttgart-open-fair.de</page>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100130-01.en.xml

@@ -16,7 +16,7 @@
     </body>
     <page>http://www.stuttgart-open-fair.de</page>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100206-01.de.xml

@@ -17,7 +17,7 @@
     </body>
     <page>http://www.fosdem.org/2010/</page>
   <tags>
-    <tag>be</tag>
+    <tag key="be"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100206-01.en.xml

@@ -15,7 +15,7 @@
     </body>
     <page>http://www.fosdem.org/2010/</page>
   <tags>
-    <tag>be</tag>
+    <tag key="be"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100211-01.de.xml

@@ -16,8 +16,8 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
-<tag>education</tag>  
+    <tag key="de"/>
+<tag key="education"/>  
 </tags>
   </event>
 </eventset>

events/2010/event-20100211-01.el.xml

@@ -14,7 +14,7 @@
           Άλλο θέμα θα είναι η επανέναρξη των τακτικών συναντήσεων της Κοινότητας στη Στουτγάρδη.
       </p>
     </body>
-<tag>education</tag>
+<tag key="education"/>
   </event>
 </eventset>
 

events/2010/event-20100211-01.en.xml

@@ -16,8 +16,8 @@
       </p>
     </body>
   <tags>
-    <tag>education</tag>
-    <tag>de</tag>
+    <tag key="education"/>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100211-01.ru.xml

@@ -14,6 +14,6 @@ href="http://www.fsfe.org/activities/education">образовательной
 ЕФСПО</a>. Также будет обсуждаться возобновление регулярных собраний
 членов Содружества в Штутгарте.</p>
 </body>
-<tag>education</tag>
+<tag key="education"/>
 </event>
 </eventset>

events/2010/event-20100211-02.de.xml

@@ -17,7 +17,7 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100211-02.en.xml

@@ -16,7 +16,7 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100219-01.de.xml

@@ -9,7 +9,7 @@
 	Dieses Mal findet das Wiener Fellowship-Treffen wieder in der Bibliothek im <a href="http://metalab.at/wiki/Lage" title="Metalab location">Metalab</a>, in der Rathausstraße 6 im 1. Bezirk in Wien statt. Wir treffen uns ab 18:00 Uhr - die Agenda starten wir um 19:00 Uhr. Wie immer richtet sich die Einladung an alle, die sich für die FSFE oder für Freie Software interessieren. Wir freuen uns auf eine große Teilnehmerzahl!
     </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100219-01.en.xml

@@ -9,7 +9,7 @@
 	This month, the Vienna Fellowship meeting will be in <a href="http://metalab.at/wiki/Lage" title="Metalab location">the Metalab</a>, located in the Rathausstraße 6 in the 1st district of Vienna. We'll be there from 18:00, with agenda related discussions starting at 19:00. As usual, this invitation is for everyone interested in the FSFE or Free Software. We're looking forward to seeing you there!
     </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100225-01.de.xml

@@ -13,7 +13,7 @@
    Wir freuen uns auf eine große Teilnehmerzahl!
    </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100225-01.en.xml

@@ -13,7 +13,7 @@
    looking forward to seeing you there!
    </body>
   <tags>
-    <tag>at</tag>
+    <tag key="at"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100302-01.de.xml

@@ -14,7 +14,7 @@
     </body>
     <page>http://ilias.weiterbildungonline.be/repository.php?reloadpublic=1&amp;cmd=frameset&amp;ref_id=1</page>
   <tags>
-    <tag>be</tag>
+    <tag key="be"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100302-01.en.xml

@@ -11,8 +11,8 @@
     </body>
     <page>http://ilias.weiterbildungonline.be/repository.php?reloadpublic=1&amp;cmd=frameset&amp;ref_id=1</page>
   <tags>
-    <tag>be</tag>
-    <tag>de</tag>
+    <tag key="be"/>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100302-01.ru.xml

@@ -15,8 +15,8 @@ chneider AT zawm.be.
 </body>
 <page>http://ilias.weiterbildungonline.be/repository.php?reloadpublic=1&amp;cmd=frameset&amp;ref_id=1</page>
 <tags>
-<tag>be</tag>
-<tag>de</tag>
+<tag key="be"/>
+<tag key="de"/>
 </tags>
 </event>
 </eventset>

events/2010/event-20100303-01.de.xml

@@ -20,7 +20,7 @@ Eine <a href="http://www.cebit.de/78606">Registrierung</a> für die Veranstaltun
     </body>
     <page>http://www.linuxpromagazine.com/Events/CeBIT-Open-Source-Forum-2010</page>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100303-01.en.xml

@@ -21,7 +21,7 @@
     </body>
     <page>http://www.linuxpromagazine.com/Events/CeBIT-Open-Source-Forum-2010</page>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100303-02.de.xml

@@ -9,7 +9,7 @@
 	Vom 3.März an ruft das Göteborger FSFE-Team seine Fellowship-Gruppe mit monatlichen Treffen wieder ins Leben. Die Treffen finden im <a href="http://gnutiken.se/en/">Gnutiken</a> um 18:00 statt und sind für jedermann offen.
    </body>
   <tags>
-    <tag>se</tag>
+    <tag key="se"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100311-01.de.xml

@@ -17,7 +17,7 @@
       </p>
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100313-01.de.xml

@@ -18,7 +18,7 @@
     </body>
     <page>http://chemnitzer.linux-tage.de/2010/</page>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100313-01.en.xml

@@ -27,7 +27,7 @@
     </body>
     <link>http://chemnitzer.linux-tage.de/2010/</link>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>

events/2010/event-20100317-01.de.xml

@@ -12,7 +12,7 @@
       <a href="https://wiki.fsfe.org/groups/Hamburg">Hamburger Fellowship-Gruppe</a> für Details.
     </body>
   <tags>
-    <tag>de</tag>
+    <tag key="de"/>
   </tags>
   </event>
 </eventset>