FSFE
/
fsfe-website
21
24
Fork 51
Code Issues 55 Pull Requests 11 Releases 0 Wiki Activity
Browse Source

Updated to standard structure, added h2 with local submenu heading 

Removed the files I moved to local.en.xml, .sources, .xsl

svn path=/trunk/; revision=12910
pull/8/head
kirschner 11 years ago
parent
45bc54fdc6
commit
3126bf16ec
36 changed files with 109 additions and 226 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -1
      contact/contact.ca.xhtml
  2. +3
    -1
      contact/contact.da.xhtml
  3. +3
    -1
      contact/contact.de.xhtml
  4. +3
    -1
      contact/contact.el.xhtml
  5. +4
    -2
      contact/contact.en.xhtml
  6. +0
    -66
      contact/contact.en.xml
  7. +3
    -1
      contact/contact.es.xhtml
  8. +3
    -1
      contact/contact.fi.xhtml
  9. +3
    -1
      contact/contact.fr.xhtml
  10. +3
    -1
      contact/contact.it.xhtml
  11. +3
    -1
      contact/contact.nb.xhtml
  12. +3
    -1
      contact/contact.nl.xhtml
  13. +0
    -3
      contact/contact.sources
  14. +0
    -91
      contact/contact.xsl
  15. +3
    -1
      contact/local.ca.xhtml
  16. +3
    -1
      contact/local.da.xhtml
  17. +3
    -1
      contact/local.de.xhtml
  18. +3
    -1
      contact/local.el.xhtml
  19. +3
    -1
      contact/local.en.xhtml
  20. +3
    -1
      contact/local.es.xhtml
  21. +3
    -1
      contact/local.fi.xhtml
  22. +1
    -1
      contact/local.fr.xhtml
  23. +3
    -1
      contact/local.it.xhtml
  24. +3
    -1
      contact/local.nb.xhtml
  25. +3
    -1
      contact/local.nl.xhtml
  26. +4
    -3
      contact/press.ca.xhtml
  27. +5
    -5
      contact/press.da.xhtml
  28. +4
    -4
      contact/press.de.xhtml
  29. +4
    -4
      contact/press.el.xhtml
  30. +4
    -3
      contact/press.en.xhtml
  31. +4
    -3
      contact/press.es.xhtml
  32. +4
    -4
      contact/press.fi.xhtml
  33. +3
    -4
      contact/press.fr.xhtml
  34. +4
    -4
      contact/press.it.xhtml
  35. +4
    -4
      contact/press.nb.xhtml
  36. +4
    -5
      contact/press.nl.xhtml

+ 3
- 1
contact/contact.ca.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Informació de contacte</title>
<title>FSFE - Informació de contacte - Àmbit europeu</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Àmbit europeu</localmenu>
<h2>Àmbit europeu</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.da.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktoplysninger</title>
<title>FSFE - Kontaktoplysninger - Europæisk niveau</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Europæisk niveau</localmenu>
<h2>Europæisk niveau</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.de.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktinformation</title>
<title>FSFE - Kontaktinformation - Europäische Ebene</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Europäische Ebene</localmenu>
<h2>Europäische Ebene</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.el.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Πληροφορίες επικοινωνίας</title>
<title>FSFE - Πληροφορίες επικοινωνίας - Ευρωπαϊκό Επίπεδο</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Ευρωπαϊκό Επίπεδο</localmenu>
<h2>Ευρωπαϊκό Επίπεδο</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 4
- 2
contact/contact.en.xhtml View File

@ -2,14 +2,16 @@
<html>
<head>
<title>FSFE - Contact Information</title>
<title>FSFE - Contact - European Level</title>
</head>
<body>
<h1>Contact</h1>
<h1>Contact </h1>
<localmenu id="1">European Level</localmenu>
<h2>European Level</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 0
- 66
contact/contact.en.xml View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Do not translate this file -->
<contactset>
<contact id="AT">
<email>austria@fsfeurope.org</email>
</contact>
<contact id="BE">
<email>belgium@fsfeurope.org</email>
<phone>+32 2 7470357</phone>
</contact>
<contact id="CH">
<address>
Free Software Foundation Europe e.V.<br/>
Sumatrastrasse 25<br/>
8006 Zürich<br/>
</address>
<email>switzerland@fsfeurope.org</email>
<phone>+49 700 373387673-20</phone>
<phone>+41 43 5000366-20</phone>
</contact>
<contact id="DE">
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>
40217 Düsseldorf<br/>
</address>
<email>germany@fsfeurope.org</email>
<phone>+49 700 373387673-22</phone>
</contact>
<contact id="ES">
<email>spain@fsfeurope.org</email>
</contact>
<contact id="GB">
<email>uk@fsfeurope.org</email>
<phone>+44 29 20008177</phone>
</contact>
<contact id="IE">
<email>ireland@fsfeurope.org</email>
</contact>
<contact id="IT">
<email>italy@fsfeurope.org</email>
</contact>
<contact id="NL">
<email>netherlands@fsfeurope.org</email>
</contact>
<contact id="RS">
<email>serbia@fsfeurope.org</email>
</contact>
<contact id="SE">
<email>sweden@fsfeurope.org</email>
<phone>+46 31 7802160-21</phone>
<phone>+49 700 373387673-21</phone>
</contact>
</contactset>

