FSFE/fsfe-website
25
31
Fork 92
Code Issues 66 Pull Requests 14 Wiki Activity

adding gplv3 logo to all languages (after conflict, I hope everything's ok)

Browse Source 
svn path=/trunk/; revision=6406
This commit is contained in:
coriordan
2006-04-13 23:29:33 +00:00
parent e94db4616f
commit 15b5e87147
8 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/gplv3/drm-and-gplv3.en.xhtml
View File

@@ -13,7 +13,7 @@
PDF of this document</a>.</p> PDF of this document</a>.</p>
<p>For more information about GPLv3 and the consultation process, <p>For more information about GPLv3 and the consultation process,
see <a href="gplv3.html">FSFE's GPlv3 project page</a>.</p> see <a href="gplv3.html">FSFE's GPLv3 project page</a>.</p>
<p>This document shows the changes which are proposed for version three <p>This document shows the changes which are proposed for version three

6
projects/gplv3/gplv3.ca.xhtml
View File

@@ -9,6 +9,12 @@
<h1>GPLv3</h1> <h1>GPLv3</h1>
<div style="float:right;">
<img SRC="GPLv3-logo-red.png"
ALT="GPLv3 logo" BORDER="0"
WIDTH="319" HEIGHT="130" />
</div>
<p> <p>
Amb aquesta pàgina web, la Free Software Foundation Europa vol ajudar 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 en el procès de consultes de l'esborrany de la versió tres de

9
projects/gplv3/gplv3.en.xhtml
View File

@@ -171,11 +171,14 @@ at <a href="gplv3-torino.en.html">Italian GPLv3 Conference</a>
Richard Stallman's GPLv3 presentation and Q and A from Torino, March Richard Stallman's GPLv3 presentation and Q and A from Torino, March
18th 2006</a></li> 18th 2006</a></li>
<li>FSF: <a href="http://gplv3.fsf.org/wiki">The official GPLv3 wiki</a></li> <li>FSFE: <a href="drm-and-gplv3.html"><emph>DRM</emph> and GPLv3</a>, a document
<li>FSFE: <a href="drm-and-gplv3.html">DRM and GPLv3</a>, a document
focussing only on the DRM-related changes in the first draft of GPLv3</li> focussing only on the DRM-related changes in the first draft of GPLv3</li>
<li>FSFE: <a href="patents-and-gplv3.html"><emph>Patents</emph> and GPLv3</a>, a document
focussing only on the patent-related changes in the first draft of GPLv3</li>
<li>FSF: <a href="http://gplv3.fsf.org/wiki">The official GPLv3 wiki</a></li>
<li><a <li><a
href="http://www.groklaw.net/articlebasic.php?story=20060118155841115"> href="http://www.groklaw.net/articlebasic.php?story=20060118155841115">
comparison of GPLv2 and GPLv3</a> (includes 2 charts showing the comparison of GPLv2 and GPLv3</a> (includes 2 charts showing the

6
projects/gplv3/gplv3.es.xhtml
View File

@@ -9,6 +9,12 @@
<h1>GPLv3</h1> <h1>GPLv3</h1>
<div style="float:right;">
<img SRC="GPLv3-logo-red.png"
ALT="GPLv3 logo" BORDER="0"
WIDTH="319" HEIGHT="130" />
</div>
<p> <p>
Con esta p<>gina, la Free Software Foundation Europa espera Con esta p<>gina, la Free Software Foundation Europa espera
colaborar en el proceso de consulta para el borrador de la tercera colaborar en el proceso de consulta para el borrador de la tercera

6
projects/gplv3/gplv3.fr.xhtml
View File

@@ -9,6 +9,12 @@
<h1>GPLv3</h1> <h1>GPLv3</h1>
<div style="float:right;">
<img SRC="GPLv3-logo-red.png"
ALT="GPLv3 logo" BORDER="0"
WIDTH="319" HEIGHT="130" />
</div>
<p> <p>
Avec cette page web, la Fondation pour le Logiciel Libre esp<73>re faciliter le Avec cette page web, la Fondation pour le Logiciel Libre esp<73>re faciliter le
processus de consultation du projet de la version trois de la Licence processus de consultation du projet de la version trois de la Licence

6
projects/gplv3/gplv3.it.xhtml
View File

@@ -9,6 +9,12 @@
<h1>GPLv3</h1> <h1>GPLv3</h1>
<div style="float:right;">
<img SRC="GPLv3-logo-red.png"
ALT="GPLv3 logo" BORDER="0"
WIDTH="319" HEIGHT="130" />
</div>
<p> <p>
Con questa pagina, la Free Software Foundation Europe vuole aiutare il Con questa pagina, la Free Software Foundation Europe vuole aiutare il
processo di consultazione verso la stesura della versione tre della processo di consultazione verso la stesura della versione tre della

6
projects/gplv3/gplv3.nl.xhtml
View File

@@ -9,6 +9,12 @@
<h1>GPLv3</h1> <h1>GPLv3</h1>
<div style="float:right;">
<img SRC="GPLv3-logo-red.png"
ALT="GPLv3 logo" BORDER="0"
WIDTH="319" HEIGHT="130" />
</div>
<p> <p>
Met deze webpagina hoopt de Free Software Foundation Europa bij te dragen Met deze webpagina hoopt de Free Software Foundation Europa bij te dragen
aan het consultatieproces voor het ontwerp van de GPLv3. Nieuwe informatie aan het consultatieproces voor het ontwerp van de GPLv3. Nieuwe informatie

36
projects/gplv3/patents-and-gplv3.en.xhtml
View File

@@ -30,28 +30,28 @@
<li><a name="toc_About-this-document" href="#About-this-document">1 About this document</a></li> <li><a name="toc_About-this-document" href="#About-this-document">1 About this document</a></li>
<li><a name="toc_Basic-Permissions" href="#Basic-Permissions">2 Basic Permissions</a> <li><a name="toc_Basic-Permissions" href="#Basic-Permissions">2 Basic Permissions</a>
<ul> <ul>
<li><a href="#Basic-Permissions">2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li> <li><a href="#Basic-Permissions-em0">2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li>
<li><a href="#Basic-Permissions">2.2 Richard Stallman, speaking in Turin, March 18th 2006</a></li> <li><a href="#Basic-Permissions-rms0">2.2 Richard Stallman, speaking in Turin, March 18th 2006</a></li>
</ul> </ul>
</li> </li>
<li><a name="toc_Compatibility-with-broader-retaliation" href="#Compatibility-with-broader-retaliation">3 Compatibility with broader retaliation</a> <li><a name="toc_Compatibility-with-broader-retaliation" href="#Compatibility-with-broader-retaliation">3 Compatibility with broader retaliation</a>
<ul> <ul>
<li><a href="#Compatibility-with-broader-retaliation">3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li> <li><a href="#Compatibility-with-broader-retaliation-em0">3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li>
<li><a href="#Compatibility-with-broader-retaliation">3.2 Richard Stallman, speaking in Brussels, February 25th 2006</a></li> <li><a href="#Compatibility-with-broader-retaliation-rms0">3.2 Richard Stallman, speaking in Brussels, February 25th 2006</a></li>
<li><a href="#Compatibility-with-broader-retaliation">3.3 Richard Stallman, speaking in Turin, March 18th 2006</a></li> <li><a href="#Compatibility-with-broader-retaliation-rms1">3.3 Richard Stallman, speaking in Turin, March 18th 2006</a></li>
</ul> </ul>
</li> </li>
<li><a name="toc_Explicit-patent-grant" href="#Explicit-patent-grant">4 Explicit patent grant</a> <li><a name="toc_Explicit-patent-grant" href="#Explicit-patent-grant">4 Explicit patent grant</a>
<ul> <ul>
<li><a href="#Explicit-patent-grant">4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li> <li><a href="#Explicit-patent-grant-em0">4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li>
<li><a href="#Explicit-patent-grant">4.2 Richard Stallman, speaking in Brussels, February 25th 2006</a></li> <li><a href="#Explicit-patent-grant-rms0">4.2 Richard Stallman, speaking in Brussels, February 25th 2006</a></li>
<li><a href="#Explicit-patent-grant">4.3 Richard Stallman, speaking in Turin, March 18th 2006</a></li> <li><a href="#Explicit-patent-grant-rms1">4.3 Richard Stallman, speaking in Turin, March 18th 2006</a></li>
</ul> </ul>
</li> </li>
<li><a name="toc_Liberty-or-Death" href="#Liberty-or-Death">5 Liberty or Death</a> <li><a name="toc_Liberty-or-Death" href="#Liberty-or-Death">5 Liberty or Death</a>
<ul> <ul>
<li><a href="#Liberty-or-Death">5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li> <li><a href="#Liberty-or-Death-em0">5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</a></li>
</ul> </ul>
</li> </li>
<li><a name="toc_Closing-comments" href="#Closing-comments">6 Closing comments</a></li> <li><a name="toc_Closing-comments" href="#Closing-comments">6 Closing comments</a></li>
@@ -96,7 +96,7 @@ on the Program.</td>
</table> </table>
<h3>2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3> <h3 id="Basic-Permissions-em0">2.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3>
<p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-pat-ret">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-pat-ret</a></p> <p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-pat-ret">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-pat-ret</a></p>
@@ -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 narrow field we think retaliation may actually deter aggression and we
wish therefore to include it.</p> wish therefore to include it.</p>
<h3>2.2 Richard Stallman, speaking in Turin, March 18th 2006</h3> <h3 id="Basic-Permissions-rms0">2.2 Richard Stallman, speaking in Turin, March 18th 2006</h3>
<p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#limited-retal">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#limited-retal</a></p> <p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#limited-retal">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#limited-retal</a></p>
@@ -175,7 +175,7 @@ terms used here for those parts. </td>
<h3>3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3> <h3 id="Compatibility-with-broader-retaliation-em0">3.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3>
<p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section7e">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section7e</a></p> <p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section7e">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section7e</a></p>
@@ -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 from compatibility with GPL version 2 by their patent retaliation
terms and those alone.</p> terms and those alone.</p>
<h3>3.2 Richard Stallman, speaking in Brussels, February 25th 2006</h3> <h3 id="Compatibility-with-broader-retaliation-rms0">3.2 Richard Stallman, speaking in Brussels, February 25th 2006</h3>
<p><a href="http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#compatibility">http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#compatibility</a></p> <p><a href="http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#compatibility">http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#compatibility</a></p>
@@ -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 patent lawsuits that are targeted very close to the same program that
would target them.</p> would target them.</p>
<h3>3.3 Richard Stallman, speaking in Turin, March 18th 2006</h3> <h3 id="Compatibility-with-broader-retaliation-rms1">3.3 Richard Stallman, speaking in Turin, March 18th 2006</h3>
<p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#compatibility-with-patent-retaliation">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#compatibility-with-patent-retaliation</a></p> <p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#compatibility-with-patent-retaliation">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#compatibility-with-patent-retaliation</a></p>
@@ -327,7 +327,7 @@ patent infringement claims from which your license protects you. </td>
</table> </table>
<h3>4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3> <h3 id="Explicit-patent-grant-em0">4.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3>
<p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section11">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section11</a></p> <p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section11">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section11</a></p>
@@ -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 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.</p> constrain the harm that patents are doing to that community at large.</p>
<h3>4.2 Richard Stallman, speaking in Brussels, February 25th 2006</h3> <h3 id="Explicit-patent-grant-rms0">4.2 Richard Stallman, speaking in Brussels, February 25th 2006</h3>
<p><a href="http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#patents">http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#patents</a></p> <p><a href="http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#patents">http://www.ifso.ie/documents/rms-gplv3-2006-02-25.html#patents</a></p>
@@ -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 where that line should be drawn. But it's actually a pretty small
change.</p> change.</p>
<h3>4.3 Richard Stallman, speaking in Turin, March 18th 2006</h3> <h3 id="Explicit-patent-grant-rms1">4.3 Richard Stallman, speaking in Turin, March 18th 2006</h3>
<p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#patent-grant">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#patent-grant</a></p> <p><a href="http://fsfeurope.org/projects/gplv3/torino-rms-transcript#patent-grant">http://fsfeurope.org/projects/gplv3/torino-rms-transcript#patent-grant</a></p>
@@ -570,7 +570,7 @@ of the free software distribution system.</td>
</tr> </tr>
</table> </table>
<h3>5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3> <h3 id="Liberty-or-Death-em0">5.1 Eben Moglen speaking at the GPLv3 launch, January 16th 2006</h3>
<p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section12">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section12</a></p> <p><a href="http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section12">http://www.ifso.ie/documents/gplv3-launch-2006-01-16.html#em-section12</a></p>