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 έγινε ένα εργαλείο για την απόκτηση ωφ
  • Δείτε την ιστοσελίδα του + href="/activities/gplv3/europe-gplv3-conference.html">ιστοσελίδα του συνεδρίου για καταγραφές, κείμενα και περιλήψεις άλλων παρουσιάσεων
  • Μπορείτε να υποστηρίξετε την εργασία του 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.

    @@ -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.
  • See the conference + href="/activities/gplv3/europe-gplv3-conference.html">conference webpage for recordings, transcripts, and summaries of 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.

    @@ -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.
  • Bekijk onze - conferentiepagina + conferentiepagina voor opnamen, afschriften en samenvattingen van de andere presentaties.
  • 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.

    @@ -50,8 +50,8 @@

    Video and audio recordings are available:

    The speech was made in English.

    @@ -1515,7 +1515,7 @@ can guess where.
  • See the conference + href="/activities/gplv3/europe-gplv3-conference.html">conference webpage for recordings, transcripts, and summaries of 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 @@

    Georg Greve: opening introduction

    Points covered by Georg Greve:

    @@ -123,8 +123,8 @@

    Richard Stallman: Overview of GPL v3 Changes

    A complete transcript of @@ -146,8 +146,8 @@

    Eben Moglen: The wording of the changes

    A complete transcript of @@ -163,8 +163,8 @@

  • Stefano Maffulli, FSFE's Fellowship
  • @@ -331,15 +331,15 @@

    Pablo Machón: GPLv3 and the European software patent struggle

    @@ -352,8 +352,8 @@ @@ -367,8 +367,8 @@ @@ -396,7 +396,7 @@
  • See the conference + href="/activities/gplv3/europe-gplv3-conference.html">conference webpage for more information about the conference
  • 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 @@

    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 @@

    Georg Greve: discorso di apertura

    Punti toccati da Georg Greve:

    @@ -118,8 +118,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship
  • Richard Stallman: Sommario dei cambiamenti della GPLv3

    Una trascrizione completa dell'intervento fatto @@ -141,8 +141,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship

    Eben Moglen: La formulazione dei cambiamenti

    Una trascrizione completa dell'intervento @@ -158,8 +158,8 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship

  • Stefano Maffulli, La Fellowship di FSFE
  • @@ -309,15 +309,15 @@ e molto a livello nazionale - lavoro legale, di business e la Fellowship

    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
  • La pagina della conferenza + href="/activities/gplv3/europe-gplv3-conference.html">pagina della conferenza contiene maggiori informazioni riguardanti l'evento
  • 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 @@

    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 @@

    Georg Greve: Inleidende toespraak

    Onderwerpen waarover Georg Greve @@ -123,8 +123,8 @@

    Richard Stallman: Overzicht van de veranderingen in de GPLv3

    Een volledig afschrift van @@ -146,8 +146,8 @@

    Eben Moglen: De formulering van de wijzigingen

    Een volledig afschrift van @@ -163,8 +163,8 @@

  • Stefano Maffulli, FSFE's Fellowship
  • @@ -332,15 +332,15 @@

    Pablo Machón: GPLv3 en de strijd tegen Europese softwarepatenten

    @@ -353,8 +353,8 @@ @@ -368,8 +368,8 @@ @@ -394,7 +394,7 @@ @@ -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.

    @@ -155,8 +155,8 @@ anderen GPLv3 Konferenzen.

    Pablo Machón: GPLv3 und das Ringen um Softwarepatente in Europa

    @@ -164,8 +164,8 @@ anderen GPLv3 Konferenzen.

    @@ -180,8 +180,8 @@ anderen GPLv3 Konferenzen.

    @@ -196,8 +196,8 @@ anderen GPLv3 Konferenzen.

    diff --git a/campaigns/gplv3/europe-gplv3-conference.en.xhtml b/activities/gplv3/europe-gplv3-conference.en.xhtml similarity index 83% rename from campaigns/gplv3/europe-gplv3-conference.en.xhtml rename to activities/gplv3/europe-gplv3-conference.en.xhtml index 6589382a0a..e1672eef7e 100644 --- a/campaigns/gplv3/europe-gplv3-conference.en.xhtml +++ b/activities/gplv3/europe-gplv3-conference.en.xhtml @@ -103,15 +103,15 @@

    Georg Greve: opening introduction

    Richard Stallman: Overview of GPL v3 Changes

    Ciarán O'Riordan: The public consultation process

    @@ -124,8 +124,8 @@

    Eben Moglen: The wording of the changes

    @@ -142,8 +142,8 @@ @@ -158,16 +158,16 @@

    Pablo Machón: GPLv3 and the European software patent struggle

    @@ -181,8 +181,8 @@ @@ -197,8 +197,8 @@ 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

    Georg Greve: presentación de apertura

    Richard Stallman: Los principales cambios en la GPL v3

    Ciarán O'Riordan: El proceso de consulta pública

    @@ -127,8 +127,8 @@ encontrar nuestra lista de transcripciones sobre la @@ -145,8 +145,8 @@ encontrar nuestra lista de transcripciones sobre la @@ -161,16 +161,16 @@ encontrar nuestra lista de transcripciones sobre la

    Pablo Machón: La GPLv3 y las patentes de software en Europe

    @@ -184,8 +184,8 @@ encontrar nuestra lista de transcripciones sobre la @@ -200,8 +200,8 @@ 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

    Georg Greve : ouverture de la conférence

    Richard Stallman : Aperçu des changements apportés par la GPL v3

    Ciarán O'Riordan : Le processus de consultation publique

    @@ -93,8 +93,8 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne

    Eben Moglen : Les termes légaux des changements

    @@ -111,8 +111,8 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne @@ -127,16 +127,16 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne

    Pablo Machón : La GPLv3 et la bataille contre les brevets logiciels européens.

    @@ -150,8 +150,8 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne @@ -166,8 +166,8 @@ Nous vous encourageons à redistribuer ces documents. La licence qui accompagne diff --git a/campaigns/gplv3/europe-gplv3-conference.it.xhtml b/activities/gplv3/europe-gplv3-conference.it.xhtml similarity index 83% rename from campaigns/gplv3/europe-gplv3-conference.it.xhtml rename to activities/gplv3/europe-gplv3-conference.it.xhtml index 946ab816ab..bb8c30bf3f 100644 --- a/campaigns/gplv3/europe-gplv3-conference.it.xhtml +++ b/activities/gplv3/europe-gplv3-conference.it.xhtml @@ -79,15 +79,15 @@

    Georg Greve: discorso di apertura

    Richard Stallman: Sommario dei cambiamenti della GPL v3

    Ciarán O'Riordan: Il processo di consultazione pubblica

    @@ -100,8 +100,8 @@

    Eben Moglen: La formulazione dei cambiamenti

    @@ -118,8 +118,8 @@ @@ -134,16 +134,16 @@

    Pablo Machón: La GPLv3 e la lotta contro i brevetti software in Europa

    @@ -157,8 +157,8 @@ @@ -173,8 +173,8 @@ diff --git a/campaigns/gplv3/europe-gplv3-conference.nl.xhtml b/activities/gplv3/europe-gplv3-conference.nl.xhtml similarity index 83% rename from campaigns/gplv3/europe-gplv3-conference.nl.xhtml rename to activities/gplv3/europe-gplv3-conference.nl.xhtml index 117736e38e..698d5c9e40 100644 --- a/campaigns/gplv3/europe-gplv3-conference.nl.xhtml +++ b/activities/gplv3/europe-gplv3-conference.nl.xhtml @@ -103,15 +103,15 @@

    Georg Greve: Inleidende toespraak

    Richard Stallman: Overzicht van de veranderingen in de GPLv3

    Ciarán O'Riordan: Het publieke consultatieproces

    @@ -124,8 +124,8 @@

    Eben Moglen: De formulering van de wijzigingen

    @@ -142,8 +142,8 @@ @@ -158,16 +158,16 @@

    Pablo Machón: GPLv3 en de strijd tegen Europese softwarepatenten

    @@ -181,8 +181,8 @@ @@ -197,8 +197,8 @@ diff --git a/campaigns/gplv3/europe-gplv3-conference.pt.xhtml b/activities/gplv3/europe-gplv3-conference.pt.xhtml similarity index 83% rename from campaigns/gplv3/europe-gplv3-conference.pt.xhtml rename to activities/gplv3/europe-gplv3-conference.pt.xhtml index 623f7ef2f3..4fc02b8ddb 100644 --- a/campaigns/gplv3/europe-gplv3-conference.pt.xhtml +++ b/activities/gplv3/europe-gplv3-conference.pt.xhtml @@ -103,15 +103,15 @@

    Georg Greve: sessão de abertura

    Richard Stallman: Vista geral das Mudanças resultantes da GPL v3

    Ciarán O'Riordan: O processo de consulta pública

    @@ -124,8 +124,8 @@

    Eben Moglen: A expressão das mudanças

    @@ -142,8 +142,8 @@ @@ -158,16 +158,16 @@

    Pablo Machón: GPLv3 e as batalhas contra as patentes de software na Europa

    @@ -181,8 +181,8 @@ @@ -197,8 +197,8 @@ 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

    -

    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.

    3.3 Richard Stallman, speaking in Turin, March 18th 2006

    -

    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.

    4.3 Richard Stallman, speaking in Turin, March 18th 2006

    -

    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 @@ 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 @@

    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 @@

    - Lesen Sie mehr... + Lesen Sie mehr...

    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: +

  • 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.

  • diff --git a/campaigns/swpat/swpat.it.xhtml b/campaigns/swpat/swpat.it.xhtml index 02445ff588..f435b3ac39 100644 --- a/campaigns/swpat/swpat.it.xhtml +++ b/campaigns/swpat/swpat.it.xhtml @@ -69,7 +69,7 @@

    - Maggiori informazioni... + Maggiori informazioni...

    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 +

  • 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.

    - /campaigns/gplv3/gplv3-torino.html + /activities/gplv3/gplv3-torino.html diff --git a/events/2006/event-20060318.it.xml b/events/2006/event-20060318.it.xml index 4d819abc31..9abba5482b 100644 --- a/events/2006/event-20060318.it.xml +++ b/events/2006/event-20060318.it.xml @@ -14,7 +14,7 @@ Software Libero più usata al mondo.

    - /campaigns/gplv3/gplv3-torino.html + /activities/gplv3/gplv3-torino.html diff --git a/events/2006/event-20060318.nl.xml b/events/2006/event-20060318.nl.xml index 4193c31438..b5affb1af5 100644 --- a/events/2006/event-20060318.nl.xml +++ b/events/2006/event-20060318.nl.xml @@ -14,7 +14,7 @@ licentie voor Vrije Software, die over heel de wereld de vrijheid van minstens 100 miljoen gebruikers beschermt.

    - /campaigns/gplv3/gplv3-torino.html + /activities/gplv3/gplv3-torino.html diff --git a/events/2006/event-20060622-01.ca.xml b/events/2006/event-20060622-01.ca.xml index 44defc4050..b9d35887bf 100644 --- a/events/2006/event-20060622-01.ca.xml +++ b/events/2006/event-20060622-01.ca.xml @@ -17,6 +17,6 @@ d'altri.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2006/event-20060622-01.da.xml b/events/2006/event-20060622-01.da.xml index 514bc3973d..6365ac767a 100644 --- a/events/2006/event-20060622-01.da.xml +++ b/events/2006/event-20060622-01.da.xml @@ -16,6 +16,6 @@ de foreslåede ændringer til andre.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2006/event-20060622-01.de.xml b/events/2006/event-20060622-01.de.xml index 1f33a727e5..5420204897 100644 --- a/events/2006/event-20060622-01.de.xml +++ b/events/2006/event-20060622-01.de.xml @@ -17,6 +17,6 @@ geben um die vorgeschlagenen Änderungen anderen zu erklären.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2006/event-20060622-01.en.xml b/events/2006/event-20060622-01.en.xml index 902587335e..2391d26a69 100644 --- a/events/2006/event-20060622-01.en.xml +++ b/events/2006/event-20060622-01.en.xml @@ -17,6 +17,6 @@ others.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2006/event-20060622-01.it.xml b/events/2006/event-20060622-01.it.xml index cdc852c816..40d0af555a 100644 --- a/events/2006/event-20060622-01.it.xml +++ b/events/2006/event-20060622-01.it.xml @@ -10,6 +10,6 @@ In questa conferenza internazionale di due giorni, gli esperti della GPLv3 e di licenze per Software Libero presenteranno i cambiamenti proposti alla licenza principale del Software Libero, la GNU General Public License. Gli esperti risponderanno anche alle domande del pubblico e verranno organizzate discussioni su argomenti d'attualità. Gli obiettivi finali sono quelli di diffondere consapevolezza sulla GPLv3 e di dare ai partecipanti le informazioni necessarie a spiegare ad altre persone i cambiamenti proposti.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2006/event-20060622-01.nl.xml b/events/2006/event-20060622-01.nl.xml index fe663b15df..2a83561d57 100644 --- a/events/2006/event-20060622-01.nl.xml +++ b/events/2006/event-20060622-01.nl.xml @@ -16,6 +16,6 @@ ook aan anderen kunnen uitleggen.

    - /campaigns/gplv3/europe-gplv3-conference.html + /activities/gplv3/europe-gplv3-conference.html diff --git a/events/2007/event-20070401-01.el.xml b/events/2007/event-20070401-01.el.xml index 8f7f635fd2..a93c3f4b64 100644 --- a/events/2007/event-20070401-01.el.xml +++ b/events/2007/event-20070401-01.el.xml @@ -17,6 +17,6 @@ επίσης τροποποιηθεί σημαντικά.

    - /campaigns/gplv3/brussels-rms-transcript.html + /activities/gplv3/brussels-rms-transcript.html diff --git a/events/2007/event-20070401-01.en.xml b/events/2007/event-20070401-01.en.xml index f501b75d19..12279e37d8 100644 --- a/events/2007/event-20070401-01.en.xml +++ b/events/2007/event-20070401-01.en.xml @@ -17,6 +17,6 @@ have also been altered significantly.

    - /campaigns/gplv3/brussels-rms-transcript.html + /activities/gplv3/brussels-rms-transcript.html diff --git a/news/2006/news-20060727-01.ca.xml b/news/2006/news-20060727-01.ca.xml index a4dd21ee8c..c4c5c7cb79 100644 --- a/news/2006/news-20060727-01.ca.xml +++ b/news/2006/news-20060727-01.ca.xml @@ -12,7 +12,7 @@ GPLv3 està ja en línia - responent a les peticions de públic sobre patents, G de Restriccions i enfortiment global entre d'altres coses.

    - https://fsfe.org/campaigns/gplv3 + https://fsfe.org/activities/gplv3 diff --git a/news/2006/news-20060727-01.da.xml b/news/2006/news-20060727-01.da.xml index 1f7c23fd85..934deb612e 100644 --- a/news/2006/news-20060727-01.da.xml +++ b/news/2006/news-20060727-01.da.xml @@ -13,7 +13,7 @@ eksigibilitet, blandt andre ting.

    - https://fsfe.org/campaigns/gplv3 + https://fsfe.org/activities/gplv3 diff --git a/news/2006/news-20060727-01.en.xml b/news/2006/news-20060727-01.en.xml index 9bfb178737..81d3d3690d 100644 --- a/news/2006/news-20060727-01.en.xml +++ b/news/2006/news-20060727-01.en.xml @@ -12,6 +12,6 @@ GPLv3 is now online - responding to public input about patents, Digital Restrictions Management, and global enforceability among other things.

    - https://fsfe.org/campaigns/gplv3 + https://fsfe.org/activities/gplv3 diff --git a/news/2006/news-20060727-01.it.xml b/news/2006/news-20060727-01.it.xml index 3d27078504..7f476c2627 100644 --- a/news/2006/news-20060727-01.it.xml +++ b/news/2006/news-20060727-01.it.xml @@ -10,7 +10,7 @@ Dopo sei mesi di consultazione pubblica, è disponibile la seconda bozza di discussione pubblica della GPLv3, che risponde alle questioni sollevate pubblicamente sui brevetti, il Digital Restrictions Management, e l'applicabilità globale, tra le altre cose.

    - https://fsfe.org/campaigns/gplv3 + https://fsfe.org/activities/gplv3 diff --git a/news/2006/news-20060727-01.nl.xml b/news/2006/news-20060727-01.nl.xml index d736a2433f..01102de0e9 100644 --- a/news/2006/news-20060727-01.nl.xml +++ b/news/2006/news-20060727-01.nl.xml @@ -12,7 +12,7 @@ onder andere een antwoord te geven op de commentaren over patenten, Digital Restrictions Management en de wereldwijde afdwingbaarheid.

    - https://fsfe.org/campaigns/gplv3 + https://fsfe.org/activities/gplv3 diff --git a/news/2007/news-20070630-01.el.xhtml b/news/2007/news-20070630-01.el.xhtml index c74fcc9996..d208f2bcc4 100644 --- a/news/2007/news-20070630-01.el.xhtml +++ b/news/2007/news-20070630-01.el.xhtml @@ -205,7 +205,7 @@ FSFE ξεκίνησε την πρωτοβουλία DRM.info τον Οκτώβρ

    Η αναθεώρηση της Γενικής Δημόσιας Άδειας GNU GPL στην έκδοση 3 ήταν μία από τις μεγαλύτερες προκλήσεις των τελευταίων δύο ετών. Το Ευρωπαϊκό Ίδρυμα Ελεύθερου Λογισμικού (FSFE) ήταν -ένας από τους κύριους συντελεστές +ένας από τους κύριους συντελεστές της προσπάθειας να φέρει τη διαφάνεια στη διαδικασία και στις λεπτομέρειες της αναθεώρησης της Γενικής Δημόσιας Άδειας GNU GPL μέσα από τη συμμετοχή στα διεθνή συνέδρια για την GPLv3 στη Βοστώνη, Πόρτο Αλέγκρε και Τόκιο, καθώς επίσης @@ -213,7 +213,7 @@ GNU GPL στην έκδοση 3 ήταν μία από τις μεγαλύτ

    Ο Ciaran O'Riordan του FSFE επίσης συνέβαλλε αρκετά στη διαφάνεια των διαξιφισμών μέσα από δικά του -κείμενα +κείμενα σημαντικών ομιλιών οι οποίες βοήθησαν πολλές χιλιάδες κόσμου να κατανοήσει καλύτερα την GPLv3.

    diff --git a/news/2007/news-20070630-01.en.xhtml b/news/2007/news-20070630-01.en.xhtml index e1fae8057c..4eb33f4f2d 100644 --- a/news/2007/news-20070630-01.en.xhtml +++ b/news/2007/news-20070630-01.en.xhtml @@ -195,7 +195,7 @@ variety of reasons, so the platform is undergoing reconsideration.

    The revision of the GNU General Public License (GPL) to version 3 was one of the most challenging activities throughout the past two years. Free Software Foundation -Europe (FSFE) was one of +Europe (FSFE) was one of the main contributors to the effort of bringing transparency into the process and details of the revision of the GNU General Public License (GPL) through participation in the international conferences @@ -205,7 +205,7 @@ the international conference on GPLv3 in Barcelona.

    FSFE's Ciaran O'Riordan also contributed much to the transparency of the debate through his transcripts +href="/activities/gplv3/#transcripts">transcripts of important speeches which have helped many thousand people understand GPLv3 better.

    diff --git a/news/2007/news-20070630-01.nl.xhtml b/news/2007/news-20070630-01.nl.xhtml index 0a0bda50a6..b21df395c5 100644 --- a/news/2007/news-20070630-01.nl.xhtml +++ b/news/2007/news-20070630-01.nl.xhtml @@ -228,7 +228,7 @@ De herziening van de GNU General Public License (GPL) naar versie 3 was een van de meest uitdagende activiteiten van de afgelopen twee jaar. De Free Software Foundation Europe leverde een grote bijdrage om het proces transparant te maken. We + href="/activities/gplv3">het proces transparant te maken. We volgden de opeenvolging van herzieningen van de GNU General Public License (GPL) door deel te nemen aan de verschillende internationale conferenties over de GPLv3 in Boston, Porto Alegre en Tokyo. We organiseerden ook onze eigen internationale conferentie over de @@ -237,7 +237,7 @@

    Ook de bijdragen van Ciaren O'Riordan, medewerker van de FSFE, hebben het debat - verduidelijkt. Vooral zijn + verduidelijkt. Vooral zijn afschriften van enkele belangrijke toespraken hebben duizenden mensen geholpen om de GPLv3 beter te begrijpen.

    diff --git a/news/2007/news-20070705-01.de.xml b/news/2007/news-20070705-01.de.xml index 512bdb6838..c88c036cf8 100644 --- a/news/2007/news-20070705-01.de.xml +++ b/news/2007/news-20070705-01.de.xml @@ -14,7 +14,7 @@ Computern installieren und anpassen können.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/news/2007/news-20070705-01.el.xml b/news/2007/news-20070705-01.el.xml index 8767fb07e3..0e13e7a1c2 100644 --- a/news/2007/news-20070705-01.el.xml +++ b/news/2007/news-20070705-01.el.xml @@ -14,7 +14,7 @@ εγκαταστήσουν μετατρέψιμο λογισμικό στους υπολογιστές τους.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/news/2007/news-20070705-01.en.xml b/news/2007/news-20070705-01.en.xml index 9bc6de8ba3..8cd5b72355 100644 --- a/news/2007/news-20070705-01.en.xml +++ b/news/2007/news-20070705-01.en.xml @@ -14,6 +14,6 @@ does a better job of ensuring that Free Software users can install modified software on their computers.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/news/2007/news-20070705-01.fr.xml b/news/2007/news-20070705-01.fr.xml index 93406a111c..316279549e 100644 --- a/news/2007/news-20070705-01.fr.xml +++ b/news/2007/news-20070705-01.fr.xml @@ -10,7 +10,7 @@ La version 3 de la licence GNU GPL vient d'être publiée, après dix-huits mois de consultations publiques et de discussion. Cette troisième version apporte des améliorations sur l'internationalisation, une meilleure protection contre les brevets logiciels, et s'assure plus efficacement que les utilisateurs de Logiciels Libres puissent installer des versions modifiées des logiciels sur leurs ordinateurs.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/news/2007/news-20070705-01.it.xml b/news/2007/news-20070705-01.it.xml index be1eec49d8..3b10bbc8fb 100644 --- a/news/2007/news-20070705-01.it.xml +++ b/news/2007/news-20070705-01.it.xml @@ -15,7 +15,7 @@ gli utenti di Software Libero possano installare software modificato nei loro computer.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/news/2007/news-20070705-01.nl.xml b/news/2007/news-20070705-01.nl.xml index 87902d9b6c..2840f2bb4d 100644 --- a/news/2007/news-20070705-01.nl.xml +++ b/news/2007/news-20070705-01.nl.xml @@ -13,7 +13,7 @@ dat ze ook aangepaste software op hun computers kunnen installeren en gebruiken.

    - https://fsfe.org/campaigns/gplv3/ + https://fsfe.org/activities/gplv3/ diff --git a/tools/translation-ignore.txt b/tools/translation-ignore.txt index 918450c3d6..117dfeb320 100644 --- a/tools/translation-ignore.txt +++ b/tools/translation-ignore.txt @@ -83,7 +83,7 @@ campaigns/bgw activities/eucd activities/policy/fp6 - campaigns/gplv3 + activities/gplv3 campaigns/mankind activities/ms-vs-eu campaigns/self