+ 3
- 1
contact/contact.es.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Información de contacto</title>
<title>FSFE - Información de contacto - Contactar con la FSFE en Europa</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Contactar con la FSFE en Europa</localmenu>
<h2>Contactar con la FSFE en Europa</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.fi.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Yhteystiedot</title>
<title>FSFE - Yhteystiedot - Eurooppa</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Eurooppa</localmenu>
<h2>Eurooppa</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.fr.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Coordonnées</title>
<title>FSFE - Coordonnées - Au niveau européen</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Au niveau européen</localmenu>
<h2>Au niveau européen</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 3
- 1
contact/contact.it.xhtml View File

@ -2,13 +2,15 @@
<html>
<head>
<title>FSFE - Contatti</title>
<title>FSFE - Contatti - Sede centrale europea</title>
</head>
<body>
<h1>Informazioni sui contatti</h1>
<localmenu id="1">Sede centrale europea</localmenu>
<h2>Sede centrale europea</h2>
<address>
Free Software Foundation Europe e.V.<br/>


+ 3
- 1
contact/contact.nb.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktsinformasjon</title>
<title>FSFE - Kontaktsinformasjon - Sentralt</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Sentralt</localmenu>
<h2>Sentralt</h2>
<address>
Free Software Foundation Europe e.V.<br />
Talstraße 110<br />


+ 3
- 1
contact/contact.nl.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Contactinformatie</title>
<title>FSFE - Contactinformatie - Europees niveau</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="1">Europees niveau</localmenu>
<h2>Europees niveau</h2>
<address>
Free Software Foundation Europe e.V.<br/>
Talstraße 110<br/>


+ 0
- 3
contact/contact.sources View File

@ -1,3 +0,0 @@
contact/contact:global
about/people/countries:global
about/people/people:global

+ 0
- 91
contact/contact.xsl View File

@ -1,91 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" encoding="ISO-8859-1" indent="yes" />
<!-- Fill dynamic content -->
<xsl:template match="dynamic-content">
<xsl:for-each select="/html/set/contact">
<xsl:sort select="@id" />
<xsl:variable name="country">
<xsl:value-of select="@id" />
</xsl:variable>
<!-- Heading -->
<xsl:element name="h3">
<xsl:value-of select="/html/set/country[@id=$country]" />
</xsl:element>
<!-- Address -->
<xsl:if test="address != ''">
<xsl:apply-templates select="address"/>
</xsl:if>
<!-- Email -->
<xsl:if test="email != ''">
<xsl:element name="p">
<xsl:value-of select="/html/text[@id='email']" />
<xsl:text> </xsl:text>
<xsl:element name="a">
<xsl:attribute name="href">
<xsl:text>mailto:</xsl:text>
<xsl:value-of select="email" />
</xsl:attribute>
<xsl:value-of select="email" />
</xsl:element>
</xsl:element>
</xsl:if>
<!-- Phone -->
<xsl:if test="phone != ''">
<xsl:element name="p">
<xsl:value-of select="/html/text[@id='phone']" />
<xsl:text> </xsl:text>
<xsl:value-of select="phone" />
</xsl:element>
</xsl:if>
<!-- Fax -->
<xsl:if test="fax != ''">
<xsl:element name="p">
<xsl:value-of select="/html/text[@id='fax']" />
<xsl:text> </xsl:text>
<xsl:value-of select="fax" />
</xsl:element>
</xsl:if>
<!-- Core team members -->
<xsl:element name="p">
<xsl:choose>
<xsl:when test="count(/html/set/person[count(country[text()=$country])>0 and @team='yes'])>0">
<xsl:value-of select="/html/text[@id='members']" />
<xsl:text> </xsl:text>
<xsl:for-each select="/html/set/person[count(country[text()=$country])>0 and @team='yes']">
<xsl:if test="position()!=1">
<xsl:text>, </xsl:text>
</xsl:if>
<xsl:value-of select="name" />
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="/html/text[@id='nomembers']" />
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</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>

