From 15b5e871473aaedcab107c7cba9e5c138c5a4063 Mon Sep 17 00:00:00 2001 From: coriordan Date: Thu, 13 Apr 2006 23:29:33 +0000 Subject: [PATCH] adding gplv3 logo to all languages (after conflict, I hope everything's ok) svn path=/trunk/; revision=6406 --- projects/gplv3/drm-and-gplv3.en.xhtml | 2 +- projects/gplv3/gplv3.ca.xhtml | 6 ++++ projects/gplv3/gplv3.en.xhtml | 9 ++++-- projects/gplv3/gplv3.es.xhtml | 6 ++++ projects/gplv3/gplv3.fr.xhtml | 6 ++++ projects/gplv3/gplv3.it.xhtml | 6 ++++ projects/gplv3/gplv3.nl.xhtml | 6 ++++ projects/gplv3/patents-and-gplv3.en.xhtml | 36 +++++++++++------------ 8 files changed, 55 insertions(+), 22 deletions(-) diff --git a/projects/gplv3/drm-and-gplv3.en.xhtml b/projects/gplv3/drm-and-gplv3.en.xhtml index 8700a95333..cf85748f18 100644 --- a/projects/gplv3/drm-and-gplv3.en.xhtml +++ b/projects/gplv3/drm-and-gplv3.en.xhtml @@ -13,7 +13,7 @@ PDF of this document.

For more information about GPLv3 and the consultation process, - see FSFE's GPlv3 project page.

+ see FSFE's GPLv3 project page.

This document shows the changes which are proposed for version three diff --git a/projects/gplv3/gplv3.ca.xhtml b/projects/gplv3/gplv3.ca.xhtml index 3c3e053154..5bb7fec1c6 100644 --- a/projects/gplv3/gplv3.ca.xhtml +++ b/projects/gplv3/gplv3.ca.xhtml @@ -9,6 +9,12 @@

GPLv3

+
+GPLv3 logo +
+

Amb aquesta pàgina web, la Free Software Foundation Europa vol ajudar en el procès de consultes de l'esborrany de la versió tres de diff --git a/projects/gplv3/gplv3.en.xhtml b/projects/gplv3/gplv3.en.xhtml index 6fd4cf2f79..70ffe2a322 100644 --- a/projects/gplv3/gplv3.en.xhtml +++ b/projects/gplv3/gplv3.en.xhtml @@ -171,11 +171,14 @@ at Italian GPLv3 Conference Richard Stallman's GPLv3 presentation and Q and A from Torino, March 18th 2006 -

  • FSF: The official GPLv3 wiki
  • - -
  • FSFE: DRM and GPLv3, a document +
  • FSFE: DRM and GPLv3, a document focussing only on the DRM-related changes in the first draft of GPLv3
  • +
  • FSFE: Patents and GPLv3, a document + focussing only on the patent-related changes in the first draft of GPLv3
  • + +
  • FSF: The official GPLv3 wiki
  • +
  • comparison of GPLv2 and GPLv3 (includes 2 charts showing the diff --git a/projects/gplv3/gplv3.es.xhtml b/projects/gplv3/gplv3.es.xhtml index c3ccd8e864..f9f5072a75 100644 --- a/projects/gplv3/gplv3.es.xhtml +++ b/projects/gplv3/gplv3.es.xhtml @@ -9,6 +9,12 @@

    GPLv3

    +
    +GPLv3 logo +
    +

    Con esta página, la Free Software Foundation Europa espera colaborar en el proceso de consulta para el borrador de la tercera diff --git a/projects/gplv3/gplv3.fr.xhtml b/projects/gplv3/gplv3.fr.xhtml index 1b384cbd9a..ecb46587ea 100644 --- a/projects/gplv3/gplv3.fr.xhtml +++ b/projects/gplv3/gplv3.fr.xhtml @@ -9,6 +9,12 @@

    GPLv3

    +
    +GPLv3 logo +
    +

    Avec cette page web, la Fondation pour le Logiciel Libre espère faciliter le processus de consultation du projet de la version trois de la Licence diff --git a/projects/gplv3/gplv3.it.xhtml b/projects/gplv3/gplv3.it.xhtml index eef07534f1..637f2c2749 100644 --- a/projects/gplv3/gplv3.it.xhtml +++ b/projects/gplv3/gplv3.it.xhtml @@ -9,6 +9,12 @@

    GPLv3

    +
    +GPLv3 logo +
    +

    Con questa pagina, la Free Software Foundation Europe vuole aiutare il processo di consultazione verso la stesura della versione tre della diff --git a/projects/gplv3/gplv3.nl.xhtml b/projects/gplv3/gplv3.nl.xhtml index cc3d6d8a34..b9e188ad2c 100644 --- a/projects/gplv3/gplv3.nl.xhtml +++ b/projects/gplv3/gplv3.nl.xhtml @@ -9,6 +9,12 @@

    GPLv3

    +
    +GPLv3 logo +
    +

    Met deze webpagina hoopt de Free Software Foundation Europa bij te dragen aan het consultatieproces voor het ontwerp van de GPLv3. Nieuwe informatie diff --git a/projects/gplv3/patents-and-gplv3.en.xhtml b/projects/gplv3/patents-and-gplv3.en.xhtml index 455bd4ca2e..08ffa6a821 100644 --- a/projects/gplv3/patents-and-gplv3.en.xhtml +++ b/projects/gplv3/patents-and-gplv3.en.xhtml @@ -30,28 +30,28 @@

  • 1 About this document
  • 2 Basic Permissions
  • 3 Compatibility with broader retaliation
  • 4 Explicit patent grant
  • 5 Liberty or Death
  • 6 Closing comments
  • @@ -96,7 +96,7 @@ on the Program. -

    2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    +

    2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-pat-ret

    @@ -130,7 +130,7 @@ equivalent modifications from being made by others. In this very narrow field we think retaliation may actually deter aggression and we wish therefore to include it.

    -

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

    +

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

    http://fsfeurope.org/projects/gplv3/torino-rms-transcript#limited-retal

    @@ -175,7 +175,7 @@ terms used here for those parts. -

    3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    +

    3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section7e

    @@ -205,7 +205,7 @@ with both ASL 2 and the Eclipse license, which are presently separated from compatibility with GPL version 2 by their patent retaliation terms and those alone.

    -

    3.2 Richard Stallman, speaking in Brussels, February 25th 2006

    +

    3.2 Richard Stallman, speaking in Brussels, February 25th 2006

    http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#compatibility

    @@ -247,7 +247,7 @@ code that was released with it. That is, retaliation for software patent lawsuits that are targeted very close to the same program that would target them.

    -

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

    +

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

    http://fsfeurope.org/projects/gplv3/torino-rms-transcript#compatibility-with-patent-retaliation

    @@ -327,7 +327,7 @@ patent infringement claims from which your license protects you. -

    4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    +

    4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section11

    @@ -402,7 +402,7 @@ distributees, and that we should demand of people that they affirmatively act to do what they can as part of a community to constrain the harm that patents are doing to that community at large.

    -

    4.2 Richard Stallman, speaking in Brussels, February 25th 2006

    +

    4.2 Richard Stallman, speaking in Brussels, February 25th 2006

    http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#patents

    @@ -448,7 +448,7 @@ patent licence for a certain patent. So we put in those words where that line should be drawn. But it's actually a pretty small change.

    -

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

    +

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

    http://fsfeurope.org/projects/gplv3/torino-rms-transcript#patent-grant

    @@ -570,7 +570,7 @@ of the free software distribution system. -

    5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    +

    5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006

    http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section12