Το ακόλουθο είναι ένα κείμενο του Eben Moglen από την παρουσίαση που έκανε
- στο τρίτο διεθνές
+ στο τρίτο διεθνές
συνέδριο για την GPLv3, που διοργάνωσε το FSFE στη Βαρκελώνη. Η σελίδα
του συνεδρίου έχει υλικό και από άλλες παρουσιάσεις.
Μπορείτε να υποστηρίξετε την εργασία του FSFE, όπως τη δουλειά μας
diff --git a/campaigns/gplv3/barcelona-moglen-transcript.en.xhtml b/activities/gplv3/barcelona-moglen-transcript.en.xhtml
similarity index 99%
rename from campaigns/gplv3/barcelona-moglen-transcript.en.xhtml
rename to activities/gplv3/barcelona-moglen-transcript.en.xhtml
index fba76c23b8..05f8175271 100644
--- a/campaigns/gplv3/barcelona-moglen-transcript.en.xhtml
+++ b/activities/gplv3/barcelona-moglen-transcript.en.xhtml
@@ -29,7 +29,7 @@
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.
diff --git a/campaigns/gplv3/barcelona-moglen-transcript.nl.xhtml b/activities/gplv3/barcelona-moglen-transcript.nl.xhtml
similarity index 99%
rename from campaigns/gplv3/barcelona-moglen-transcript.nl.xhtml
rename to activities/gplv3/barcelona-moglen-transcript.nl.xhtml
index 6e3cacad7f..53394f5b2f 100644
--- a/campaigns/gplv3/barcelona-moglen-transcript.nl.xhtml
+++ b/activities/gplv3/barcelona-moglen-transcript.nl.xhtml
@@ -27,7 +27,7 @@
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.
U kan het werk van de FSFE ondersteunen door lid te worden van de
diff --git a/campaigns/gplv3/barcelona-rms-transcript.en.xhtml b/activities/gplv3/barcelona-rms-transcript.en.xhtml
similarity index 99%
rename from campaigns/gplv3/barcelona-rms-transcript.en.xhtml
rename to activities/gplv3/barcelona-rms-transcript.en.xhtml
index 5e91220841..418517425d 100644
--- a/campaigns/gplv3/barcelona-rms-transcript.en.xhtml
+++ b/activities/gplv3/barcelona-rms-transcript.en.xhtml
@@ -29,7 +29,7 @@
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.
diff --git a/campaigns/gplv3/barcelona-summaries.en.xhtml b/activities/gplv3/barcelona-summaries.en.xhtml
similarity index 88%
rename from campaigns/gplv3/barcelona-summaries.en.xhtml
rename to activities/gplv3/barcelona-summaries.en.xhtml
index 20be9b521d..2d5a30c144 100644
--- a/campaigns/gplv3/barcelona-summaries.en.xhtml
+++ b/activities/gplv3/barcelona-summaries.en.xhtml
@@ -19,7 +19,7 @@
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 @@
You can support FSFE's work, such as our GPLv3 awareness work,
diff --git a/campaigns/gplv3/barcelona-summaries.it.xhtml b/activities/gplv3/barcelona-summaries.it.xhtml
similarity index 89%
rename from campaigns/gplv3/barcelona-summaries.it.xhtml
rename to activities/gplv3/barcelona-summaries.it.xhtml
index d5a181f8b6..bb69d875fa 100644
--- a/campaigns/gplv3/barcelona-summaries.it.xhtml
+++ b/activities/gplv3/barcelona-summaries.it.xhtml
@@ -20,7 +20,7 @@
Potete sostenere il lavoro di FSFE, come quello sulla GPLv3,
diff --git a/campaigns/gplv3/barcelona-summaries.nl.xhtml b/activities/gplv3/barcelona-summaries.nl.xhtml
similarity index 89%
rename from campaigns/gplv3/barcelona-summaries.nl.xhtml
rename to activities/gplv3/barcelona-summaries.nl.xhtml
index ecae6b1bed..b81ec3dd61 100644
--- a/campaigns/gplv3/barcelona-summaries.nl.xhtml
+++ b/activities/gplv3/barcelona-summaries.nl.xhtml
@@ -19,7 +19,7 @@
diff --git a/campaigns/gplv3/brussels-rms-transcript.el.xhtml b/activities/gplv3/brussels-rms-transcript.el.xhtml
similarity index 100%
rename from campaigns/gplv3/brussels-rms-transcript.el.xhtml
rename to activities/gplv3/brussels-rms-transcript.el.xhtml
diff --git a/campaigns/gplv3/brussels-rms-transcript.en.xhtml b/activities/gplv3/brussels-rms-transcript.en.xhtml
similarity index 100%
rename from campaigns/gplv3/brussels-rms-transcript.en.xhtml
rename to activities/gplv3/brussels-rms-transcript.en.xhtml
diff --git a/campaigns/gplv3/brussels-rms-transcript.fr.xhtml b/activities/gplv3/brussels-rms-transcript.fr.xhtml
similarity index 100%
rename from campaigns/gplv3/brussels-rms-transcript.fr.xhtml
rename to activities/gplv3/brussels-rms-transcript.fr.xhtml
diff --git a/campaigns/gplv3/brussels-rms-transcript.nl.xhtml b/activities/gplv3/brussels-rms-transcript.nl.xhtml
similarity index 100%
rename from campaigns/gplv3/brussels-rms-transcript.nl.xhtml
rename to activities/gplv3/brussels-rms-transcript.nl.xhtml
diff --git a/campaigns/gplv3/diff-draft1-draft2.de.xhtml b/activities/gplv3/diff-draft1-draft2.de.xhtml
similarity index 100%
rename from campaigns/gplv3/diff-draft1-draft2.de.xhtml
rename to activities/gplv3/diff-draft1-draft2.de.xhtml
diff --git a/campaigns/gplv3/diff-draft1-draft2.en.xhtml b/activities/gplv3/diff-draft1-draft2.en.xhtml
similarity index 100%
rename from campaigns/gplv3/diff-draft1-draft2.en.xhtml
rename to activities/gplv3/diff-draft1-draft2.en.xhtml
diff --git a/campaigns/gplv3/diff-draft2-draft3.el.xhtml b/activities/gplv3/diff-draft2-draft3.el.xhtml
similarity index 100%
rename from campaigns/gplv3/diff-draft2-draft3.el.xhtml
rename to activities/gplv3/diff-draft2-draft3.el.xhtml
diff --git a/campaigns/gplv3/diff-draft2-draft3.en.xhtml b/activities/gplv3/diff-draft2-draft3.en.xhtml
similarity index 100%
rename from campaigns/gplv3/diff-draft2-draft3.en.xhtml
rename to activities/gplv3/diff-draft2-draft3.en.xhtml
diff --git a/campaigns/gplv3/diff-gplv2-draft2.en.xhtml b/activities/gplv3/diff-gplv2-draft2.en.xhtml
similarity index 100%
rename from campaigns/gplv3/diff-gplv2-draft2.en.xhtml
rename to activities/gplv3/diff-gplv2-draft2.en.xhtml
diff --git a/campaigns/gplv3/drm-and-gplv3.en.pdf b/activities/gplv3/drm-and-gplv3.en.pdf
similarity index 100%
rename from campaigns/gplv3/drm-and-gplv3.en.pdf
rename to activities/gplv3/drm-and-gplv3.en.pdf
diff --git a/campaigns/gplv3/drm-and-gplv3.en.xhtml b/activities/gplv3/drm-and-gplv3.en.xhtml
similarity index 98%
rename from campaigns/gplv3/drm-and-gplv3.en.xhtml
rename to activities/gplv3/drm-and-gplv3.en.xhtml
index b079ee322e..f9e0e7e658 100644
--- a/campaigns/gplv3/drm-and-gplv3.en.xhtml
+++ b/activities/gplv3/drm-and-gplv3.en.xhtml
@@ -198,7 +198,7 @@ that, you can program the software to do whatever you like.
3.3 Richard Stallman, speaking in Turin, March 18th 2006
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.
4.2 Richard Stallman, speaking in Turin, March 18th 2006
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:
diff --git a/campaigns/gplv3/europe-gplv3-conference.es.xhtml b/activities/gplv3/europe-gplv3-conference.es.xhtml
similarity index 84%
rename from campaigns/gplv3/europe-gplv3-conference.es.xhtml
rename to activities/gplv3/europe-gplv3-conference.es.xhtml
index ad6a1036c0..b4fde61a68 100644
--- a/campaigns/gplv3/europe-gplv3-conference.es.xhtml
+++ b/activities/gplv3/europe-gplv3-conference.es.xhtml
@@ -104,16 +104,16 @@ encontrar nuestra lista de transcripciones sobre la
diff --git a/campaigns/gplv3/europe-gplv3-conference.fr.xhtml b/activities/gplv3/europe-gplv3-conference.fr.xhtml
similarity index 83%
rename from campaigns/gplv3/europe-gplv3-conference.fr.xhtml
rename to activities/gplv3/europe-gplv3-conference.fr.xhtml
index e6878942ae..8366aa6d10 100644
--- a/campaigns/gplv3/europe-gplv3-conference.fr.xhtml
+++ b/activities/gplv3/europe-gplv3-conference.fr.xhtml
@@ -72,15 +72,15 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne
diff --git a/campaigns/gplv3/events.en.xhtml b/activities/gplv3/events.en.xhtml
similarity index 100%
rename from campaigns/gplv3/events.en.xhtml
rename to activities/gplv3/events.en.xhtml
diff --git a/campaigns/gplv3/fisl-rms-transcript.en.xhtml b/activities/gplv3/fisl-rms-transcript.en.xhtml
similarity index 100%
rename from campaigns/gplv3/fisl-rms-transcript.en.xhtml
rename to activities/gplv3/fisl-rms-transcript.en.xhtml
diff --git a/campaigns/gplv3/fisl-rms-transcript.es.xhtml b/activities/gplv3/fisl-rms-transcript.es.xhtml
similarity index 100%
rename from campaigns/gplv3/fisl-rms-transcript.es.xhtml
rename to activities/gplv3/fisl-rms-transcript.es.xhtml
diff --git a/campaigns/gplv3/fisl-rms-transcript.nl.xhtml b/activities/gplv3/fisl-rms-transcript.nl.xhtml
similarity index 100%
rename from campaigns/gplv3/fisl-rms-transcript.nl.xhtml
rename to activities/gplv3/fisl-rms-transcript.nl.xhtml
diff --git a/campaigns/gplv3/fsfe-gplv3-awareness-and-adoption.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-awareness-and-adoption.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-awareness-and-adoption.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-awareness-and-adoption.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-awareness-and-adoption.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-awareness-and-adoption.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-awareness-and-adoption.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-awareness-and-adoption.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-current-fsfe-projects.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-current-fsfe-projects.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-current-fsfe-projects.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-current-fsfe-projects.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-current-fsfe-projects.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-current-fsfe-projects.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-current-fsfe-projects.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-current-fsfe-projects.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-discussion-committees.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-discussion-committees.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-discussion-committees.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-discussion-committees.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-discussion-committees.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-discussion-committees.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-discussion-committees.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-discussion-committees.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-drm-enforcement.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-drm-enforcement.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-drm-enforcement.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-drm-enforcement.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-drm-enforcement.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-drm-enforcement.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-drm-enforcement.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-drm-enforcement.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-eben-moglen.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-eben-moglen.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-eben-moglen.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-eben-moglen.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-eben-moglen.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-eben-moglen.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-eben-moglen.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-eben-moglen.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-georg-greve.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-georg-greve.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-georg-greve.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-georg-greve.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-georg-greve.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-georg-greve.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-georg-greve.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-georg-greve.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-pablo-machon.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-pablo-machon.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-pablo-machon.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-pablo-machon.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-pablo-machon.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-pablo-machon.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-pablo-machon.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-pablo-machon.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-richard-stallman.theora.ogg.torrent b/activities/gplv3/fsfe-gplv3-richard-stallman.theora.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-richard-stallman.theora.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-richard-stallman.theora.ogg.torrent
diff --git a/campaigns/gplv3/fsfe-gplv3-richard-stallman.vorbis.ogg.torrent b/activities/gplv3/fsfe-gplv3-richard-stallman.vorbis.ogg.torrent
similarity index 100%
rename from campaigns/gplv3/fsfe-gplv3-richard-stallman.vorbis.ogg.torrent
rename to activities/gplv3/fsfe-gplv3-richard-stallman.vorbis.ogg.torrent
diff --git a/campaigns/gplv3/gplv3-torino.en.xhtml b/activities/gplv3/gplv3-torino.en.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3-torino.en.xhtml
rename to activities/gplv3/gplv3-torino.en.xhtml
diff --git a/campaigns/gplv3/gplv3-torino.es.xhtml b/activities/gplv3/gplv3-torino.es.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3-torino.es.xhtml
rename to activities/gplv3/gplv3-torino.es.xhtml
diff --git a/campaigns/gplv3/gplv3-torino.it.xhtml b/activities/gplv3/gplv3-torino.it.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3-torino.it.xhtml
rename to activities/gplv3/gplv3-torino.it.xhtml
diff --git a/campaigns/gplv3/gplv3-torino.nl.xhtml b/activities/gplv3/gplv3-torino.nl.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3-torino.nl.xhtml
rename to activities/gplv3/gplv3-torino.nl.xhtml
diff --git a/campaigns/gplv3/gplv3.ca.xhtml b/activities/gplv3/gplv3.ca.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.ca.xhtml
rename to activities/gplv3/gplv3.ca.xhtml
diff --git a/campaigns/gplv3/gplv3.de.xhtml b/activities/gplv3/gplv3.de.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.de.xhtml
rename to activities/gplv3/gplv3.de.xhtml
diff --git a/campaigns/gplv3/gplv3.el.xhtml b/activities/gplv3/gplv3.el.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.el.xhtml
rename to activities/gplv3/gplv3.el.xhtml
diff --git a/campaigns/gplv3/gplv3.en.xhtml b/activities/gplv3/gplv3.en.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.en.xhtml
rename to activities/gplv3/gplv3.en.xhtml
diff --git a/campaigns/gplv3/gplv3.es.xhtml b/activities/gplv3/gplv3.es.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.es.xhtml
rename to activities/gplv3/gplv3.es.xhtml
diff --git a/campaigns/gplv3/gplv3.fr.xhtml b/activities/gplv3/gplv3.fr.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.fr.xhtml
rename to activities/gplv3/gplv3.fr.xhtml
diff --git a/campaigns/gplv3/gplv3.it.xhtml b/activities/gplv3/gplv3.it.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.it.xhtml
rename to activities/gplv3/gplv3.it.xhtml
diff --git a/campaigns/gplv3/gplv3.nl.xhtml b/activities/gplv3/gplv3.nl.xhtml
similarity index 100%
rename from campaigns/gplv3/gplv3.nl.xhtml
rename to activities/gplv3/gplv3.nl.xhtml
diff --git a/campaigns/gplv3/links.en.xhtml b/activities/gplv3/links.en.xhtml
similarity index 100%
rename from campaigns/gplv3/links.en.xhtml
rename to activities/gplv3/links.en.xhtml
diff --git a/campaigns/gplv3/patents-and-gplv3.en.pdf b/activities/gplv3/patents-and-gplv3.en.pdf
similarity index 100%
rename from campaigns/gplv3/patents-and-gplv3.en.pdf
rename to activities/gplv3/patents-and-gplv3.en.pdf
diff --git a/campaigns/gplv3/patents-and-gplv3.en.xhtml b/activities/gplv3/patents-and-gplv3.en.xhtml
similarity index 98%
rename from campaigns/gplv3/patents-and-gplv3.en.xhtml
rename to activities/gplv3/patents-and-gplv3.en.xhtml
index 52b1592be5..1ffd94c85a 100644
--- a/campaigns/gplv3/patents-and-gplv3.en.xhtml
+++ b/activities/gplv3/patents-and-gplv3.en.xhtml
@@ -134,7 +134,7 @@ wish therefore to include it.
2.2 Richard Stallman, speaking in Turin, March 18th 2006
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.
4.3 Richard Stallman, speaking in Turin, March 18th 2006
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:
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 @@
Au cours de l'année 2006 a eu lieu un processus de consultation publique pour la rédaction de la version 3 de la GNU General Public License. Cette licence, couramment appelée "la GPL", est de loin la licence la plus utilisée pour les Logiciels Libres. La Free Software Foundation Europe soutient ce processus de consultation en sensibilisant le public sur la GPL, en facilitant la participation des gens au processus, en publiant des informations permettant aux autres de favoriser cette sensibilisation et en organisant des conférences.
- /campaigns/gplv3/gplv3.html
+ /activities/gplv3/gplv3.html
diff --git a/campaigns/gplv3/project.it.xml b/activities/gplv3/project.it.xml
similarity index 94%
rename from campaigns/gplv3/project.it.xml
rename to activities/gplv3/project.it.xml
index 4e3927ce45..a61033880b 100644
--- a/campaigns/gplv3/project.it.xml
+++ b/activities/gplv3/project.it.xml
@@ -15,7 +15,7 @@
partecipare al processo, diffondendo informazione e organizzando
conferenze.
- /campaigns/gplv3/gplv3.html
+ /activities/gplv3/gplv3.html
diff --git a/campaigns/gplv3/project.nl.xml b/activities/gplv3/project.nl.xml
similarity index 94%
rename from campaigns/gplv3/project.nl.xml
rename to activities/gplv3/project.nl.xml
index 659889d2cf..c876a61749 100644
--- a/campaigns/gplv3/project.nl.xml
+++ b/activities/gplv3/project.nl.xml
@@ -16,7 +16,7 @@
door mensen de kans te geven hier aan mee te werken en door het organiseren
van conferenties.
- /campaigns/gplv3/gplv3.html
+ /activities/gplv3/gplv3.html
diff --git a/campaigns/gplv3/rms-20070401.jpeg b/activities/gplv3/rms-20070401.jpeg
similarity index 100%
rename from campaigns/gplv3/rms-20070401.jpeg
rename to activities/gplv3/rms-20070401.jpeg
diff --git a/campaigns/gplv3/timeline.en.xhtml b/activities/gplv3/timeline.en.xhtml
similarity index 100%
rename from campaigns/gplv3/timeline.en.xhtml
rename to activities/gplv3/timeline.en.xhtml
diff --git a/campaigns/gplv3/tokyo-ciaran-transcript.en.xhtml b/activities/gplv3/tokyo-ciaran-transcript.en.xhtml
similarity index 99%
rename from campaigns/gplv3/tokyo-ciaran-transcript.en.xhtml
rename to activities/gplv3/tokyo-ciaran-transcript.en.xhtml
index 1562afcd91..280c25381c 100644
--- a/campaigns/gplv3/tokyo-ciaran-transcript.en.xhtml
+++ b/activities/gplv3/tokyo-ciaran-transcript.en.xhtml
@@ -278,7 +278,7 @@ clarification that has to be made about this is that GPLv3 does not
regulate DRM, it only regulates tivoisation, which is a specific case,
which Richard explained yesterday
(LINK),
+href="/activities/gplv3/tokyo-rms-transcript#tivoisation">LINK),
of DRM. This is also a mistake that myself and others have made when
explaining this. We often talk about DRM, when we should be talking
only about tivoisation.
@@ -538,7 +538,7 @@ arguments, for and against, about this issue.
So one thing that FSF Europe has been doing is to make transcripts of
the events like this event. The four previous events, all have
transcripts made from them
-(LINK), at least of
+(LINK), at least of
Richard's talk. Sometimes we have transcripts of Eben Moglen's talks,
and we have transcripts of Richard's talks from other events.
@@ -596,7 +596,7 @@ that it has been a well-organised conference.
To close on the important information. At the top of the screen is
Free Software Foundation Europe's GPLv3 page:
fsfe.org/campaigns/gplv3
+href="/activities/gplv3/">fsfe.org/activities/gplv3
and that's where you can find the transcripts that we've made and
links to audio and video recordings and a timeline and a general
explanation of what's happening with GPLv3.
diff --git a/campaigns/gplv3/tokyo-rms-transcript.el.xhtml b/activities/gplv3/tokyo-rms-transcript.el.xhtml
similarity index 100%
rename from campaigns/gplv3/tokyo-rms-transcript.el.xhtml
rename to activities/gplv3/tokyo-rms-transcript.el.xhtml
diff --git a/campaigns/gplv3/tokyo-rms-transcript.en.xhtml b/activities/gplv3/tokyo-rms-transcript.en.xhtml
similarity index 100%
rename from campaigns/gplv3/tokyo-rms-transcript.en.xhtml
rename to activities/gplv3/tokyo-rms-transcript.en.xhtml
diff --git a/campaigns/gplv3/topics.en.xhtml b/activities/gplv3/topics.en.xhtml
similarity index 100%
rename from campaigns/gplv3/topics.en.xhtml
rename to activities/gplv3/topics.en.xhtml
diff --git a/campaigns/gplv3/torino-rms-transcript.en.xhtml b/activities/gplv3/torino-rms-transcript.en.xhtml
similarity index 99%
rename from campaigns/gplv3/torino-rms-transcript.en.xhtml
rename to activities/gplv3/torino-rms-transcript.en.xhtml
index e673f9deea..5694642e82 100644
--- a/campaigns/gplv3/torino-rms-transcript.en.xhtml
+++ b/activities/gplv3/torino-rms-transcript.en.xhtml
@@ -31,7 +31,7 @@
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.
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 @@
diff --git a/campaigns/swpat/swpat.el.xhtml b/campaigns/swpat/swpat.el.xhtml
index 43c0ce53e7..3c2e7ecb8f 100644
--- a/campaigns/swpat/swpat.el.xhtml
+++ b/campaigns/swpat/swpat.el.xhtml
@@ -187,7 +187,7 @@
νομοθετικό έργο δεν έχει ακόμη ολοκληρωθεί και υπάρχουν πολλές άλλες
επιζήμιες πτυχές αυτής της οδηγίας οι οποίες πρέπει να διορθωθούν.
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
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
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.
diff --git a/campaigns/swpat/swpat.nl.xhtml b/campaigns/swpat/swpat.nl.xhtml
index b66d873913..cd587abc6e 100644
--- a/campaigns/swpat/swpat.nl.xhtml
+++ b/campaigns/swpat/swpat.nl.xhtml
@@ -159,7 +159,7 @@ uit dat patenten niet tot deze richtlijn zullen worden toegevoegd. Het wetgevend
gaat nog steeds door en er zijn veel andere schadelijke aspecten van deze richtlijn die gecorrigeerd
moeten worden.
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.