+ 3
- 1
contact/local.ca.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Informació de contacte</title>
<title>FSFE - Informació de contacte - Contacte local</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Contacte local</localmenu>
<h2>Contacte local</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.da.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktoplysninger</title>
<title>FSFE - Kontaktoplysninger - Lokal kontakt</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Lokal kontakt</localmenu>
<h2>Lokal kontakt</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.de.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktinformation</title>
<title>FSFE - Kontaktinformation - Lokaler Kontakt</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Lokaler Kontakt</localmenu>
<h2>Lokaler Kontakt</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.el.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Πληροφορίες επικοινωνίας</title>
<title>FSFE - Πληροφορίες επικοινωνίας - Τοπική επαφή</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Τοπική επαφή</localmenu>
<h2>Τοπική επαφή</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.en.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Local Contact Information</title>
<title>FSFE - Contact - Local Level</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Local Level</localmenu>
<h2>Local Level</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.es.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Información de contacto</title>
<title>FSFE - Información de contacto - Contactar con la FSFE en un país</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Contactar con la FSFE en un país</localmenu>
<h2>Contactar con la FSFE en un país</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.fi.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Yhteystiedot</title>
<title>FSFE - Yhteystiedot - Paikalliset yhteyshenkilöt</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Paikalliset yhteyshenkilöt</localmenu>
<h2>Paikalliset yhteyshenkilöt</h2>
<dynamic-content />
</body>


+ 1
- 1
contact/local.fr.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Coordonnées</title>
<title>FSFE - Coordonnées - Contacts locaux</title>
</head>
<body>


+ 3
- 1
contact/local.it.xhtml View File

@ -2,13 +2,15 @@
<html>
<head>
<title>FSFE - Contatti</title>
<title>FSFE - Contatti - Contatti locali</title>
</head>
<body>
<h1>Informazioni sui contatti</h1>
<localmenu id="2">Contatti locali</localmenu>
<h2>Contatti locali</h2>
<dynamic-content />
</body>


+ 3
- 1
contact/local.nb.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Kontaktsinformasjon</title>
<title>FSFE - Kontaktsinformasjon - Lokale kontakter</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Lokale kontakter</localmenu>
<h2>Lokale kontakter</h2>
<dynamic-content/>
</body>


+ 3
- 1
contact/local.nl.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Contactinformatie</title>
<title>FSFE - Contactinformatie - Lokaal Contact</title>
</head>
<body>
@ -10,6 +10,8 @@
<localmenu id="2">Lokaal Contact</localmenu>
<h2>Lokaal Contact</h2>
<dynamic-content />
</body>


+ 4
- 3
contact/press.ca.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Informació de contacte</title>
<title>FSFE - Informació de contacte - Contacte per la premsa</title>
</head>
<body>
@ -10,10 +10,11 @@
<localmenu id="3">Contacte per la premsa</localmenu>
<h2>Contacte per la premsa</h2>
<p>
Si sou un membre de la premsa, si us plau, no dubteu en contactar
amb nosaltres. Per a contactar una persona específica o un càrrec, si us plau
doneu un cop d'ull a la nostra <a href="../contact/contact.html">secció de contacte</a>.
amb nosaltres.
</p>
<h3>Adreces electròniques</h3>


+ 5
- 5
contact/press.da.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Presseområde</title>
<title>FSFE - Kontaktoplysninger - Pressekontakt</title>
</head>
<body>
@ -10,11 +10,11 @@
<localmenu id="3">Pressekontakt</localmenu>
<h2>Pressekontakt</h2>
<p>
Er du medlem af pressen, så tøv ikke med at kontakte os. For at kontakte
en bestemt person eller funktion, bedes du tage et kig på vores
<a href="../contact/contact.html">kontaktområde</a>.
</p>
Er du medlem af pressen, så tøv ikke med at kontakte os.
</p>
<h3>E-mail</h3>


+ 4
- 4
contact/press.de.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Presse</title>
<title>FSFE - Kontaktinformationen - Presse</title>
</head>
<body>
@ -10,11 +10,11 @@
<localmenu id="3">Presse</localmenu>
<h2>Presse</h2>
<p>
Wenn Sie von der Presse sind, zögern Sie nicht, mit uns in Kontakt zu
treten. Wie Sie Kontakt mit einer bestimmten Person oder einem bestimmten
Amt aufzunehmen können, finden Sie auf der
<a href="../contact/contact.de.html">Kontakt-Seite</a>.
treten.
</p>
<h3>E-Mail</h3>


+ 4
- 4
contact/press.el.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Πληροφορίες επικοινωνίας</title>
<title>FSFE - Πληροφορίες επικοινωνίας - Επαφή με τον Τύπο</title>
</head>
<body>
@ -10,11 +10,11 @@
<localmenu id="3">Επαφή με τον Τύπο</localmenu>
<h2>Επαφή με τον Τύπο</h2>
<p>
Αν είστε μέλος του τύπου, παρακαλούμε μη διστάσετε να έρθετε σε επαφή
μαζί μας. Για να επικοινωνήσετε με κάποιο συγκεκριμένο πρόσωπο ή υπηρεσία,
παρακαλούμε δείτε το
<a href="../contact/contact.html">τμήμα επικοινωνίας</a>.
μαζί μας.
</p>
<h3>Ηλεκτρονικό ταχυδρομείο</h3>


