Browse Source

fixing legal team project description

svn path=/trunk/; revision=26812
tags/stw2018
Max Mehl 5 years ago
parent
commit
4c004a4cbd

+ 5
- 5
about/people/people.en.xml View File

@@ -46,7 +46,7 @@
<employee> Working status inside the FSFE, defined by the earned money. Only nexessary if the person receives money on a regular basis for his/her work
full: Person is working 4 or 5 days a week
part: Person is working 3 or less days a week
fee: Person is working on honorary basis, no matter which salary or how long
freelancer: Person is working on honorary basis, no matter which salary or how long
-->
<!--
Technical information:
@@ -159,7 +159,7 @@
<function project="igf">coordinator/m</function>
<function project="wipo">coordinator/m</function>
-->
<email>gerloff (at) fsfeurope (dot) org</email>
<email>gerloff (at) fsfe (dot) org</email>
<link>/about/gerloff/gerloff.html</link>
<avatar>/about/gerloff/gerloff-avatar.jpg</avatar>
<employee>full</employee>
@@ -198,7 +198,7 @@
<country>DE</country>
<function>sysadmin/m</function>
<email>paul (at) fsfe (dot) org</email>
<employee>fee</employee>
<employee>freelancer</employee>
</person>

<person id="jean" avatar="yes" teams="fr, de, core">
@@ -265,7 +265,7 @@
<country>DE</country>
<function>vice-president/m</function>
<function country="DE">coordinator/m</function>
<email>kirschner (at) fsfeurope (dot) org</email>
<email>mk (at) fsfe (dot) org</email>
<link>/about/kirschner/kirschner.html</link>
<avatar>/about/kirschner/kirschner-avatar.jpg</avatar>
<employee>full</employee>
@@ -468,7 +468,7 @@
<email>willebra (at) fsfe (dot) org</email>
</person>

<person id="woolfrey" avatar="yes" teams="gb, core">
<person id="woolfrey" avatar="yes" teams="gb">
<name>Chris Woolfrey</name>
<country>GB</country>
<function>fellowship-interviews/m</function>

+ 20
- 20
about/team.en.xhtml View File

@@ -15,22 +15,6 @@
<a href="legal/legal.html">association</a>, some are not.
</p>

<h3>Key:</h3>
<ul class="people">
<li style="background-color: #BEF5BE">
<p align="center"><em>Full-time employee</em></p>
</li>
<li style="background-color: #E4F7E4">
<p align="center"><em>Part-time employee</em></p>
</li>
<li style="background-color: #EFF2FB">
<p align="center"><em>Fee-based employee</em></p>
</li>
<li>
<p align="center"><em>Volunteer</em></p>
</li>
</ul>

<table border="0">
<tr><td>
<h2>Council</h2>
@@ -51,10 +35,10 @@
</td></tr>
<tr><td>
<h2>European Core Team</h2>
<p>Here you can find all people working hand in hand with General
Assembly's members on a voluntary or paid basis on core issues: Country
team coordinators and their deputies, staff, coordinators of special
teams, or system administrators.</p>
<p>Here you can find all people working on the day to day tasks of the
organisation on a voluntary or paid basis on core issues: Country team
coordinators and their deputies, staff, coordinators of special teams,
or system administrators.</p>
<core-members />
</td></tr>
<tr><td>
@@ -67,6 +51,22 @@
</td></tr>
</table>

<h3>Key:</h3>
<ul class="people">
<li style="background-color: #BEF5BE">
<p align="center"><em>Full-time employee</em></p>
</li>
<li style="background-color: #E4F7E4">
<p align="center"><em>Part-time employee</em></p>
</li>
<li style="background-color: #EFF2FB">
<p align="center"><em>Freelancer</em></p>
</li>
<li>
<p align="center"><em>Volunteer</em></p>
</li>
</ul>

</body>
<timestamp>$Date$ $Author$</timestamp>
</html>

+ 1
- 1
activities/ftf/project.ca.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
The Freedom Task Force ajuda a particulars, projectes i negocis en materia de
llicències de programari. Proporciona assistència, formació i dirigeix xarxes d'experts

+ 1
- 1
activities/ftf/project.de.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
Wir bieten Unterstützung bei Fragen zu Freien Software-Lizenzen. Dazu
gehören Aufklärung, treuhänderische Dienste sowie Schutz und Rat für

+ 1
- 1
activities/ftf/project.el.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Ομάδα Εργασίας Ελευθερίας (FTF)</title>
<title>Ομάδα Εργασίας Ελευθερίας</title>
<description>
Η Ομάδα Εργασίας Ελευθερίας (FTF) είναι ένα πρόγραμμα υποδομής με ένα δίκτυο
τεχνικών και νομικών εμπειρογνωμόνων οι οποίοι μπορούν να βοηθήσουν ιδιώτες,

+ 1
- 1
activities/ftf/project.en.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>FSFE Legal - The Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
FSFE is committed to helping individuals, projects,
businesses and government agencies find Free Software legal

+ 1
- 1
activities/ftf/project.es.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
La Freedom Task Force está ayudando a particulares, proyectos y negocios en asuntos
de licenciación de software. Proporciona asistencia, formación y dirige redes de

+ 1
- 1
activities/ftf/project.fr.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
La Freedom Task Force apporte son aide aux personnes, projets ou entreprises dans le domaine des licences de Logiciels Libres. Elle fournit de l'aide, des formations et entretient un réseau d'experts techniques et juridiques dans ce but. La FTF travaille en partenariat avec gpl-violations.org pour résoudre les problèmes de licences qui se posent dans l'aire européenne.
</description>

+ 1
- 1
activities/ftf/project.it.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
La Freedom Task Force fornisce servizi relativi alle licenze a individui,
progetti e aziende che lavorano con Software Libero.

+ 1
- 1
activities/ftf/project.nl.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description>
Wij bieden ondersteuning voor het licentiëren van Vrije Software. Tot deze diensten horen
onderricht, bewaarneming, bescherming en algemene hulp voor personen, projecten en

+ 1
- 1
activities/ftf/project.pt.xml View File

@@ -2,7 +2,7 @@

<projectset>
<project id="ftf" date="2006-11-13" status="active">
<title>Freedom Task Force (FTF)</title>
<title>Legal Team</title>
<description> A Freedom Task Force ajuda as pessoas, projetos e empresas com licenciamento de Software Livre. Assim fornece assistência, formação e gestão de redes de peritos técnicos e jurídicos para ajudar neste processo. A FTF trabalha em parceria com gpl-violations.org para resolver problemas de licença no palco europeu. </description> <link>/activities/ftf/ftf.html</link>
</project>
</projectset>

+ 1
- 1
tools/xsltsl/countries.xsl View File

@@ -36,7 +36,7 @@
<xsl:when test="employee = 'part'">
<xsl:attribute name="style">background-color: #E4F7E4</xsl:attribute>
</xsl:when>
<xsl:when test="employee = 'fee'">
<xsl:when test="employee = 'freelancer'">
<xsl:attribute name="style">background-color: #EFF2FB</xsl:attribute>
</xsl:when>
<xsl:otherwise>

Loading…
Cancel
Save