diff --git a/.htaccess b/.htaccess index 7d259d61ab..25312c77ad 100644 --- a/.htaccess +++ b/.htaccess @@ -24,9 +24,6 @@ RewriteRule ^graphics/fsfeurope.ico /graphics/fsfe.ico [R=301,L] # Redirect RewriteRule ^translate/?$ /contribute/translators/ [R=301,L] -# AskYourCandidates -RewriteRule ^campaigns/ayc(.*) /activities/askyourcandidates$1 [R=301,L] - # NoCloud campaign, as printed on posters RewriteRule ^nocloud(/.*)? /activities/nocloud$1 [R=301,L] @@ -134,9 +131,9 @@ RewriteRule ^documents/whyfs(.*)$ /activities/whyfs/ [R=301,L] # Projects # moved to campaigns/ RewriteRule ^projects/(agnula|bgw|browserbundling|btw09|eucd|gbn|gplv3|horizon2020|ipred2|mankind|pdfreaders|self|stacs|swpat|wsis)(.*)$ /campaigns/$1$2 [R=301,L] -RewriteRule ^projects/active(.*)$ /campaigns/campaigns$1 [R=301,L] -RewriteRule ^projects/finished(.*)$ /campaigns/campaigns$1 [R=301,L] -RewriteRule ^projects/inactive(.*)$ /campaigns/campaigns$1 [R=301,L] +RewriteRule ^projects/active(.*)$ /activities/activities.html$1 [R=301,L] +RewriteRule ^projects/finished(.*)$ /activities/activities.html$1 [R=301,L] +RewriteRule ^projects/inactive(.*)$ /activities/activities.html$1 [R=301,L] # moved to activities/ RewriteRule ^projects/(drm|education|os|procurement|eu|ftf|fla|ms-vs-eu|un|wipo|fp6|fp7|map|igf)(.*)$ /activities/$1$2 [R=301,L] RewriteRule ^projects/work(.*) /work$1 [R=301,L] diff --git a/campaigns/campaigns.cs.xhtml b/activities/activities.cs.xhtml similarity index 100% rename from campaigns/campaigns.cs.xhtml rename to activities/activities.cs.xhtml diff --git a/campaigns/campaigns.da.xhtml b/activities/activities.da.xhtml similarity index 100% rename from campaigns/campaigns.da.xhtml rename to activities/activities.da.xhtml diff --git a/campaigns/campaigns.de.xhtml b/activities/activities.de.xhtml similarity index 100% rename from campaigns/campaigns.de.xhtml rename to activities/activities.de.xhtml diff --git a/campaigns/campaigns.el.xhtml b/activities/activities.el.xhtml similarity index 100% rename from campaigns/campaigns.el.xhtml rename to activities/activities.el.xhtml diff --git a/campaigns/campaigns.en.xhtml b/activities/activities.en.xhtml similarity index 100% rename from campaigns/campaigns.en.xhtml rename to activities/activities.en.xhtml diff --git a/campaigns/campaigns.es.xhtml b/activities/activities.es.xhtml similarity index 100% rename from campaigns/campaigns.es.xhtml rename to activities/activities.es.xhtml diff --git a/campaigns/campaigns.fi.xhtml b/activities/activities.fi.xhtml similarity index 100% rename from campaigns/campaigns.fi.xhtml rename to activities/activities.fi.xhtml diff --git a/campaigns/campaigns.fr.xhtml b/activities/activities.fr.xhtml similarity index 100% rename from campaigns/campaigns.fr.xhtml rename to activities/activities.fr.xhtml diff --git a/campaigns/campaigns.it.xhtml b/activities/activities.it.xhtml similarity index 100% rename from campaigns/campaigns.it.xhtml rename to activities/activities.it.xhtml diff --git a/campaigns/campaigns.nl.xhtml b/activities/activities.nl.xhtml similarity index 100% rename from campaigns/campaigns.nl.xhtml rename to activities/activities.nl.xhtml diff --git a/campaigns/campaigns.pt.xhtml b/activities/activities.pt.xhtml similarity index 100% rename from campaigns/campaigns.pt.xhtml rename to activities/activities.pt.xhtml diff --git a/campaigns/campaigns.ru.xhtml b/activities/activities.ru.xhtml similarity index 100% rename from campaigns/campaigns.ru.xhtml rename to activities/activities.ru.xhtml diff --git a/campaigns/campaigns.sk.xhtml b/activities/activities.sk.xhtml similarity index 100% rename from campaigns/campaigns.sk.xhtml rename to activities/activities.sk.xhtml diff --git a/campaigns/campaigns.sq.xhtml b/activities/activities.sq.xhtml similarity index 100% rename from campaigns/campaigns.sq.xhtml rename to activities/activities.sq.xhtml diff --git a/campaigns/campaigns.tr.xhtml b/activities/activities.tr.xhtml similarity index 100% rename from campaigns/campaigns.tr.xhtml rename to activities/activities.tr.xhtml diff --git a/activities/askyourcandidates/votingbenchmarks.de.xhtml b/activities/askyourcandidates/votingbenchmarks.de.xhtml index ef4db9bfd3..0c36c95ceb 100644 --- a/activities/askyourcandidates/votingbenchmarks.de.xhtml +++ b/activities/askyourcandidates/votingbenchmarks.de.xhtml @@ -10,7 +10,7 @@
-Unsere Kampagnen / Ask your candidates
+Unsere Kampagnen / Ask your candidates
Dette er en liste over FSFE's aktuelle projekter. Der er også et arkiv - med i øjeblikket inaktive projekter - foruden afsluttede og stoppede + med i øjeblikket inaktive projekter + foruden afsluttede og stoppede projekter.
diff --git a/campaigns/projects.de.xhtml b/activities/projects.de.xhtml similarity index 100% rename from campaigns/projects.de.xhtml rename to activities/projects.de.xhtml diff --git a/campaigns/projects.el.xhtml b/activities/projects.el.xhtml similarity index 64% rename from campaigns/projects.el.xhtml rename to activities/projects.el.xhtml index e53f3748aa..732cd9ac7b 100644 --- a/campaigns/projects.el.xhtml +++ b/activities/projects.el.xhtml @@ -14,8 +14,8 @@Αυτός είναι ένας κατάλογος με τα τρέχοντα προγράμματα του FSFE. Υπάρχει και μια - αρχειοθήκη με Προς το παρόν Ανενεργά Προγράμματα καθώς - επίσης και με Ολοκληρωμένα και σε Παύση Προγράμματα. + αρχειοθήκη με Προς το παρόν Ανενεργά Προγράμματα καθώς + επίσης και με Ολοκληρωμένα και σε Παύση Προγράμματα.
This is a list of the current projects of FSFE. There is also an - archive of Currently Inactive - Projects as well as Finished + archive of Currently Inactive + Projects as well as Finished And Discontinued Projects.
diff --git a/campaigns/projects.es.xhtml b/activities/projects.es.xhtml similarity index 100% rename from campaigns/projects.es.xhtml rename to activities/projects.es.xhtml diff --git a/campaigns/projects.fi.xhtml b/activities/projects.fi.xhtml similarity index 100% rename from campaigns/projects.fi.xhtml rename to activities/projects.fi.xhtml diff --git a/campaigns/projects.fr.xhtml b/activities/projects.fr.xhtml similarity index 100% rename from campaigns/projects.fr.xhtml rename to activities/projects.fr.xhtml diff --git a/campaigns/projects.it.xhtml b/activities/projects.it.xhtml similarity index 100% rename from campaigns/projects.it.xhtml rename to activities/projects.it.xhtml diff --git a/campaigns/projects.nb.xhtml b/activities/projects.nb.xhtml similarity index 100% rename from campaigns/projects.nb.xhtml rename to activities/projects.nb.xhtml diff --git a/campaigns/projects.nl.xhtml b/activities/projects.nl.xhtml similarity index 100% rename from campaigns/projects.nl.xhtml rename to activities/projects.nl.xhtml diff --git a/campaigns/projects.ru.xhtml b/activities/projects.ru.xhtml similarity index 100% rename from campaigns/projects.ru.xhtml rename to activities/projects.ru.xhtml diff --git a/activities/projects.sources b/activities/projects.sources new file mode 100644 index 0000000000..a88403879e --- /dev/null +++ b/activities/projects.sources @@ -0,0 +1,2 @@ +activities/*/project:[] +activities/.localmenu:[] diff --git a/campaigns/projects.sq.xhtml b/activities/projects.sq.xhtml similarity index 67% rename from campaigns/projects.sq.xhtml rename to activities/projects.sq.xhtml index 5409903970..6fcf3eaf33 100644 --- a/campaigns/projects.sq.xhtml +++ b/activities/projects.sq.xhtml @@ -14,8 +14,8 @@Kjo është një listë e projekteve të tanishme të FSFE-së. Ka gjithashtu një - arkiv të Projekteve Jo Aktivë të Tanishëm - si dhe një për Projektet e Përfunduara dhe Ato që Nuk Vazhdohen Më. + arkiv të Projekteve Jo Aktivë të Tanishëm + si dhe një për Projektet e Përfunduara dhe Ato që Nuk Vazhdohen Më.
We can provide assistance, information and expertise on a wide variety of issues relating to Free Software. Individuals, communities and businesses are encouraged to contact us with questions. We are proud to maintain the world’s largest private network of Free Software legal experts. We have a skilled team that handles policy issues, and a network of specialists who advise on our various campaigns.
+We can provide assistance, information and expertise on a wide variety of issues relating to Free Software. Individuals, communities and businesses are encouraged to contact us with questions. We are proud to maintain the world’s largest private network of Free Software legal experts. We have a skilled team that handles policy issues, and a network of specialists who advise on our various campaigns.
Voimme tarjota apua, tietoa ja asiantuntemusta liittyen monenlaisiin Vapaisiin ohjelmistoihin liityvistä asioista. Kannustamme yksilöitä, yhteisöjä ja yrityksiä lähettämään meille kysymyksiä. Olemme ylpeitä voidessamme tarjota maailman suurimman yksityisen vapaiden ohjelmistojen oikeudellisten asiantuntijoiden verkoston. Meillä on ammattitaitoinen tiimi, joka käsittelee politiikkaan liittyviä kysymyksiä ja asiantuntijaverkosto, joka antaa neuvoja eri kampanjoistamme.
+Voimme tarjota apua, tietoa ja asiantuntemusta liittyen monenlaisiin Vapaisiin ohjelmistoihin liityvistä asioista. Kannustamme yksilöitä, yhteisöjä ja yrityksiä lähettämään meille kysymyksiä. Olemme ylpeitä voidessamme tarjota maailman suurimman yksityisen vapaiden ohjelmistojen oikeudellisten asiantuntijoiden verkoston. Meillä on ammattitaitoinen tiimi, joka käsittelee politiikkaan liittyviä kysymyksiä ja asiantuntijaverkosto, joka antaa neuvoja eri kampanjoistamme.
Nous pouvons fournir une assistance, des informations et une expertise sur une grande variété de problèmes liés au Logiciel Libre. Les particuliers, les communautés et les entreprises sont encouragés à nous contacter pour toute question. Nous sommes fiers de maintenir le plus grand réseau privé d'experts juridiques du Logiciel Libre au monde. Nous avons une équipe qualifiée qui gère les questions de politique, et un réseau de spécialistes qui conseillent sur nos différentes campagnes.
+Nous pouvons fournir une assistance, des informations et une expertise sur une grande variété de problèmes liés au Logiciel Libre. Les particuliers, les communautés et les entreprises sont encouragés à nous contacter pour toute question. Nous sommes fiers de maintenir le plus grand réseau privé d'experts juridiques du Logiciel Libre au monde. Nous avons une équipe qualifiée qui gère les questions de politique, et un réseau de spécialistes qui conseillent sur nos différentes campagnes.
-We kunnen u voorzien van hulp, informatie en kennis op een verscheidenheid aan onderwerpen die verwant zijn met Vrije Software. We moedigen individuen, gemeenschappen en bedrijven aan om met vragen contact met ons op te nemen. We zijn er trots op dat we 's werelds grootste private netwerk van juridische Vrije Software-experts in stand houden. We hebben een vakkundig team dat beleidsonderwerpen behandelt en een netwerk van specialisten dat ons adviseert over onze verschillende campagnes.
+We kunnen u voorzien van hulp, informatie en kennis op een verscheidenheid aan onderwerpen die verwant zijn met Vrije Software. We moedigen individuen, gemeenschappen en bedrijven aan om met vragen contact met ons op te nemen. We zijn er trots op dat we 's werelds grootste private netwerk van juridische Vrije Software-experts in stand houden. We hebben een vakkundig team dat beleidsonderwerpen behandelt en een netwerk van specialisten dat ons adviseert over onze verschillende campagnes.diff --git a/news/2018/news-20180716-01.en.xhtml b/news/2018/news-20180716-01.en.xhtml index 3901480b4d..00e9144e6a 100644 --- a/news/2018/news-20180716-01.en.xhtml +++ b/news/2018/news-20180716-01.en.xhtml @@ -37,7 +37,7 @@
We are involved in legal, economic, political, and technical projects around Free Software (see our work areas and our + href="/activities/activities.html">our campaigns).
In the Legal
@@ -58,7 +58,7 @@
Participamos activamente en proyectos jurídicos, económicos, políticos
y técnicos que atañen al Software Libre (vea nuestras áreas de trabajo y nuestras
+ href="/activities/activities.html">nuestras
campañas). En la Red jurídica
@@ -64,7 +64,7 @@
As soon as we have the final numbers for 2018, you will find them on our funds list. On a general note, we are always eager to increase our financial independence with an increase of individual supporters instead of major donors. We expect around one third of our budget in 2018 to be covered by our financial supporter program. Apart from the basic costs to run our infrastructure, we have the highest expenses in Policy, Public Outreach, and Legal. Currently, our biggest campaign is Public Money? Public Code!. The financial part of our Public Outreach covers the production and distribution of PR material, merchandise and the FSFE's presence at various Free Software events. As soon as we have the final numbers for 2018, you will find them on our funds list. On a general note, we are always eager to increase our financial independence with an increase of individual supporters instead of major donors. We expect around one third of our budget in 2018 to be covered by our financial supporter program. Apart from the basic costs to run our infrastructure, we have the highest expenses in Policy, Public Outreach, and Legal. Currently, our biggest campaign is Public Money? Public Code!. The financial part of our Public Outreach covers the production and distribution of PR material, merchandise and the FSFE's presence at various Free Software events. Zodra we de laatste cijfers voor 2018 hebben vindt u ze op onze fondsenlijst. In het algemeen zijn we altijd bereid om onze financiële onafhankelijkheid te vergroten met een toename van individuele donateurs in plaats van grote donateurs. We verwachten dat ongeveer een derde van ons budget in 2018 gedekt zal worden door ons financieel ondersteuningsprogramma. Naast de basiskosten om onze infrastructuur te beheren hebben we de grootste uitgaven op het gebied van beleid, publieksvoorlichting en juridische aangelegenheden. Momenteel is onze grootste campagne Publiek Geld? Publieke Code! . Het financiële gedeelte van onze publieksvoorlichting omvat de productie en distributie van PR-materiaal, fan-artikelen en de aanwezigheid van de FSFE op verschillende Vrije Software evenementen. Zodra we de laatste cijfers voor 2018 hebben vindt u ze op onze fondsenlijst. In het algemeen zijn we altijd bereid om onze financiële onafhankelijkheid te vergroten met een toename van individuele donateurs in plaats van grote donateurs. We verwachten dat ongeveer een derde van ons budget in 2018 gedekt zal worden door ons financieel ondersteuningsprogramma. Naast de basiskosten om onze infrastructuur te beheren hebben we de grootste uitgaven op het gebied van beleid, publieksvoorlichting en juridische aangelegenheden. Momenteel is onze grootste campagne Publiek Geld? Publieke Code! . Het financiële gedeelte van onze publieksvoorlichting omvat de productie en distributie van PR-materiaal, fan-artikelen en de aanwezigheid van de FSFE op verschillende Vrije Software evenementen. We are involved in legal, economic, political, and technical
projects around Free Software (see our work areas and our
+ href="/activities/activities.html">our
campaigns). Our work is made possible by a community of volunteers, supporters and donors. To make this community more sustainable, we are looking for a Fundraising Manager to help us sustainably grow the FSFE's supporter base and increase our grants and donations. The Fundraising Manager will develop, adjust, and implement fundraising strategies and goals in close cooperation with our team of employees and volunteers.Budgets and expenses
- Budgetten en uitgaven
-Promotiemateriaal
diff --git a/news/2019/news-20190108-01.en.xhtml b/news/2019/news-20190108-01.en.xhtml
index fecc8a426b..18967349a1 100644
--- a/news/2019/news-20190108-01.en.xhtml
+++ b/news/2019/news-20190108-01.en.xhtml
@@ -32,7 +32,7 @@