+ 4
- 3
contact/press.en.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Contact Information</title>
<title>FSFE - Contact - Press</title>
</head>
<body>
@ -10,10 +10,11 @@
<localmenu id="3">Press</localmenu>
<h2>Press</h2>
<p>
If you are a member of the press, please don't hesitate to get in touch
with us. To get into contact with a specific person or function, please
take a look at our <a href="../contact/contact.html">contact section</a>.
with us.
</p>
<h3>E-Mail</h3>


+ 4
- 3
contact/press.es.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Sección de prensa</title>
<title>FSFE - Información de contacto - Contacto para la prensa</title>
</head>
<body>
@ -10,10 +10,11 @@
<localmenu id="3">Contacto para la prensa</localmenu>
<h2>Contacto para la prensa</h2>
<p>
Si pertenece a la prensa, por favor no dude en contactar
con nosotros. Para contactar con una persona o cargo en concreto,
por favor visite nuestra <a href="../contact/contact.html">sección de contacto</a>.
con nosotros.
</p>
<h3>Correo electrónico</h3>


+ 4
- 4
contact/press.fi.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Lehdistöosio</title>
<title>FSFE - Yhteystiedot - Lehdistön yhteystiedot</title>
</head>
<body>
@ -10,10 +10,10 @@
<localmenu id="3">Lehdistön yhteystiedot</localmenu>
<h2>Lehdistön yhteystiedot</h2>
<p>
Jos edustat lehdistöä, älä epäröi ottaa meihin yhteyttä. Ottaaksesi
yhteyttä tiettyyn henkilöön tai toimintaan, katso
<a href="../contact/contact.html">Yhteystiedot-sivua</a>.
Jos edustat lehdistöä, älä epäröi ottaa meihin yhteyttä.
</p>
<h3>Sähköposti</h3>


+ 3
- 4
contact/press.fr.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Section Presse</title>
<title>FSFE - Coordonnées - Relations avec la Presse</title>
</head>
<body>
@ -10,11 +10,10 @@
<localmenu id="3">Relations avec la Presse</localmenu>
<h2>Relations avec la Presse</h2>
<p>
Si vous êtes journaliste, n'hésitez pas à entrer en contact avec nous.
Afin d'entrer en contact avec une personne particulière ou
chargée d'une fonction spécifique, veuillez consulter la
<a href="../contact/contact.html">section contact</a>.
</p>
<h3>Courriel</h3>


+ 4
- 4
contact/press.it.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Stampa</title>
<title>FSFE - Contatti - Contatti Stampa</title>
</head>
<body>
@ -11,10 +11,10 @@
<localmenu id="3">Contatti Stampa</localmenu>
<h2>Contatti Stampa</h2>
<p> Se siete giornalisti o lavorate per la stampa, non esitate a
mettervi in contatto con noi. Per contattare una persona
specifica o con una carica particolare, visitate la nostra <a
href="../contact/contact.html">pagina dei contatti</a>.
mettervi in contatto con noi.
</p>
<h3>E-Mail</h3>


+ 4
- 4
contact/press.nb.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Pressesenter</title>
<title>FSFE - Kontaktsinformasjon - Pressekontakt</title>
</head>
<body>
@ -10,9 +10,9 @@
<localmenu id="3">Pressekontakt</localmenu>
<p>Nøl ikke å kontakte oss om du er medlem av pressen. For å kontakte en
bestemt person eller funksjon, ta en kikk på vår <a
href="/contact/contact.html">kontaktside</a>.</p>
<h2>Pressekontakt</h2>
<p>Nøl ikke å kontakte oss om du er medlem av pressen.</p>
<h3>E-post</h3>


+ 4
- 5
contact/press.nl.xhtml View File

@ -2,7 +2,7 @@
<html>
<head>
<title>FSFE - Pers</title>
<title>FSFE - Contactinformatie - Pers</title>
</head>
<body>
@ -11,11 +11,10 @@
<localmenu id="3">Pers</localmenu>
<h2>Pers</h2>
<p>
Leden van de pers kunnen altijd contact met ons opnemen. Kijk
alstublieft op onze <a href="../contact/contact.html">
contactpagina</a> om in contact te komen met een bepaalde
persoon of afdeling.
Leden van de pers kunnen altijd contact met ons opnemen.
</p>
<h3>E-mail</h3>


Write Preview
Loading…
Cancel
Save