diff --git a/campaigns/gplv3/bangalore-rms-transcript.en.xhtml b/activities/gplv3/bangalore-rms-transcript.en.xhtml similarity index 100% rename from campaigns/gplv3/bangalore-rms-transcript.en.xhtml rename to activities/gplv3/bangalore-rms-transcript.en.xhtml diff --git a/campaigns/gplv3/barcelona-moglen-transcript.el.xhtml b/activities/gplv3/barcelona-moglen-transcript.el.xhtml similarity index 99% rename from campaigns/gplv3/barcelona-moglen-transcript.el.xhtml rename to activities/gplv3/barcelona-moglen-transcript.el.xhtml index bda58e0676..2e46b7cc01 100644 --- a/campaigns/gplv3/barcelona-moglen-transcript.el.xhtml +++ b/activities/gplv3/barcelona-moglen-transcript.el.xhtml @@ -29,7 +29,7 @@
Το ακόλουθο είναι ένα κείμενο του Eben Moglen από την παρουσίαση που έκανε - στο τρίτο διεθνές + στο τρίτο διεθνές συνέδριο για την GPLv3, που διοργάνωσε το FSFE στη Βαρκελώνη. Η σελίδα του συνεδρίου έχει υλικό και από άλλες παρουσιάσεις.
@@ -48,8 +48,8 @@Βίντεο και ηχητική καταγραφή είναι διαθέσιμα:
Η ομιλία έγινε στα αγγλικά.
@@ -2074,7 +2074,7 @@ copyright έγινε ένα εργαλείο για την απόκτηση ωφThe following is a transcript of Eben Moglen's presentation made at - the third + the third international GPLv3 conference, organised by FSFE in Barcelona. The conference page has materials from the other presentations.
@@ -47,8 +47,8 @@Video and audio recordings are available:
The speech was made in English.
@@ -1986,7 +1986,7 @@ Alright, thank you very much, I appreciate it.Hieronder volgt een afschrift van de toespraak die Eben Moglen hield op - de Derde Internationale + de Derde Internationale GPLv3 Conferentie. De conferentie werd in Barcelona georganiseerd door de FSFE, op de conferentiepagina vind je ook materiaal over de andere toespraken.
@@ -47,8 +47,8 @@Video- en geluidsopnamen zijn beschikbaar:
De originele toespraak was in het Engels.
@@ -1984,7 +1984,7 @@ OK, ik dank jullie allemaal, ik waardeer jullie bijdragen.. GPLv3 projectpagina bekijken.The following is a transcript of Richard Stallman's presentation made at - the third + the third international GPLv3 conference, organised by FSFE in Barcelona. The conference page has materials from the other presentations.
@@ -50,8 +50,8 @@Video and audio recordings are available:
The speech was made in English.
@@ -1515,7 +1515,7 @@ can guess where.The following are brief summaries made after - the third + the third international GPLv3 conference, organised by FSFE in Barcelona. The entire conference was recorded and links to the audio and video are provided below next to each summary. @@ -64,8 +64,8 @@
Points covered by Georg Greve:
@@ -123,8 +123,8 @@A complete transcript of
@@ -146,8 +146,8 @@
A complete transcript of
@@ -163,8 +163,8 @@
@@ -331,15 +331,15 @@
Quelli che seguono sono brevi riassunti fatti dopo
- la terza conferenza internazionale
+ la terza conferenza internazionale
sulla GPLv3, che FSFE ha organizzato a Barcellona.
L'intera conferenza è stata registrata e i link ai file audio e video
sono forniti qui sotto vicino ad ogni riassunto.
@@ -64,8 +64,8 @@
Punti toccati da Georg Greve: Una trascrizione completa dell'intervento fatto
@@ -141,8 +141,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
Una trascrizione completa dell'intervento
@@ -158,8 +158,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
@@ -309,15 +309,15 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
Wat volgt is een korte samenvatting van de Derde Internationale GPLv3
+ href="/activities/gplv3/europe-gplv3-conference.html">Derde Internationale GPLv3
Conferentie die door de FSFE georganiseerd werd in Barcelona. De
volledige conferentie werd opgenomen, de links naar de audio- en videofiles
staan bij de samenvatting.
@@ -64,8 +64,8 @@
Onderwerpen waarover Georg Greve
@@ -123,8 +123,8 @@
Een volledig afschrift van
@@ -146,8 +146,8 @@
Een volledig afschrift van
@@ -163,8 +163,8 @@
@@ -332,15 +332,15 @@
https://fsfe.org/campaigns/gplv3/torino-rms-transcript.html#drm-and-laws https://fsfe.org/activities/gplv3/torino-rms-transcript.html#drm-and-laws Freedom zero says you are free to run the program as you wish for any
purpose. We are not limiting freedom zero. If someone wants to run a
@@ -357,7 +357,7 @@ disablement from mere technological existence. https://fsfe.org/campaigns/gplv3/torino-rms-transcript.html#drm-and-laws https://fsfe.org/activities/gplv3/torino-rms-transcript.html#drm-and-laws There's one other way that we're trying to thwart DRM. You see, one
thing they do is, some countries, including, I'm sad to say, this one,
@@ -383,7 +383,7 @@ information about FSFE's efforts, see: The official website of the GPLv3 process is:Eben Moglen: The wording of the changes
-
-
-
Pablo Machón: GPLv3 and the European software patent struggle
-
@@ -352,8 +352,8 @@
-
@@ -367,8 +367,8 @@
-
@@ -396,7 +396,7 @@
Georg Greve: discorso di apertura
-
Richard Stallman: Sommario dei cambiamenti della GPLv3
-
Eben Moglen: La formulazione dei cambiamenti
-
-
-
Pablo Machón: La GPLv3 e la lotta contro i brevetti software in Europa
-
@@ -330,8 +330,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
-
@@ -345,8 +345,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
-
@@ -373,7 +373,7 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
Georg Greve: Inleidende toespraak
-
Richard Stallman: Overzicht van de veranderingen in de GPLv3
-
Eben Moglen: De formulering van de wijzigingen
-
-
-
Pablo Machón: GPLv3 en de strijd tegen Europese softwarepatenten
-
@@ -353,8 +353,8 @@
-
@@ -368,8 +368,8 @@
-
@@ -394,7 +394,7 @@
3.3 Richard Stallman, speaking in Turin, March 18th 2006
-4.2 Richard Stallman, speaking in Turin, March 18th 2006
-
Georg Greve: introducció
Richard Stallman: el canvis principals de la GPL v3
Ciarán O'Riordan: el procés de consulta pública
@@ -122,8 +122,8 @@
Eben Moglen: la fraseologia dels canvis
@@ -140,8 +140,8 @@
@@ -156,16 +156,16 @@
Pablo Machón: la GPLv3 i el perill de les patents europees de programari
@@ -179,8 +179,8 @@
@@ -195,8 +195,8 @@
diff --git a/campaigns/gplv3/europe-gplv3-conference.de.xhtml b/activities/gplv3/europe-gplv3-conference.de.xhtml
similarity index 83%
rename from campaigns/gplv3/europe-gplv3-conference.de.xhtml
rename to activities/gplv3/europe-gplv3-conference.de.xhtml
index 634935c212..f8d15d43c2 100644
--- a/campaigns/gplv3/europe-gplv3-conference.de.xhtml
+++ b/activities/gplv3/europe-gplv3-conference.de.xhtml
@@ -97,16 +97,16 @@ anderen GPLv3 Konferenzen.Georg Greve: Eröffnungsrede
Richard Stallman: Übersicht über die Änderungen in der GPLv3
Ciarán O'Riordan: Der öffentliche Beratungsprozess
@@ -121,8 +121,8 @@ anderen GPLv3 Konferenzen.
23. Juni: Foren (Englisch)
@@ -138,8 +138,8 @@ anderen GPLv3 Konferenzen.
https://fsfe.org/campaigns/gplv3/torino-rms-transcript.html#limited-retal
+https://fsfe.org/activities/gplv3/torino-rms-transcript.html#limited-retal
The GPL itself does contain one very limited kind of patent retaliation[...]. It says if you make changes in a @@ -251,7 +251,7 @@ would target them.
https://fsfe.org/campaigns/gplv3/torino-rms-transcript.html#compatibility-with-patent-retaliation
+https://fsfe.org/activities/gplv3/torino-rms-transcript.html#compatibility-with-patent-retaliation
There's another kind of requirement that we've decided to permit, and this is patent retaliation clauses. Now, the reason is that there are @@ -452,7 +452,7 @@ change.
https://fsfe.org/campaigns/gplv3/torino-rms-transcript.html#patent-grant
+https://fsfe.org/activities/gplv3/torino-rms-transcript.html#patent-grant
GPL version two is based on an implicit grant of a patent licence. The idea is that if somebody says "here is a thing and you can use it", @@ -614,7 +614,7 @@ proposed changes to GPLv3, and to solicit comments. This document was produced as part of FSFE's efforts to assist this process. For more information about FSFE's efforts, see:
-https://fsfe.org/campaigns/gplv3/
+https://fsfe.org/activities/gplv3/
The official website of the GPLv3 process is:
diff --git a/campaigns/gplv3/project.de.xml b/activities/gplv3/project.de.xml similarity index 94% rename from campaigns/gplv3/project.de.xml rename to activities/gplv3/project.de.xml index 5370abbce6..5a153f77f4 100644 --- a/campaigns/gplv3/project.de.xml +++ b/activities/gplv3/project.de.xml @@ -14,7 +14,7 @@ Verständnis über die GPL verbessert, anderen hilft an diesem Prozess teilzunehmen, Informationen veröffentlicht und Konferenzen organisiert. - /campaigns/gplv3/gplv3.html + /activities/gplv3/gplv3.html diff --git a/campaigns/gplv3/project.el.xml b/activities/gplv3/project.el.xml similarity index 95% rename from campaigns/gplv3/project.el.xml rename to activities/gplv3/project.el.xml index 5e47d6df8e..27ff85bf1d 100644 --- a/campaigns/gplv3/project.el.xml +++ b/activities/gplv3/project.el.xml @@ -13,7 +13,7 @@ να συμμετάσχει στη δημόσια διαβούλευση, και για να τεκμηριώσει τη συνεχιζόμενη ανταλλαγή απόψεων ώστε να καταστήσει αυτό το ζήτημα προσβάσιμο κατά το δυνατόν. - /campaigns/gplv3/gplv3.html + /activities/gplv3/gplv3.html diff --git a/campaigns/gplv3/project.en.xml b/activities/gplv3/project.en.xml similarity index 92% rename from campaigns/gplv3/project.en.xml rename to activities/gplv3/project.en.xml index eee562f92a..13429210cf 100644 --- a/campaigns/gplv3/project.en.xml +++ b/activities/gplv3/project.en.xml @@ -13,6 +13,6 @@ awareness of the changes proposed for the licence, to help the community to participate in the public consultation, and to document the ongoing discussion to make this topic as accessible as possible. - /campaigns/gplv3/gplv3.html + /activities/gplv3/gplv3.html diff --git a/campaigns/gplv3/project.es.xml b/activities/gplv3/project.es.xml similarity index 93% rename from campaigns/gplv3/project.es.xml rename to activities/gplv3/project.es.xml index fe9ae2e559..7918e5741a 100644 --- a/campaigns/gplv3/project.es.xml +++ b/activities/gplv3/project.es.xml @@ -13,7 +13,7 @@ divulgar los cambios propuestos para la licencia, ayudar a la comunidad a participar en el proceso de consulta pública y documentar la discusión con objeto de hacer el tema lo más accesible posible. - /campaigns/gplv3/gplv3.html + /activities/gplv3/gplv3.html diff --git a/campaigns/gplv3/project.fr.xml b/activities/gplv3/project.fr.xml similarity index 94% rename from campaigns/gplv3/project.fr.xml rename to activities/gplv3/project.fr.xml index 1d89a5fa66..77b59fb0c5 100644 --- a/campaigns/gplv3/project.fr.xml +++ b/activities/gplv3/project.fr.xml @@ -8,7 +8,7 @@Transcription of this event was undertaken by Ciaran O'Riordan and - published as part of FSFE's + published as part of FSFE's work to assist the GPLv3 consultation process. Please support work such as this by joining the Fellowship of FSFE, and by encouraging others to do so.
diff --git a/campaigns/swpat/swpat.da.xhtml b/campaigns/swpat/swpat.da.xhtml index a352e37ab2..81f5a37f47 100644 --- a/campaigns/swpat/swpat.da.xhtml +++ b/campaigns/swpat/swpat.da.xhtml @@ -174,7 +174,7 @@ direktiv, men den juridiske proces er stadig i gang og der er mange andre skadelige aspekter ved dette direktiv der må rettes. -2006 - 2007: 3.
+ 2006 - 2007: 3.
version af GNU GPL-licensen: I løbet af den 18 måneder lange
offentlige høring til udarbejdelse af GPLv3 arbejdede FSFE på at støtte
samfundsdeltagelse i processen. Bland andre fordele kan GPLv3 give
diff --git a/campaigns/swpat/swpat.de.xhtml b/campaigns/swpat/swpat.de.xhtml
index ce47d8fd8e..1d4d8a23e4 100644
--- a/campaigns/swpat/swpat.de.xhtml
+++ b/campaigns/swpat/swpat.de.xhtml
@@ -81,7 +81,7 @@
2006-2007:
+ 2006-2007:
Έκδοση 3 της GNU GPL: Κατά τη διάρκεια της δεκαοκτάμηνης
δημόσιας διαβούλευσης για τη δημιουργία του προσχεδίου της GPLv3, το FSFE
δραστηριοποιήθηκε για να ενθαρρύνει τη συμμετοχή της κοινότητας. Ανάμεσα
diff --git a/campaigns/swpat/swpat.en.xhtml b/campaigns/swpat/swpat.en.xhtml
index 6c40835718..d46bb60d21 100644
--- a/campaigns/swpat/swpat.en.xhtml
+++ b/campaigns/swpat/swpat.en.xhtml
@@ -173,7 +173,7 @@
process is still ongoing and there are many other harmful aspects of this
directive that must be corrected. 2006-2007: Version 3 of
+ 2006-2007: Version 3 of
the GNU GPL: During the 18 month public consultation for
the drafting of GPLv3, FSFE worked to assist community participation.
Among other benefits, GPLv3 offers better protection for free software
diff --git a/campaigns/swpat/swpat.fr.xhtml b/campaigns/swpat/swpat.fr.xhtml
index 30daa928dc..0d260e7845 100644
--- a/campaigns/swpat/swpat.fr.xhtml
+++ b/campaigns/swpat/swpat.fr.xhtml
@@ -90,7 +90,7 @@
La Commission Européenne a fait une proposition visant à criminaliser, à augmenter les peines et à prendre des mesures d'investigation invasives en cas d'infraction sur les brevets, copyrights, droits d'auteurs, marques déposées et toutes les autres lois du genre regroupées sous le terme de « propriété intellectuelle ». Il semblerait que les brevets soient désormais exclus de cette directive, mais le processus législatif est toujours en cours et de nombreux autres aspects inquiétants de cette directives restent encore à corriger.
2006-2007 : La version 3 de la GNU GPL
+ 2006-2007 : La version 3 de la GNU GPL
Au cours des 18 mois de consultation publique pour l'élaboration de la GPLv3, la FSFE a effectué un travail d'assistance auprès de la communauté pour faciliter sa participation. Parmi d'autres avantages, la GPLv3 offre une meilleure protection aux développeurs de Logiciels Libres contre les plaintes juridiques liées aux brevets logiciels. Nos licences ne peuvent résoudre qu'une petite partie du mal causé par les brevets logiciels, mais elles peuvent faciliter le développement de Logiciels Libres dans certains cas.
2006-2007: Versie 3 van de GNU GPL
+ 2006-2007: Versie 3 van de GNU GPL
: Gedurende de 18 maanden durende publieke consultatie van het werken aan GPLv3,
heeft de FSFE gewerkt aan het ondersteunen van deelname door de gemeenschap. GPLv3 biedt
onder andere het voordeel van een betere bescherming van vrije software ontwikkelaars tegen
diff --git a/campaigns/swpat/swpat.ru.xhtml b/campaigns/swpat/swpat.ru.xhtml
index 1c028664fa..c57d42a297 100644
--- a/campaigns/swpat/swpat.ru.xhtml
+++ b/campaigns/swpat/swpat.ru.xhtml
@@ -155,7 +155,7 @@ href="documents/iprip.html">интеллектуальная собственн
процесс утверждения директивы еще не завершен и многие другие вредные
положения данной директивы нуждаются в доработке.
+
С 2006 по 2007 год: Версия 3 GNU GPL.
В течение 18 месяцев публичных обсуждений проекта третьей версии 3 GPL
фонд активно содействовал этому процессу. Помимо прочих выгод, версия 3
diff --git a/events/2006/event-20060318.en.xml b/events/2006/event-20060318.en.xml
index 694ebb839e..6084f6965c 100644
--- a/events/2006/event-20060318.en.xml
+++ b/events/2006/event-20060318.en.xml
@@ -14,6 +14,6 @@
being the most used license for Free Software.