), σε επίπεδο Ευρωπαϊκής
Ένωσης (Διπλώματα
Ευρεσιτεχνίας Λογισμικού και IPRED2), και για την
diff --git a/about/funds/2008.en.xhtml b/about/funds/2008.en.xhtml
index 73ece19c45..5ec1ab30c8 100644
--- a/about/funds/2008.en.xhtml
+++ b/about/funds/2008.en.xhtml
@@ -139,7 +139,7 @@
FSFE's work in UN organisations (WIPO and IGF), EU level (IGF), EU level (Software Patents and IPRED2), and in the
support of Open Standards.
diff --git a/about/funds/2008.fr.xhtml b/about/funds/2008.fr.xhtml
index 0433ad207b..c1e4f17176 100644
--- a/about/funds/2008.fr.xhtml
+++ b/about/funds/2008.fr.xhtml
@@ -141,7 +141,7 @@
Attività della FSFE in enti ONU (WIPO e IGF); nell'Unione Europea (IGF); nell'Unione Europea (Brevetti Software e IPRED2) ed in
favore degli Standard Aperti.
diff --git a/about/funds/2008.nl.xhtml b/about/funds/2008.nl.xhtml
index 88d31073b1..1651bfec72 100644
--- a/about/funds/2008.nl.xhtml
+++ b/about/funds/2008.nl.xhtml
@@ -139,7 +139,7 @@
Η εργασία του FSFE στους οργανισμούς των Ηνωμένων Εθνών
(WIPO and
- IGF), σε επίπεδο Ευρωπαϊκής Ένωσης
+ IGF), σε επίπεδο Ευρωπαϊκής Ένωσης
(Διπλώματα Ευρεσιτεχνίας Λογισμικού και
IPRED2), και για την
υποστήριξη στα Ανοιχτά Πρότυπα.
diff --git a/about/funds/2009.en.xhtml b/about/funds/2009.en.xhtml
index a76fd42a6c..01c37def8e 100644
--- a/about/funds/2009.en.xhtml
+++ b/about/funds/2009.en.xhtml
@@ -122,7 +122,7 @@
FSFE's work in UN organisations
(WIPO and
- IGF), EU level
+ IGF), EU level
(Software Patents and
IPRED2), and in the support
of Open Standards.
diff --git a/about/funds/2009.nl.xhtml b/about/funds/2009.nl.xhtml
index def27136d9..f6cb62d10c 100644
--- a/about/funds/2009.nl.xhtml
+++ b/about/funds/2009.nl.xhtml
@@ -215,7 +215,7 @@ FSFE's werk in VN organisaties (
WIPO
en
-
+
IGF
), EU niveau (
diff --git a/about/funds/2009.ru.xhtml b/about/funds/2009.ru.xhtml
index 7498b5b705..8243d9c969 100644
--- a/about/funds/2009.ru.xhtml
+++ b/about/funds/2009.ru.xhtml
@@ -120,7 +120,7 @@ href="/activities/stacs/stacs.html">STACS.
FSFE's work in UN organisations
(WIPO and
- IGF), EU level
+ IGF), EU level
(Software Patents and
IPRED2), and in the support
of Open Standards.
diff --git a/about/funds/2011.en.xhtml b/about/funds/2011.en.xhtml
index aea6105b71..9d80a9c094 100644
--- a/about/funds/2011.en.xhtml
+++ b/about/funds/2011.en.xhtml
@@ -144,7 +144,7 @@
FSFE's work in UN organisations
(WIPO and
- IGF), EU level
+ IGF), EU level
(Software Patents and
IPRED2), and in the support
of Open Standards.
diff --git a/about/funds/2012.en.xhtml b/about/funds/2012.en.xhtml
index da43b11991..e167e7e266 100644
--- a/about/funds/2012.en.xhtml
+++ b/about/funds/2012.en.xhtml
@@ -144,7 +144,7 @@
FSFE's work in UN organisations
(WIPO and
- IGF), EU level
+ IGF), EU level
(Software Patents and
IPRED2), and in the support
of Open Standards.
diff --git a/about/people/greve/greve.de.xhtml b/about/people/greve/greve.de.xhtml
index a07cf24087..74142a7d46 100644
--- a/about/people/greve/greve.de.xhtml
+++ b/about/people/greve/greve.de.xhtml
@@ -128,7 +128,7 @@ wählen sie oft aus einem falschen Gefühl der Sicherheit und aus mangelndem
technischen Verständnis das dominierende Produkt und bestrafen damit letztlich
den Wettbewerber für das Verhalten des dominanten Spielers."
Souveräne Software -
Offene Standards, Freie Software und das Internet
(2006-10-30) Softwarethemen sind eine Frage der Macht und formen auf
grundlegende Weise die Gesellschaft, in der wir leben. Auch denjenigen,
diff --git a/about/people/greve/greve.el.xhtml b/about/people/greve/greve.el.xhtml
index c9bda82dc0..f579b07def 100644
--- a/about/people/greve/greve.el.xhtml
+++ b/about/people/greve/greve.el.xhtml
@@ -125,7 +125,7 @@ Office. Επειδή οι περισσότεροι χρήστες έχουν δ
αηδιάζουν με τις ασυμβατότητες, από μια αίσθηση ψευδούς ασφάλειας και άγνοια
της τεχνολογίας, συχνά επιλέγουν το κυρίαρχο προϊόν, τιμωρώντας εξ αντικειμένου
τον ανταγωνιστή για τη συμπεριφορά του κυρίαρχου παίκτη".
Λογισμικό Κυριαρχικών Δικαιωμάτων -
Ανοιχτά Πρότυπα, Ελεύθερο Λογισμικό και το Διαδίκτυο (2006-10-30)
Τα ζητήματα του Λογισμικού είναι ζητήματα ισχύος και διαμορφώνουν σε θεμελιακή
βάση τις κοινωνίες στις οποίες ζούμε. Ακόμα και για όσους δεν είχαν
diff --git a/about/people/greve/greve.en.xhtml b/about/people/greve/greve.en.xhtml
index f8f49d4ed6..3c109da11f 100644
--- a/about/people/greve/greve.en.xhtml
+++ b/about/people/greve/greve.en.xhtml
@@ -82,7 +82,7 @@
Microsoft, antitrust and innovation (on Groklaw) (2007-09-27) "If one were to believe Microsoft, antitrust law is for sore losers who are too lazy to innovate, and the decision of the European Court of Justice against Microsoft was to the detriment of consumers around the world. One might even believe that any company with large enough market share would now have to fear the wrath of the European Commission and its anti-innovation bloodhounds."
The converter hoax (2007-07-16) FSFE Guest Commentary on Heise.de: "Conversion between Microsoft's Office OpenXML (MS-OOXML) and the vendor-independent Open Document Format (ODF) has been proposed by Microsoft and its associates as a solution to the problems caused by Microsoft's efforts to push a format into the market that conflicts with the existing Open Standard. [...] If these converters were actually able to do what they promise to do, they would be unnecessary."
Novell's "Danaergeschenk" (on Groklaw) (2006-12-08) "With OpenXML, it appears as if there will be interoperability on paper only, but in reality people will experience numerous difficulties unless they use Microsoft Office. Because most users rightly fear and loathe incompatibilities, out of a sense of false security and lack of technological background, they will often choose the dominant product, effectively punishing the competitor for the behaviour of the dominant player."
-
Sovereign Software - Open Standards, Free Software, and the Internet (2006-10-30) Software issues are issues of power and fundamentally shape the societies we are living in. Even to those who had not followed digital policy issues before this became increasingly evident throughout the United Nations World Summit on the Information Society (WSIS). Two fundamental questions characterise this battlefield: Who controls your data? Who controls your computer?
+
Sovereign Software - Open Standards, Free Software, and the Internet (2006-10-30) Software issues are issues of power and fundamentally shape the societies we are living in. Even to those who had not followed digital policy issues before this became increasingly evident throughout the United Nations World Summit on the Information Society (WSIS). Two fundamental questions characterise this battlefield: Who controls your data? Who controls your computer?
Videos
diff --git a/about/people/greve/greve.fr.xhtml b/about/people/greve/greve.fr.xhtml
index 9bc6f26df7..da9c82808b 100644
--- a/about/people/greve/greve.fr.xhtml
+++ b/about/people/greve/greve.fr.xhtml
@@ -40,7 +40,7 @@ Vitae complet ou sa version PDF.
Microsoft, antitrust et innovation (sur Groklaw) (2007-09-27) «A en croire Microsoft, les lois antitrust sont faites pour des perdants trop fainéants pour innover, et la décision de la Cour européenne de justice contre Microsoft s'est faite au détriment des consommateurs du monde entier. L'on pourrait même avoir l'impression que désormais, toute entreprise possédant des parts de marché suffisantes devrait maintenant craindre la colère de la Commission Européenne et des ses chiens de garde anti-innovation.»
Le canular du convertisseur (2007-07-16) Le commentaire de la FSFE sur Heise.de: «La conversion entre le format OpenXML de Microsoft Office et le format indépendant Open Document (ODF) a été présentée par Microsoft et ses associés comme une solution aux problèmes posés par les efforts de Microsoft pour introduire dans le marché un format entrant en conflit avec les Standards Ouverts existants. [...] Si ces convertisseurs étaient effectivement capables de faire ce qu'ils promettent, ils ne seraient plus nécessaires.»
Novell's "Danaergeschenk" (on Groklaw) (2006-12-08) «Avec l'OpenXML, il semble que l'interopérabilité ne puisse se faire que sur le papier seulement, mais que dans les faits, les gens rencontreront de nombreuses difficultés à moins d'utiliser Microsoft Office. Et puisque les utilisateurs craignent à juste titre les problèmes d'incompatibilité, par manque de connaissance technologique et recherchant un faux sentiment de sécurité, ils choisiront le plus souvent le produit dominant, punissant dans les faits les concurrents du joueur dominant.»
-
Souveraineté logicielle - Standards ouverts, Logiciels Libres, et Internet (2006-10-30) Les problèmes logiciels sont des problèmes de pouvoir et modèlent fondamentalement l'organisation des sociétés dans lesquelles nous vivons. Même pour ceux qui n'avaient pas encore suivi ces questions de politique numérique, le Sommet Mondial des Nations Unies sur la Société de l'Information (SMSI) a mis en évidence cette problématique. Deux questions fondamentales caractérisent le débat : Qui contrôle vos données ? Qui contrôle votre ordinateur ?
+
Souveraineté logicielle - Standards ouverts, Logiciels Libres, et Internet (2006-10-30) Les problèmes logiciels sont des problèmes de pouvoir et modèlent fondamentalement l'organisation des sociétés dans lesquelles nous vivons. Même pour ceux qui n'avaient pas encore suivi ces questions de politique numérique, le Sommet Mondial des Nations Unies sur la Société de l'Information (SMSI) a mis en évidence cette problématique. Deux questions fondamentales caractérisent le débat : Qui contrôle vos données ? Qui contrôle votre ordinateur ?
Vidéos
diff --git a/about/people/greve/greve.hu.xhtml b/about/people/greve/greve.hu.xhtml
index b896e512a0..a2dcc0615c 100644
--- a/about/people/greve/greve.hu.xhtml
+++ b/about/people/greve/greve.hu.xhtml
@@ -31,8 +31,8 @@ href="http://gnuhh.org/greve-public.asc">[ nyilvános kulcs ])
diff --git a/about/people/greve/greve.it.xhtml b/about/people/greve/greve.it.xhtml
index 6645ef44fb..d6e70bf16c 100644
--- a/about/people/greve/greve.it.xhtml
+++ b/about/people/greve/greve.it.xhtml
@@ -69,7 +69,7 @@ ai problemi causati dagli sforzi di Microsoft di spingere nel mercato un formato
Novell's "Danaergeschenk" (on Groklaw) (2006-12-08) "con OpenXML, sembra che ci sia interoperabilità solo sulla carta, ma nella realtà la gente incontra numerose difficoltà se non usa Microsoft Office. Per questo molti utenti giustamente temono e detestano incompatibilità, grazie ad un senso di falsa sicurezza e mancanza di background tecnologico, spesso scelgono il software dominante, punendo di fatto la concorrenza a causa del comportamento del giocatore dominante."
-
Sovereign Software - Open Standards, Free Software, and the Internet (2006-10-30) Problemi di software sono questioni di fondamentale importanza nella società in cui viviamo. Anche per chi non aveva seguito questioni di politica digitale prima che questo divenisse particolarmente evidente al Vertice delle Nazioni Unite sulla Società dell'Informazione(WSIS). Due domande fondamentali caratterizzano questo campo di battaglia:Chi controlla i tuoi dati? Chi controlla il tuo computer?
+
Sovereign Software - Open Standards, Free Software, and the Internet (2006-10-30) Problemi di software sono questioni di fondamentale importanza nella società in cui viviamo. Anche per chi non aveva seguito questioni di politica digitale prima che questo divenisse particolarmente evidente al Vertice delle Nazioni Unite sulla Società dell'Informazione(WSIS). Due domande fondamentali caratterizzano questo campo di battaglia:Chi controlla i tuoi dati? Chi controlla il tuo computer?
Video
diff --git a/about/people/greve/greve.nl.xhtml b/about/people/greve/greve.nl.xhtml
index c695915b00..2303d17b00 100644
--- a/about/people/greve/greve.nl.xhtml
+++ b/about/people/greve/greve.nl.xhtml
@@ -127,7 +127,7 @@
gevoel, vaak kiezen voor het dominante product op de markt. Zo
worden de concurrenten gestraft voor het gedrag van de
dominante marktspeler."
-
Soevereine Software
Open Standaarden, Vrije Software, en het Internet
(2006-10-30) Softwaregeschillen zijn geschillen over
macht, en zijn fundamenteel voor het vormen van de gemeenschap
diff --git a/about/people/greve/greve.ru.xhtml b/about/people/greve/greve.ru.xhtml
index fed2916f3b..6371c5e508 100644
--- a/about/people/greve/greve.ru.xhtml
+++ b/about/people/greve/greve.ru.xhtml
@@ -125,7 +125,7 @@ href="http://www.groklaw.net/article.php?story=20061208135621706">
обеспечению, занимающему господствующее положение на рынке, тем самым
по существу наказав конкурентов за то, в чем виновата доминирующая
на рынке компания».
Независимое
программное обеспечение – открытые стандарты, свободное программное
обеспечение и Интернет (2006-10-30) Вопросы, связанные
с программным обеспечением – это вопросы власти, от которых зависит
diff --git a/activities/policy/fp6/FOCAL.pdf b/activities/fp6/FOCAL.pdf
similarity index 100%
rename from activities/policy/fp6/FOCAL.pdf
rename to activities/fp6/FOCAL.pdf
diff --git a/activities/policy/fp6/LAFIS.pdf b/activities/fp6/LAFIS.pdf
similarity index 100%
rename from activities/policy/fp6/LAFIS.pdf
rename to activities/fp6/LAFIS.pdf
diff --git a/activities/policy/fp6/document.de.xml b/activities/fp6/document.de.xml
similarity index 69%
rename from activities/policy/fp6/document.de.xml
rename to activities/fp6/document.de.xml
index 7866d5ac2a..cfc9c59b38 100644
--- a/activities/policy/fp6/document.de.xml
+++ b/activities/fp6/document.de.xml
@@ -6,19 +6,19 @@
FP6 EOI: LAFIS - LAying the Foundations for the Information
Society
- /activities/policy/fp6/lafis.html
+ /activities/fp6/lafis.html
FP6 EOI: FOCAL - FOcussing Competence for Advantages of
Liberty
- /activities/policy/fp6/focal.html
+ /activities/fp6/focal.html
Empfehlung der FSF Europe und unterstützender Parteien
- für das 6. Rahmenprogramm
+ für das 6. Rahmenprogramm
- /activities/policy/fp6/recommendation.html
+ /activities/fp6/recommendation.html
diff --git a/activities/policy/fp6/document.en.xml b/activities/fp6/document.en.xml
similarity index 68%
rename from activities/policy/fp6/document.en.xml
rename to activities/fp6/document.en.xml
index 87318f555b..daf5ac78bd 100644
--- a/activities/policy/fp6/document.en.xml
+++ b/activities/fp6/document.en.xml
@@ -6,18 +6,18 @@
FP6 EOI: LAFIS - LAying the Foundations for the Information
Society
- /activities/policy/fp6/lafis.html
+ /activities/fp6/lafis.html
FP6 EOI: FOCAL - FOcussing Competence for Advantages of
Liberty
- /activities/policy/fp6/focal.html
+ /activities/fp6/focal.html
Recommendation by the FSFE and supporting parties
- for the 6th framework programme
+ for the 6th framework programme
- /activities/policy/fp6/recommendation.html
+ /activities/fp6/recommendation.html
diff --git a/activities/policy/fp6/document.fr.xml b/activities/fp6/document.fr.xml
similarity index 75%
rename from activities/policy/fp6/document.fr.xml
rename to activities/fp6/document.fr.xml
index 95a10964a6..7379482e7f 100644
--- a/activities/policy/fp6/document.fr.xml
+++ b/activities/fp6/document.fr.xml
@@ -9,7 +9,7 @@
("Poser les fondations pour la société de l'information")
- /activities/policy/fp6/lafis.html
+ /activities/fp6/lafis.html
FP6 EOI: FOCAL - FOcussing Competence for Advantages of
@@ -17,14 +17,14 @@
("Focus de la compétence sur les avantages de la liberté")
- /activities/policy/fp6/focal.html
+ /activities/fp6/focal.html
Recommandations de la FSF Europe et de tierces parties
- sur le 6ème programme cadre
+ sur le 6ème programme cadre
- /activities/policy/fp6/recommendation.html
+ /activities/fp6/recommendation.html
diff --git a/activities/policy/fp6/document.it.xml b/activities/fp6/document.it.xml
similarity index 69%
rename from activities/policy/fp6/document.it.xml
rename to activities/fp6/document.it.xml
index c8982a4e89..eab262a786 100644
--- a/activities/policy/fp6/document.it.xml
+++ b/activities/fp6/document.it.xml
@@ -6,19 +6,19 @@
FP6 EOI: LAFIS - LAying the Foundations for the Information
Society
- /activities/policy/fp6/lafis.html
+ /activities/fp6/lafis.html
FP6 EOI: FOCAL - FOcussing Competence for Advantages of
Liberty
- /activities/policy/fp6/focal.html
+ /activities/fp6/focal.html
Raccomandazione della FSF Europe e degli enti sostenitori
- per il Sesto Programma Quadro
+ per il Sesto Programma Quadro
- /activities/policy/fp6/recommendation.html
+ /activities/fp6/recommendation.html
diff --git a/activities/policy/fp6/document.sq.xml b/activities/fp6/document.sq.xml
similarity index 72%
rename from activities/policy/fp6/document.sq.xml
rename to activities/fp6/document.sq.xml
index 1a2ec9aab8..723e877a88 100644
--- a/activities/policy/fp6/document.sq.xml
+++ b/activities/fp6/document.sq.xml
@@ -9,20 +9,20 @@
("Hedhja e Themeleve për Shoqërinë e Informacionit")
- /activities/policy/fp6/lafis.html
+ /activities/fp6/lafis.html
FP6 EOI: FOCAL - Focussing Competence for Advantages of
Liberty
- /activities/policy/fp6/focal.html
+ /activities/fp6/focal.html
Këshillime nga FSF Europa dhe mbështetje palësh
për
- programin e 6-të të planit të punës
+ programin e 6-të të planit të punës
- /activities/policy/fp6/recommendation.html
+ /activities/fp6/recommendation.html
diff --git a/activities/policy/fp6/focal.en.xhtml b/activities/fp6/focal.en.xhtml
similarity index 99%
rename from activities/policy/fp6/focal.en.xhtml
rename to activities/fp6/focal.en.xhtml
index ce20fa8d32..bf48dcd9b8 100644
--- a/activities/policy/fp6/focal.en.xhtml
+++ b/activities/fp6/focal.en.xhtml
@@ -859,7 +859,7 @@ document will use Free Software as the preferred term.
Foundation Europe (FSF Europe) and supporting parties for the European
Community framework programme 2002-2006 [*]
-
Online at https://fsfe.org/activities/policy/fp6/recommendation.html.
diff --git a/activities/policy/fp6/fp6.en.xhtml b/activities/fp6/fp6.en.xhtml
similarity index 100%
rename from activities/policy/fp6/fp6.en.xhtml
rename to activities/fp6/fp6.en.xhtml
diff --git a/activities/policy/fp6/lafis.en.xhtml b/activities/fp6/lafis.en.xhtml
similarity index 99%
rename from activities/policy/fp6/lafis.en.xhtml
rename to activities/fp6/lafis.en.xhtml
index dd52110098..5c85d13f6d 100644
--- a/activities/policy/fp6/lafis.en.xhtml
+++ b/activities/fp6/lafis.en.xhtml
@@ -846,7 +846,7 @@ Foundation Europe (FSF Europe) and supporting parties for the European
Community framework programme 2002-2006
diff --git a/activities/policy/fp6/more-support.en.xhtml b/activities/fp6/more-support.en.xhtml
similarity index 100%
rename from activities/policy/fp6/more-support.en.xhtml
rename to activities/fp6/more-support.en.xhtml
diff --git a/activities/policy/fp6/project.en.xml b/activities/fp6/project.en.xml
similarity index 91%
rename from activities/policy/fp6/project.en.xml
rename to activities/fp6/project.en.xml
index a7872d5da4..982aeb67bd 100644
--- a/activities/policy/fp6/project.en.xml
+++ b/activities/fp6/project.en.xml
@@ -11,6 +11,6 @@ usually done within the "framework programmes" (FPs). These last for
four years and FP6 has started officially on December 17th, 2002. The
FSF Europe seeks to help with Free Software related activities in FP6.
- /activities/policy/fp6/fp6.html
+ /activities/fp6/fp6.html
diff --git a/activities/policy/fp6/project.fr.xml b/activities/fp6/project.fr.xml
similarity index 92%
rename from activities/policy/fp6/project.fr.xml
rename to activities/fp6/project.fr.xml
index d29638c559..0f70553f7a 100644
--- a/activities/policy/fp6/project.fr.xml
+++ b/activities/fp6/project.fr.xml
@@ -13,7 +13,7 @@
2002. La FSF Europe cherche à inclure des aides pour les activités
liées aux Logiciels Libres dans le 6ème Programme Cadre.
- /activities/policy/fp6/fp6.html
+ /activities/fp6/fp6.html
diff --git a/activities/policy/fp6/project.it.xml b/activities/fp6/project.it.xml
similarity index 92%
rename from activities/policy/fp6/project.it.xml
rename to activities/fp6/project.it.xml
index 3b2129f9f9..4c1aea6b97 100644
--- a/activities/policy/fp6/project.it.xml
+++ b/activities/fp6/project.it.xml
@@ -12,7 +12,7 @@ che durano di solito quattro anni. Il 6° Programma Quadro (FP6) è iniziato
ufficialmente il 17 Dicembre 2002. La FSF Europe cerca di contribuire alle
attività del FP6 correlate al Software Libero.
- /activities/policy/fp6/fp6.html
+ /activities/fp6/fp6.html
diff --git a/activities/policy/fp6/reasoning.en.xhtml b/activities/fp6/reasoning.en.xhtml
similarity index 100%
rename from activities/policy/fp6/reasoning.en.xhtml
rename to activities/fp6/reasoning.en.xhtml
diff --git a/activities/policy/fp6/reasoning.pt.xhtml b/activities/fp6/reasoning.pt.xhtml
similarity index 100%
rename from activities/policy/fp6/reasoning.pt.xhtml
rename to activities/fp6/reasoning.pt.xhtml
diff --git a/activities/policy/fp6/recommendation.en.xhtml b/activities/fp6/recommendation.en.xhtml
similarity index 99%
rename from activities/policy/fp6/recommendation.en.xhtml
rename to activities/fp6/recommendation.en.xhtml
index 93318f4b96..5e197377a8 100644
--- a/activities/policy/fp6/recommendation.en.xhtml
+++ b/activities/fp6/recommendation.en.xhtml
@@ -10,7 +10,7 @@
diff --git a/activities/policy/fp6/recommendation.pdf b/activities/fp6/recommendation.pdf
similarity index 100%
rename from activities/policy/fp6/recommendation.pdf
rename to activities/fp6/recommendation.pdf
diff --git a/activities/policy/fp6/recommendation.pt.pdf b/activities/fp6/recommendation.pt.pdf
similarity index 100%
rename from activities/policy/fp6/recommendation.pt.pdf
rename to activities/fp6/recommendation.pt.pdf
diff --git a/activities/policy/fp6/recommendation.pt.xhtml b/activities/fp6/recommendation.pt.xhtml
similarity index 98%
rename from activities/policy/fp6/recommendation.pt.xhtml
rename to activities/fp6/recommendation.pt.xhtml
index e696a431de..1cd898d26f 100644
--- a/activities/policy/fp6/recommendation.pt.xhtml
+++ b/activities/fp6/recommendation.pt.xhtml
@@ -212,7 +212,7 @@ muito sucesso.
[2] A Free Software Foundation Europe e outras partes suportam esta
recomendação. Informação sobre a FSF Europe e a lista de outras partes
que a suportam pode ser encontrada em
-https://fsfe.org/activities/policy/fp6/supporting-parties.pt.html
+/activities/fp6/supporting-parties.pt.html
[3] Ver http://www.gnu.org/licenses/license-list.pt.html
diff --git a/activities/policy/fp6/supporting-parties.en.xhtml b/activities/fp6/supporting-parties.en.xhtml
similarity index 100%
rename from activities/policy/fp6/supporting-parties.en.xhtml
rename to activities/fp6/supporting-parties.en.xhtml
diff --git a/activities/policy/fp6/supporting-parties.pt.xhtml b/activities/fp6/supporting-parties.pt.xhtml
similarity index 100%
rename from activities/policy/fp6/supporting-parties.pt.xhtml
rename to activities/fp6/supporting-parties.pt.xhtml
diff --git a/activities/policy/fp7/fp7.de.xhtml b/activities/fp7/fp7.de.xhtml
similarity index 97%
rename from activities/policy/fp7/fp7.de.xhtml
rename to activities/fp7/fp7.de.xhtml
index 3c9a5b134b..b4fb1031ba 100644
--- a/activities/policy/fp7/fp7.de.xhtml
+++ b/activities/fp7/fp7.de.xhtml
@@ -12,7 +12,7 @@
Το FSFE σχεδιάζει να συμμετάσχει σε έργα που καλύπτουν το φάσμα από την
diff --git a/activities/policy/fp7/fp7.en.xhtml b/activities/fp7/fp7.en.xhtml
similarity index 95%
rename from activities/policy/fp7/fp7.en.xhtml
rename to activities/fp7/fp7.en.xhtml
index d3ce8f37dc..23c98ee38f 100644
--- a/activities/policy/fp7/fp7.en.xhtml
+++ b/activities/fp7/fp7.en.xhtml
@@ -13,7 +13,7 @@
7th EC Framework Programme
-
After the positive feedback from the application on the 6th Framework Programme the FSFE has put their eyes on
+
The FSFE is planning to participate in projects covering the spectrum from
diff --git a/activities/policy/fp7/fp7.fr.xhtml b/activities/fp7/fp7.fr.xhtml
similarity index 91%
rename from activities/policy/fp7/fp7.fr.xhtml
rename to activities/fp7/fp7.fr.xhtml
index 48bac4e3cc..06bd5eddf5 100644
--- a/activities/policy/fp7/fp7.fr.xhtml
+++ b/activities/fp7/fp7.fr.xhtml
@@ -13,7 +13,7 @@
La FSFE se prépare à participer à des projets dont les thèmes couvriront des domaines allant de la sécurité dans les technologies de l'information à la recherche sur les impacts sociaux de ces technologies, en passant par les recherches en direction des petites et moyennes entreprises.
diff --git a/activities/policy/fp7/fp7.it.xhtml b/activities/fp7/fp7.it.xhtml
similarity index 97%
rename from activities/policy/fp7/fp7.it.xhtml
rename to activities/fp7/fp7.it.xhtml
index cd406b8dc4..34b54e57a9 100644
--- a/activities/policy/fp7/fp7.it.xhtml
+++ b/activities/fp7/fp7.it.xhtml
@@ -13,7 +13,7 @@
La FSFE prevede di partecipare ad alcuni progetti che variano dalla sicurezza
diff --git a/activities/policy/fp7/fp7.nl.xhtml b/activities/fp7/fp7.nl.xhtml
similarity index 96%
rename from activities/policy/fp7/fp7.nl.xhtml
rename to activities/fp7/fp7.nl.xhtml
index 102ca5e474..885bf1634e 100644
--- a/activities/policy/fp7/fp7.nl.xhtml
+++ b/activities/fp7/fp7.nl.xhtml
@@ -15,7 +15,7 @@
Na de positieve reacties die we kregen voor onze activiteiten in
- het 6de Kaderprogramma,
+ het 6de Kaderprogramma,
richten we nu onze aandacht op de nieuwe uitdagingen die
het 7de
Kaderprogramma brengt.
diff --git a/activities/policy/fp7/project.de.xml b/activities/fp7/project.de.xml
similarity index 93%
rename from activities/policy/fp7/project.de.xml
rename to activities/fp7/project.de.xml
index 70ee684090..4316a9f691 100644
--- a/activities/policy/fp7/project.de.xml
+++ b/activities/fp7/project.de.xml
@@ -14,7 +14,7 @@ Rahmenprogramme nehmen eine zentrale Stellung in der Politik der EU
Europe wird sich hieran mit Projekten beteiligen, die sich mit der
Verbreitung, Erforschung und Entwicklung Freier Software befassen.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/fp7/project.el.xml b/activities/fp7/project.el.xml
similarity index 95%
rename from activities/policy/fp7/project.el.xml
rename to activities/fp7/project.el.xml
index da05c1a6f9..b2af2e017e 100644
--- a/activities/policy/fp7/project.el.xml
+++ b/activities/fp7/project.el.xml
@@ -12,7 +12,7 @@
προς στήριξη μέχρι το 2013. Το FSFE θα παίξει κεντρικό ρόλο για την
υποστήριξη έργων σχετικών με το Ελεύθερο Λογισμικό.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/fp7/project.en.xml b/activities/fp7/project.en.xml
similarity index 91%
rename from activities/policy/fp7/project.en.xml
rename to activities/fp7/project.en.xml
index e472a0a0ba..bd9bee65a6 100644
--- a/activities/policy/fp7/project.en.xml
+++ b/activities/fp7/project.en.xml
@@ -11,6 +11,6 @@
programmes will be used to select projects for support until 2013. FSFE
will play a central role in supported projects related to Free Software.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/fp7/project.fr.xml b/activities/fp7/project.fr.xml
similarity index 93%
rename from activities/policy/fp7/project.fr.xml
rename to activities/fp7/project.fr.xml
index 888d40acd3..ed79c07eaf 100644
--- a/activities/policy/fp7/project.fr.xml
+++ b/activities/fp7/project.fr.xml
@@ -8,7 +8,7 @@
Le financement de la recherche&développement par la Commission Européenne est normalement réalisé au travers du "Programme Cadre" (PC). Démarrant en 2007, cet instrument phare de l'Union Européenne sera utilisé pour sélectionner et aider différents projets jusqu'en 2013. La Free Software Foundation Europe sera une part intégrante des projets relatifs au Logiciel Libre.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/fp7/project.it.xml b/activities/fp7/project.it.xml
similarity index 91%
rename from activities/policy/fp7/project.it.xml
rename to activities/fp7/project.it.xml
index c7316e481a..5c65292d05 100644
--- a/activities/policy/fp7/project.it.xml
+++ b/activities/fp7/project.it.xml
@@ -11,7 +11,7 @@
progetti di ricerca selezionati nel 2007. La FSFE contribuirà ai progetti
supportati che si occupano di Software Libero.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/fp7/project.nl.xml b/activities/fp7/project.nl.xml
similarity index 93%
rename from activities/policy/fp7/project.nl.xml
rename to activities/fp7/project.nl.xml
index 626550cf90..a8d3245177 100644
--- a/activities/policy/fp7/project.nl.xml
+++ b/activities/fp7/project.nl.xml
@@ -13,7 +13,7 @@
uitmaken via projecten die verband houden met de ontwikkeling en het onderzoek naar
Vrije Software.
- /activities/policy/fp7/fp7.html
+ /activities/fp7/fp7.html
diff --git a/activities/policy/igf/SovereignSoftware.pdf b/activities/igf/SovereignSoftware.pdf
similarity index 100%
rename from activities/policy/igf/SovereignSoftware.pdf
rename to activities/igf/SovereignSoftware.pdf
diff --git a/activities/policy/igf/a2k.de.xhtml b/activities/igf/a2k.de.xhtml
similarity index 100%
rename from activities/policy/igf/a2k.de.xhtml
rename to activities/igf/a2k.de.xhtml
diff --git a/activities/policy/igf/a2k.el.xhtml b/activities/igf/a2k.el.xhtml
similarity index 100%
rename from activities/policy/igf/a2k.el.xhtml
rename to activities/igf/a2k.el.xhtml
diff --git a/activities/policy/igf/a2k.en.xhtml b/activities/igf/a2k.en.xhtml
similarity index 100%
rename from activities/policy/igf/a2k.en.xhtml
rename to activities/igf/a2k.en.xhtml
diff --git a/activities/policy/igf/a2k.fr.xhtml b/activities/igf/a2k.fr.xhtml
similarity index 100%
rename from activities/policy/igf/a2k.fr.xhtml
rename to activities/igf/a2k.fr.xhtml
diff --git a/activities/policy/igf/a2k.nl.xhtml b/activities/igf/a2k.nl.xhtml
similarity index 100%
rename from activities/policy/igf/a2k.nl.xhtml
rename to activities/igf/a2k.nl.xhtml
diff --git a/activities/policy/igf/dcos.el.xhtml b/activities/igf/dcos.el.xhtml
similarity index 98%
rename from activities/policy/igf/dcos.el.xhtml
rename to activities/igf/dcos.el.xhtml
index 04263ed546..7fa338ccc2 100644
--- a/activities/policy/igf/dcos.el.xhtml
+++ b/activities/igf/dcos.el.xhtml
@@ -139,7 +139,7 @@ Access to Knowledge και το Intellectual Property Programme (IAIPP).
http://mailman.ctyme.com/listinfo/openstds
+Sovereign Software: Open Standards, Free Software, and the Internet
diff --git a/activities/policy/igf/dcos.fr.xhtml b/activities/igf/dcos.fr.xhtml
similarity index 97%
rename from activities/policy/igf/dcos.fr.xhtml
rename to activities/igf/dcos.fr.xhtml
index b6edced481..f91d442d1f 100644
--- a/activities/policy/igf/dcos.fr.xhtml
+++ b/activities/igf/dcos.fr.xhtml
@@ -112,7 +112,7 @@ les divergences et leurs origines (en précisant qui a des opinions différentes
http://mailman.ctyme.com/listinfo/openstds
+Souveraineté Logicielle : Standards Ouverts, Logiciel Libre, et l'Internet
diff --git a/activities/policy/igf/dcos.nl.xhtml b/activities/igf/dcos.nl.xhtml
similarity index 98%
rename from activities/policy/igf/dcos.nl.xhtml
rename to activities/igf/dcos.nl.xhtml
index 3bf56b0d25..87363b45d2 100644
--- a/activities/policy/igf/dcos.nl.xhtml
+++ b/activities/igf/dcos.nl.xhtml
@@ -131,7 +131,7 @@ visie heeft, zodat men zelf een beter gefundeerde beslissing kan nemen.
http://mailman.ctyme.com/listinfo/openstds
+Soevereine Software: Open Standaarden, Vrije Software en het Internet
diff --git a/activities/policy/igf/document-sovsoft.de.xml b/activities/igf/document-sovsoft.de.xml
similarity index 93%
rename from activities/policy/igf/document-sovsoft.de.xml
rename to activities/igf/document-sovsoft.de.xml
index 31bd3d00fc..6fdcdb7ce1 100644
--- a/activities/policy/igf/document-sovsoft.de.xml
+++ b/activities/igf/document-sovsoft.de.xml
@@ -14,7 +14,7 @@
grundlegende Fragen charakterisieren dieses Themengebiet: Wer
kontrolliert Ihre Daten? Wer kontrolliert Ihren Computer?
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/document-sovsoft.el.xml b/activities/igf/document-sovsoft.el.xml
similarity index 96%
rename from activities/policy/igf/document-sovsoft.el.xml
rename to activities/igf/document-sovsoft.el.xml
index 7e5c584466..c96104cd74 100644
--- a/activities/policy/igf/document-sovsoft.el.xml
+++ b/activities/igf/document-sovsoft.el.xml
@@ -16,7 +16,7 @@
χαρακτηρίζουν αυτό το πεδίο μάχης: Ποιος ελέγχει τα δεδομένα σας; Ποιος
ελέγχει τον ηλεκτρονικό υπολογιστή σας;
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/document-sovsoft.en.xml b/activities/igf/document-sovsoft.en.xml
similarity index 93%
rename from activities/policy/igf/document-sovsoft.en.xml
rename to activities/igf/document-sovsoft.en.xml
index 852d52c8b7..016e1a9e36 100644
--- a/activities/policy/igf/document-sovsoft.en.xml
+++ b/activities/igf/document-sovsoft.en.xml
@@ -14,6 +14,6 @@
this battlefield: Who controls your data? Who controls your
computer?
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/document-sovsoft.fr.xml b/activities/igf/document-sovsoft.fr.xml
similarity index 93%
rename from activities/policy/igf/document-sovsoft.fr.xml
rename to activities/igf/document-sovsoft.fr.xml
index cc57437720..f8c1c802ff 100644
--- a/activities/policy/igf/document-sovsoft.fr.xml
+++ b/activities/igf/document-sovsoft.fr.xml
@@ -8,7 +8,7 @@
Les problèmes logiciels sont des problèmes de pouvoir et modèlent fondamentalement l'organisation des sociétés dans lesquelles nous vivons. Même pour ceux qui n'avaient pas encore suivi ces questions de politique numérique, le Sommet Mondial des Nations Unies sur la Société de l'Information (SMSI) a mis en évidence cette problématique. Deux questions fondamentales caractérisent le débat : Qui contrôle vos données ? Qui contrôle votre ordinateur ?
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/document-sovsoft.it.xml b/activities/igf/document-sovsoft.it.xml
similarity index 93%
rename from activities/policy/igf/document-sovsoft.it.xml
rename to activities/igf/document-sovsoft.it.xml
index 7ed11d70f3..151e9c313b 100644
--- a/activities/policy/igf/document-sovsoft.it.xml
+++ b/activities/igf/document-sovsoft.it.xml
@@ -13,7 +13,7 @@
dell'Informazione (WSIS). Due questioni fondamentali caratterizzano il campo
di discussione: Chi controlla i vostri dati? Chi controlla il vostro computer?
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/document-sovsoft.nl.xml b/activities/igf/document-sovsoft.nl.xml
similarity index 94%
rename from activities/policy/igf/document-sovsoft.nl.xml
rename to activities/igf/document-sovsoft.nl.xml
index 71bb119448..156f3c5c40 100644
--- a/activities/policy/igf/document-sovsoft.nl.xml
+++ b/activities/igf/document-sovsoft.nl.xml
@@ -19,7 +19,7 @@
bepalen deze strijd: Wie controleert jouw gegevens? Wie
controleert jouw computer?
- /activities/policy/igf/sovsoft.html
+ /activities/igf/sovsoft.html
diff --git a/activities/policy/igf/igf.el.xhtml b/activities/igf/igf.el.xhtml
similarity index 100%
rename from activities/policy/igf/igf.el.xhtml
rename to activities/igf/igf.el.xhtml
diff --git a/activities/policy/igf/igf.en.xhtml b/activities/igf/igf.en.xhtml
similarity index 100%
rename from activities/policy/igf/igf.en.xhtml
rename to activities/igf/igf.en.xhtml
diff --git a/activities/policy/igf/igf.fr.xhtml b/activities/igf/igf.fr.xhtml
similarity index 100%
rename from activities/policy/igf/igf.fr.xhtml
rename to activities/igf/igf.fr.xhtml
diff --git a/activities/policy/igf/igf.nl.xhtml b/activities/igf/igf.nl.xhtml
similarity index 100%
rename from activities/policy/igf/igf.nl.xhtml
rename to activities/igf/igf.nl.xhtml
diff --git a/activities/policy/igf/project.de.xml b/activities/igf/project.de.xml
similarity index 93%
rename from activities/policy/igf/project.de.xml
rename to activities/igf/project.de.xml
index 9c46658cb8..885d49416b 100644
--- a/activities/policy/igf/project.de.xml
+++ b/activities/igf/project.de.xml
@@ -13,7 +13,7 @@
dass die diskutierten Richtlinien digitale Freiheit im Allgemeinen und
Freie Software im Speziellen nicht gefährden.
- /activities/policy/igf/igf.html
+ /activities/igf/igf.html
diff --git a/activities/policy/igf/project.el.xml b/activities/igf/project.el.xml
similarity index 95%
rename from activities/policy/igf/project.el.xml
rename to activities/igf/project.el.xml
index 3efbd50cb4..3d24d17e47 100644
--- a/activities/policy/igf/project.el.xml
+++ b/activities/igf/project.el.xml
@@ -13,7 +13,7 @@
το IGF για να διασφαλίσει ότι οι συζητήσεις δεν θα απειλήσουν την ψηφιακή
ελευθερία γενικά και ιδιαίτερα το Ελεύθερο Λογισμικό.
- /activities/policy/igf/igf.html
+ /activities/igf/igf.html
diff --git a/activities/policy/igf/project.en.xml b/activities/igf/project.en.xml
similarity index 92%
rename from activities/policy/igf/project.en.xml
rename to activities/igf/project.en.xml
index b96c451fc4..cae627a007 100644
--- a/activities/policy/igf/project.en.xml
+++ b/activities/igf/project.en.xml
@@ -12,6 +12,6 @@ on the Information Society (WSIS). FSFE is following the IGF to ensure
that policy discussions will not endanger digital freedom in general and
Free Software in particular.
- /activities/policy/igf/igf.html
+ /activities/igf/igf.html
diff --git a/activities/policy/igf/project.fr.xml b/activities/igf/project.fr.xml
similarity index 93%
rename from activities/policy/igf/project.fr.xml
rename to activities/igf/project.fr.xml
index 8d7c11a1be..9ed58996fb 100644
--- a/activities/policy/igf/project.fr.xml
+++ b/activities/igf/project.fr.xml
@@ -8,7 +8,7 @@
Le Forum de la Gouvernance Internet (IGF) est un forum de discussion des politiques globales au sein des Nations Unies, établi lors du Sommet Mondial de la Société de l'Information (WSIS) des Nations Unies. La FSFE suit les travauxde l'IGF pour s'assurer que les discussions politiques en cours ne mettent pas en danger les libertés numériques en général et le Logiciel Libre en particulier.
- /activities/policy/igf/igf.html
+ /activities/igf/igf.html
diff --git a/activities/policy/igf/project.nl.xml b/activities/igf/project.nl.xml
similarity index 92%
rename from activities/policy/igf/project.nl.xml
rename to activities/igf/project.nl.xml
index 1b79a92531..4e8d7cd588 100644
--- a/activities/policy/igf/project.nl.xml
+++ b/activities/igf/project.nl.xml
@@ -12,7 +12,7 @@
gevaar vormen voor de digitale vrijheid in het algemeen en de Vrije Software in het
bijzonder.
- /activities/policy/igf/igf.html
+ /activities/igf/igf.html
diff --git a/activities/policy/igf/sovsoft.ca.xhtml b/activities/igf/sovsoft.ca.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.ca.xhtml
rename to activities/igf/sovsoft.ca.xhtml
diff --git a/activities/policy/igf/sovsoft.de.xhtml b/activities/igf/sovsoft.de.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.de.xhtml
rename to activities/igf/sovsoft.de.xhtml
diff --git a/activities/policy/igf/sovsoft.el.xhtml b/activities/igf/sovsoft.el.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.el.xhtml
rename to activities/igf/sovsoft.el.xhtml
diff --git a/activities/policy/igf/sovsoft.en.xhtml b/activities/igf/sovsoft.en.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.en.xhtml
rename to activities/igf/sovsoft.en.xhtml
diff --git a/activities/policy/igf/sovsoft.fr.xhtml b/activities/igf/sovsoft.fr.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.fr.xhtml
rename to activities/igf/sovsoft.fr.xhtml
diff --git a/activities/policy/igf/sovsoft.it.xhtml b/activities/igf/sovsoft.it.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.it.xhtml
rename to activities/igf/sovsoft.it.xhtml
diff --git a/activities/policy/igf/sovsoft.nl.xhtml b/activities/igf/sovsoft.nl.xhtml
similarity index 100%
rename from activities/policy/igf/sovsoft.nl.xhtml
rename to activities/igf/sovsoft.nl.xhtml
diff --git a/activities/policy/igf/wgig.de.xhtml b/activities/igf/wgig.de.xhtml
similarity index 98%
rename from activities/policy/igf/wgig.de.xhtml
rename to activities/igf/wgig.de.xhtml
index 77fec96098..7d93ef0958 100644
--- a/activities/policy/igf/wgig.de.xhtml
+++ b/activities/igf/wgig.de.xhtml
@@ -88,7 +88,7 @@ target="_blank">Internetseite der WGIG.
diff --git a/activities/policy/igf/wgig.el.xhtml b/activities/igf/wgig.el.xhtml
similarity index 98%
rename from activities/policy/igf/wgig.el.xhtml
rename to activities/igf/wgig.el.xhtml
index a24ecf07a8..719231878f 100644
--- a/activities/policy/igf/wgig.el.xhtml
+++ b/activities/igf/wgig.el.xhtml
@@ -83,7 +83,7 @@ target="_blank">γενικά σχόλια για όλες τις δημοσ