www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/common-distros.fr.html distros/po/c...


From: GNUN
Subject: www distros/common-distros.fr.html distros/po/c...
Date: Sat, 30 May 2015 21:28:28 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/05/30 21:28:28

Modified files:
        distros        : common-distros.fr.html 
        distros/po     : common-distros.fr-en.html 
        fun/jokes      : 10-kinds-of-people.fr.html any-key.fr.html 
                         deadbeef.fr.html 
        fun/jokes/po   : 10-kinds-of-people.fr-en.html 
                         any-key.fr-en.html deadbeef.fr-en.html 
        licenses       : license-list.fr.html 
        licenses/old-licenses: gpl-2.0-faq.fr.html 
        licenses/old-licenses/po: gpl-2.0-faq.fr-en.html 
        licenses/po    : license-list.fr-en.html 
        philosophy     : copyright-versus-community.fr.html 
                         eldred-amicus.fr.html 
                         free-hardware-designs.fr.html 
                         words-to-avoid.fr.html 
        philosophy/po  : copyright-versus-community.fr-en.html 
                         eldred-amicus.fr-en.html 
                         free-hardware-designs.fr-en.html 
                         words-to-avoid.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.fr.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr-en.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/10-kinds-of-people.fr.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/any-key.fr.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/deadbeef.fr.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.fr-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/any-key.fr-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/deadbeef.fr-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.fr.html?cvsroot=www&r1=1.204&r2=1.205
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/gpl-2.0-faq.fr.html?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.fr-en.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/copyright-versus-community.fr.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/eldred-amicus.fr.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-hardware-designs.fr.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.fr.html?cvsroot=www&r1=1.150&r2=1.151
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/copyright-versus-community.fr-en.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/eldred-amicus.fr-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-hardware-designs.fr-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr-en.html?cvsroot=www&r1=1.78&r2=1.79

Patches:
Index: distros/common-distros.fr.html
===================================================================
RCS file: /web/www/www/distros/common-distros.fr.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- distros/common-distros.fr.html      3 May 2015 08:57:21 -0000       1.65
+++ distros/common-distros.fr.html      30 May 2015 21:28:23 -0000      1.66
@@ -204,12 +204,6 @@
 micrologiciel.</p>
 
 <p>
-Les conditions d'utilisation de la marque Ubuntu interdisent la
-redistribution commerciale de copies exactes d'Ubuntu, refusant ainsi une
-liberté importante à l'utilisateur.
-</p>
-
-<p>
 Depuis octobre 2012, Ubuntu <a
 
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law";>envoie
 des données personnelles concernant les recherches de l'utilisateur</a> à un
@@ -225,6 +219,24 @@
 persiste à garder une fonctionnalité malveillante dans sa version d'un
 programme.</p>
 
+<p>Ubuntu <a
+href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>
+semble autoriser la redistribution commerciale de copies exactes avec les
+marques</a> ; la suppression des marques n'est exigée que pour les versions
+modifiées. C'est une règle acceptable. La même page, plus loin, fait une
+déclaration vague et de mauvais augure à propos des « brevets Ubuntu » 
sans
+donner assez de détails pour qu'on sache si cela constitue ou non une
+agression.</p>
+
+<p>Cette page répand la confusion en utilisant l'expression trompeuse « <a
+href="/philosophy/not-ipr.html"> droits de propriété intellectuelle</a> »,
+qui suppose à tort que le droit des marques, le droit des brevets et
+plusieurs autres appartiennent au même cadre conceptuel. Tout usage de cette
+expression est nocif, sans exception ; aussi, après avoir mentionné cet
+usage de la part de quelqu'un d'autre, faut-il toujours le
+rejeter. Cependant, c'est sans grande conséquence sur la qualification
+d'Ubuntu comme distribution GNU/Linux.</p>
+
 <h2>Quelques autres distributions</h2>
 
 <p>Ici, nous passons en revue quelques distributions non GNU/Linux bien connues
@@ -323,7 +335,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -341,9 +353,9 @@
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -355,7 +367,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/03 08:57:21 $
+$Date: 2015/05/30 21:28:23 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/common-distros.fr-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr-en.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- distros/po/common-distros.fr-en.html        3 May 2015 08:57:21 -0000       
1.49
+++ distros/po/common-distros.fr-en.html        30 May 2015 21:28:23 -0000      
1.50
@@ -192,11 +192,6 @@
 Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
 
 <p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
-</p>
-
-<p>
 As of October 2012, Ubuntu
 <a 
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law";>
 sends personal data about users' searches</a> to a server belonging to
@@ -210,6 +205,23 @@
 developer persists in keeping a malicious feature in its version of a
 program.</p>
 
+<p>Ubuntu <a 
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
+to permit commercial redistribution of exact copies with the
+trademarks</a>; removal of the trademarks is required only for
+modified versions.  That is an acceptable policy for trademarks.  The
+same page, further down, makes a vague and ominous statement about
+&ldquo;Ubuntu patents,&rdquo; without giving enough details to show
+whether that constitutes aggression or not.</p>
+
+<p>That page spreads confusion by using the misleading
+term <a href="/philosophy/not-ipr.html">&ldquo;intellectual property
+rights&rdquo;</a>, which falsely presumes that trademark law and patent law
+and several other laws belong in one single conceptual framework.  Use
+of that term is harmful, without exception, so after making a
+reference to someone else's use of the term, we should always reject
+it.  However, that is not a substantive issue about Ubuntu as a
+GNU/Linux distribution.</p>
+
 <h2>Some Other Distros</h2>
 
 <p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -292,7 +304,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -310,14 +322,14 @@
 <p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/03 08:57:21 $
+$Date: 2015/05/30 21:28:23 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fun/jokes/10-kinds-of-people.fr.html
===================================================================
RCS file: /web/www/www/fun/jokes/10-kinds-of-people.fr.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- fun/jokes/10-kinds-of-people.fr.html        20 May 2015 14:29:36 -0000      
1.21
+++ fun/jokes/10-kinds-of-people.fr.html        30 May 2015 21:28:24 -0000      
1.22
@@ -1,8 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/10-kinds-of-people.en.html" -->
+
 <!--#include virtual="/server/header.fr.html" -->
+<!-- Parent-Version: 1.78 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>10 sortes de gens dans le monde</title>
+<title>10 sortes de gens dans le monde - Projet GNU - Free Software 
Foundation</title>
 
 <!--#include virtual="/fun/jokes/po/10-kinds-of-people.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
@@ -16,32 +18,46 @@
 <p><a href="/fun/humor.html">D'autres blagues</a> dans la collection d'humour
 GNU.</p>
 
-<h4 id="Disclaimer">Renonciation au copyright</h4>
+<h3 id="Disclaimer">Renonciation au copyright</h3>
+
 <p>La première blague vous a été proposée par Colin Sharpe et la seconde 
par
 Fran&ccedil;ois Celliers.</p>
+
 <p>La <cite>Free Software Foundation</cite> ne revendique pas de copyright sur
 ces blagues.</p>
 
-
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.fr.html" -->
 <div id="footer">
-<p>
-Veuillez envoyer les requêtes concernant la FSF et GNU à <a
+<div class="unprintable">
+
+<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
-href="/contact/">d'autres moyens de contacter</a> la FSF.  
-<br />
-Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou
-suggestions à <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+href="/contact/">d'autres moyens de contacter</a> la FSF. Les liens
+orphelins et autres corrections ou suggestions peuvent être signalés à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Nous faisons le maximum pour proposer des traductions fidèles et de bonne
 qualité, mais nous ne sommes pas parfaits. Merci d'adresser vos commentaires
 sur cette page, ainsi que vos suggestions d'ordre général sur les
@@ -49,8 +65,32 @@
 &lt;address@hidden&gt;</a>.</p>
 <p>Pour tout renseignement sur la coordination et la soumission des
 traductions de nos pages web, reportez-vous au <a
-href="/server/standards/README.translations.html">guide de traduction</a>.
-</p>
+href="/server/standards/README.translations.html">guide de traduction</a>.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>Cette page peut être utilisée suivant les conditions de la licence <a
+rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -59,16 +99,14 @@
 Traduction : Aurélien Rivière, 2012<br />Révision : <a
 href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/20 14:29:36 $
+$Date: 2015/05/30 21:28:24 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fun/jokes/any-key.fr.html
===================================================================
RCS file: /web/www/www/fun/jokes/any-key.fr.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- fun/jokes/any-key.fr.html   20 May 2015 14:29:36 -0000      1.22
+++ fun/jokes/any-key.fr.html   30 May 2015 21:28:24 -0000      1.23
@@ -1,8 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/any-key.en.html" -->
+
 <!--#include virtual="/server/header.fr.html" -->
+<!-- Parent-Version: 1.78 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Où est &ldquo;n'importe quelle touche&rdquo; ?</title>
+<title>Où est « n'importe quelle touche » ? - Projet GNU - Free Software 
Foundation</title>
 
 <!--#include virtual="/fun/jokes/po/any-key.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
@@ -20,32 +22,44 @@
 - Où est « n'importe quelle touche » ?
 </pre>
 
-<h4 id="Disclaimer">Renonciation au copyright</h4>
+<h3 id="Disclaimer">Renonciation au copyright</h3>
 <p>La blague de cette page a été proposée par Thomas Henneke (merci, 
Thomas).</p>
 
 <p>La <cite>Free Software Foundation</cite> ne revendique pas de copyright sur
 cette blague.</p>
 
-
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.fr.html" -->
 <div id="footer">
-<p>
-Veuillez envoyer les requêtes concernant la FSF et GNU à <a
+<div class="unprintable">
+
+<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
-href="/contact/">d'autres moyens de contacter</a> la FSF.
-<br />
-Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou
-suggestions à <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+href="/contact/">d'autres moyens de contacter</a> la FSF. Les liens
+orphelins et autres corrections ou suggestions peuvent être signalés à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Nous faisons le maximum pour proposer des traductions fidèles et de bonne
 qualité, mais nous ne sommes pas parfaits. Merci d'adresser vos commentaires
 sur cette page, ainsi que vos suggestions d'ordre général sur les
@@ -53,8 +67,32 @@
 &lt;address@hidden&gt;</a>.</p>
 <p>Pour tout renseignement sur la coordination et la soumission des
 traductions de nos pages web, reportez-vous au <a
-href="/server/standards/README.translations.html">guide de traduction</a>.
-</p>
+href="/server/standards/README.translations.html">guide de traduction</a>.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>Cette page peut être utilisée suivant les conditions de la licence <a
+rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -63,16 +101,14 @@
 Traduction : Aurélien Rivière, 2012<br />Révision : <a
 href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/20 14:29:36 $
+$Date: 2015/05/30 21:28:24 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fun/jokes/deadbeef.fr.html
===================================================================
RCS file: /web/www/www/fun/jokes/deadbeef.fr.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- fun/jokes/deadbeef.fr.html  20 May 2015 14:29:36 -0000      1.24
+++ fun/jokes/deadbeef.fr.html  30 May 2015 21:28:24 -0000      1.25
@@ -1,12 +1,14 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/deadbeef.en.html" -->
+
 <!--#include virtual="/server/header.fr.html" -->
+<!-- Parent-Version: 1.78 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Dead Beef ??</title>
+<title>Dead Beef ? - Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/fun/jokes/po/deadbeef.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
-<h2>Dead Beef ??</h2>
+<h2>Dead Beef ?</h2>
 
 <blockquote>
 <pre>
@@ -29,15 +31,16 @@
 <p><a href="/fun/humor.html">D'autres blagues</a> dans la collection d'humour
 GNU.</p>
 
-<h4 id="Disclaimer">Renonciation au copyright</h4>
+<h3 id="Disclaimer">Renonciation au copyright</h3>
+
 <p>La blague figurant sur cette page provient des <a
 href="http://lists.gnu.org/";>archives de courriels du projet GNU</a>
 maintenues par la FSF.</p>
+
 <p>La <cite>Free Software Foundation</cite> ne revendique pas de copyright sur
 cette blague.</p>
 
-
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
 <hr /><b>Note de traduction</b><ol>
@@ -47,16 +50,33 @@
 href="#TransNote1-rev" class="nounderline">&#8593;</a></li></ol></div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.fr.html" -->
 <div id="footer">
+<div class="unprintable">
+
 <p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
-href="/contact/">d'autres moyens de contacter</a> la FSF.<br />
-Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou
-suggestions à <a
+href="/contact/">d'autres moyens de contacter</a> la FSF. Les liens
+orphelins et autres corrections ou suggestions peuvent être signalés à <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Nous faisons le maximum pour proposer des traductions fidèles et de bonne
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Nous faisons le maximum pour proposer des traductions fidèles et de bonne
 qualité, mais nous ne sommes pas parfaits. Merci d'adresser vos commentaires
 sur cette page, ainsi que vos suggestions d'ordre général sur les
 traductions, à <a href="mailto:address@hidden";>
@@ -64,6 +84,31 @@
 <p>Pour tout renseignement sur la coordination et la soumission des
 traductions de nos pages web, reportez-vous au <a
 href="/server/standards/README.translations.html">guide de traduction</a>.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>Cette page peut être utilisée suivant les conditions de la licence <a
+rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -72,16 +117,14 @@
 Traduction : Aurélien Rivière, 2012<br />Révision : <a
 href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/20 14:29:36 $
+$Date: 2015/05/30 21:28:24 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fun/jokes/po/10-kinds-of-people.fr-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.fr-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/po/10-kinds-of-people.fr-en.html  28 Feb 2013 19:09:10 -0000      
1.17
+++ fun/jokes/po/10-kinds-of-people.fr-en.html  30 May 2015 21:28:24 -0000      
1.18
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>10 Kinds of People in the World</title>
+<!-- Parent-Version: 1.78 -->
+<title>10 Kinds of People in the World
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/10-kinds-of-people.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
@@ -14,42 +16,74 @@
 <p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
 Collection.</p>
 
-<h4 id="Disclaimer">Disclaimer</h4>
+<h3 id="Disclaimer">Disclaimer</h3>
+
 <p>The first joke was submitted by Colin Sharpe and the second by
 Fran&ccedil;ois Celliers.</p>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
 
-</div>
+<p>The Free Software Foundation claims no copyright on this joke.</p>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.  There are
-also <a href="/contact/">other ways to
-contact</a> the FSF.  
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+<div class="unprintable">
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:09:10 $
+$Date: 2015/05/30 21:28:24 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fun/jokes/po/any-key.fr-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/any-key.fr-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/po/any-key.fr-en.html     28 Feb 2013 19:09:11 -0000      1.17
+++ fun/jokes/po/any-key.fr-en.html     30 May 2015 21:28:25 -0000      1.18
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Where is any-key?</title>
+<!-- Parent-Version: 1.78 -->
+<title>Where is any-key?
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/any-key.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Where is any-key???</h2>
@@ -16,43 +18,74 @@
 - Where is the any-key?
 </pre>
 
-<h4 id="Disclaimer">Disclaimer</h4>
+<h3 id="Disclaimer">Disclaimer</h3>
 <p>The joke on this page was submitted by Thomas Henneke (thanks,
 Thomas).</p>
 
 <p>The Free Software Foundation does not claim copyright for this
 joke.</p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.  There are
-also <a href="/contact/">other ways to contact</a> the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+<div class="unprintable">
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:09:11 $
+$Date: 2015/05/30 21:28:25 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: fun/jokes/po/deadbeef.fr-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/deadbeef.fr-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- fun/jokes/po/deadbeef.fr-en.html    28 Feb 2013 19:09:11 -0000      1.18
+++ fun/jokes/po/deadbeef.fr-en.html    30 May 2015 21:28:25 -0000      1.19
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>Dead Beef?</title>
+<!-- Parent-Version: 1.78 -->
+<title>Dead Beef?
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/deadbeef.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Dead Beef?</h2>
@@ -23,38 +25,75 @@
 <p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
 Collection.</p>
 
-<h4 id="Disclaimer">Disclaimer</h4>
+<h3 id="Disclaimer">Disclaimer</h3>
+
 <p>The joke on this page was obtained from the
 FSF's <a href="http://lists.gnu.org/";>email archives</a> of the GNU
 Project.</p>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
 
-</div>
+<p>The Free Software Foundation claims no copyright on this joke.</p>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>Please see the <a
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
 href="/server/standards/README.translations.html">Translations
 README</a> for information on coordinating and submitting translations
 of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:09:11 $
+$Date: 2015/05/30 21:28:25 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: licenses/license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -b -r1.204 -r1.205
--- licenses/license-list.fr.html       27 May 2015 19:57:16 -0000      1.204
+++ licenses/license-list.fr.html       30 May 2015 21:28:25 -0000      1.205
@@ -548,6 +548,15 @@
 ses exigences concernant l'attribution de paternité la rendent incompatible
 avec la GPLv2.</p></dd>
 
+<dt><a id="HPND"
+href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
+Historical Permission Notice and Disclaimer </a> <span
+class="anchor-reference-id"> (<a href="#HPND">#HPND</a>)</span></dt>
+<dd>
+<p>C'est une licence de logiciel libre, compatible avec la GPL. Elle est
+similaire à la licence de <a href="#Python1.6a2">Python 1.6a2 et versions
+antérieures</a>.</p></dd>
+
 
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
 Licence de la bibliothèque de fonctions standards iMatix</a> <span
@@ -2586,7 +2595,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/27 19:57:16 $
+$Date: 2015/05/30 21:28:25 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/gpl-2.0-faq.fr.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/gpl-2.0-faq.fr.html,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- licenses/old-licenses/gpl-2.0-faq.fr.html   22 May 2015 06:07:00 -0000      
1.75
+++ licenses/old-licenses/gpl-2.0-faq.fr.html   30 May 2015 21:28:25 -0000      
1.76
@@ -11,6 +11,7 @@
 <!--#include virtual="/server/banner.fr.html" -->
 <h2>Foire aux questions sur la GNU GPL version 2</h2>
 
+<!--#include virtual="/licenses/fsf-licensing.fr.html" -->
 <p>
 Cette page contient les réponses aux questions les plus courantes sur la
 licence publique générale GNU (GNU <abbr title="General Public
@@ -2668,13 +2669,14 @@
 href="/server/standards/README.translations.html">guide de traduction</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 Free Software
+Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -2686,7 +2688,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/22 06:07:00 $
+$Date: 2015/05/30 21:28:25 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/po/gpl-2.0-faq.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.fr-en.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses/old-licenses/po/gpl-2.0-faq.fr-en.html     18 Oct 2014 21:27:17 
-0000      1.49
+++ licenses/old-licenses/po/gpl-2.0-faq.fr-en.html     30 May 2015 21:28:26 
-0000      1.50
@@ -5,6 +5,7 @@
 <!--#include virtual="/licenses/old-licenses/po/gpl-2.0-faq.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Frequently Asked Questions about version 2 of the GNU GPL</h2>
+<!--#include virtual="/licenses/fsf-licensing.html" -->
 
 <p>
 This page contains answers to commonly asked questions about the GNU General
@@ -2456,17 +2457,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/10/18 21:27:17 $
+$Date: 2015/05/30 21:28:26 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr-en.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- licenses/po/license-list.fr-en.html 27 May 2015 19:57:17 -0000      1.87
+++ licenses/po/license-list.fr-en.html 30 May 2015 21:28:26 -0000      1.88
@@ -556,6 +556,13 @@
 some attribution requirements which make it incompatible with
 GPLv2.</p></dd>
 
+<dt><a id="HPND" 
href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
+       Historical Permission Notice and Disclaimer </a>
+    <span class="anchor-reference-id">
+       (<a href="#HPND">#HPND</a>)</span></dt>
+<dd>
+<p>This is a free software license and is GPL compatible. It is similar to the 
license of <a href="#Python1.6a2">Python 1.6a2 and earlier 
versions</a>.</p></dd>
+
 
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
        License of the iMatix Standard Function Library</a>
@@ -2564,7 +2571,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/27 19:57:17 $
+$Date: 2015/05/30 21:28:26 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/copyright-versus-community.fr.html
===================================================================
RCS file: /web/www/www/philosophy/copyright-versus-community.fr.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- philosophy/copyright-versus-community.fr.html       21 May 2015 07:17:36 
-0000      1.64
+++ philosophy/copyright-versus-community.fr.html       30 May 2015 21:28:26 
-0000      1.65
@@ -862,16 +862,16 @@
 qui continue à être un système de copyright, je propose deux autres
 méthodes.</p>
 
-<p>La première est l'argent public : distribuer directement la recette d'une
-taxe aux artistes. L'argent pourrait provenir d'une taxe spéciale, peut-être
-sur la connexion Internet, ou bien de l'impôt sur le revenu, parce que cela
-ne fera pas beaucoup au total, pas s'il est distribué de manière
-efficace. Le distribuer de manière à soutenir efficacement les arts
-signifie : pas en proportion linéaire de la popularité. Cela doit être fait
-sur le base de la popularité, parce que nous ne voulons pas que les
-bureaucrates aient le choix de décider quels artistes soutenir et lesquels
-ignorer. Mais « sur la base de la popularité » n'implique pas « en
-proportion linéaire ».</p>
+<p><a id="tax-money-for-artists">La première [fonctionne à l'aide de] 
l'argent
+public</a> : distribuer directement la recette d'une taxe aux
+artistes. L'argent pourrait provenir d'une taxe spéciale, peut-être sur la
+connexion Internet, ou bien de l'impôt sur le revenu, parce que cela ne fera
+pas beaucoup au total, pas s'il est distribué de manière efficace. Le
+distribuer de manière à soutenir efficacement les arts signifie : pas en
+proportion linéaire de la popularité. Cela doit être fait sur le base de la
+popularité, parce que nous ne voulons pas que les bureaucrates aient le
+choix de décider quels artistes soutenir et lesquels ignorer. Mais « sur la
+base de la popularité » n'implique pas « en proportion linéaire ».</p>
 
 <p>Ce que je propose est de mesurer la popularité des divers artistes, ce qui
 peut se faire à l'aide de sondages (par échantillons), auxquels personne
@@ -1079,7 +1079,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -1093,13 +1093,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2007, 2009, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2007, 2009, 2014, 2015 Free Software Foundation, 
Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -1111,7 +1111,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/21 07:17:36 $
+$Date: 2015/05/30 21:28:26 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/eldred-amicus.fr.html
===================================================================
RCS file: /web/www/www/philosophy/eldred-amicus.fr.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/eldred-amicus.fr.html    21 May 2015 07:17:55 -0000      1.48
+++ philosophy/eldred-amicus.fr.html    30 May 2015 21:28:26 -0000      1.49
@@ -1,8 +1,11 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/eldred-amicus.en.html" -->
+
 <!--#include virtual="/server/header.fr.html" -->
+<!-- Parent-Version: 1.78 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>Mémoire d'amicus curiae de la FSF, Eldred v. Ashcroft</title>
+<title>Mémoire d'amicus curiae de la FSF, Eldred v. Ashcroft - Projet GNU - 
Free
+Software Foundation</title>
 
 <meta name="Keywords" content="GNU, FSF, Free Software Foundation, GNU, Linux, 
liberté, logiciel, pouvoir,
 droits, copyright, extension, opinion, eldred, ashcroft, mickey mouse, loi,
@@ -12,12 +15,11 @@
 <!--#include virtual="/server/banner.fr.html" -->
 <h2>Mémoire d'amicus curiae de la FSF, Eldred v. Ashcroft</h2>
 
-<!--Converted with LaTeX2HTML 99.2beta6 (1.42)
+<!--
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
-  Jens Lippmann, Marek Rouchal, Martin Wilck and others
-* Converted to use the new template Apr 8, 2007  -->
+  Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
 <p>
 [ Ce texte est également disponible en anglais aux formats <a
 href="/philosophy/eldred-amicus.ps">Postscript</a> et <a
@@ -844,7 +846,7 @@
 </ul>
 
 
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
 <hr /><b>Notes de traduction</b><ol id="translator-notes-alpha">
@@ -889,20 +891,32 @@
 </ol></div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.fr.html" -->
 <div id="footer">
+<div class="unprintable">
 
-<p>
-Veuillez envoyer les requêtes concernant la FSF et GNU à <a
+<p>Veuillez envoyer les requêtes concernant la FSF et GNU à <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Il existe aussi <a
-href="/contact/">d'autres moyens de contacter</a> la FSF.
-<br />
-Veuillez indiquer (en anglais) les liens orphelins et autres corrections (ou
-suggestions) à <a
-href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+href="/contact/">d'autres moyens de contacter</a> la FSF. Les liens
+orphelins et autres corrections ou suggestions peuvent être signalés à <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Nous faisons le maximum pour proposer des traductions fidèles et de bonne
 qualité, mais nous ne sommes pas parfaits. Merci d'adresser vos commentaires
 sur cette page, ainsi que vos suggestions d'ordre général sur les
@@ -910,8 +924,31 @@
 &lt;address@hidden&gt;</a>.</p>
 <p>Pour tout renseignement sur la coordination et la soumission des
 traductions de nos pages web, reportez-vous au <a
-href="/server/standards/README.translations.html">guide de traduction</a>.
-</p>
+href="/server/standards/README.translations.html">guide de traduction</a>.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 2002 Eben Moglen</p>
+
+<p>La reproduction exacte et la distribution intégrale de cet article sont
+permises partout dans le monde, sans contrepartie financière, sur n'importe
+quel support d'archivage,  pourvu que le présent avis et l'avis de copyright
+soient conservés.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -920,16 +957,14 @@
 Traduction : Miluz<br />Révision : <a
 href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/21 07:17:55 $
+$Date: 2015/05/30 21:28:26 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/free-hardware-designs.fr.html
===================================================================
RCS file: /web/www/www/philosophy/free-hardware-designs.fr.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/free-hardware-designs.fr.html    17 May 2015 17:28:23 -0000      
1.4
+++ philosophy/free-hardware-designs.fr.html    30 May 2015 21:28:27 -0000      
1.5
@@ -60,8 +60,11 @@
 dont l'utilisateur peut se servir (c'est-à-dire à partir duquel il peut
 fabriquer le matériel) et qu'il peut copier et redistribuer, avec ou sans
 modification. Un tel plan doit offrir les quatre libertés, évoquées plus
-haut, qui définissent le logiciel libre. Le terme « matériel libre » 
désigne
-alors un matériel pour lequel un plan libre est disponible.</p>
+haut, qui définissent le logiciel libre.</p>
+
+<p>On peut alors qualifier un matériel pour lequel un plan libre est 
disponible
+de « matériel libre » ou (pour éviter tout malentendu) « matériel 
dont le
+plan est libre ».</p>
 
 <p>Lorsque les gens découvrent le concept de logiciel libre pour la première
 fois, ils l'assimilent souvent à « possibilité d'en obtenir gratuitement un
@@ -536,7 +539,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -554,9 +557,9 @@
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 international (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -569,7 +572,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/17 17:28:23 $
+$Date: 2015/05/30 21:28:27 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/words-to-avoid.fr.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.fr.html,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- philosophy/words-to-avoid.fr.html   17 May 2015 17:28:23 -0000      1.150
+++ philosophy/words-to-avoid.fr.html   30 May 2015 21:28:27 -0000      1.151
@@ -364,14 +364,17 @@
 Les verrous, de même que les serrures, ne sont pas nécessairement oppressifs
 ni mauvais. Vous en possédez probablement plusieurs, ainsi que leurs clés ou
 leurs codes ; vous les trouvez utiles ou gênants, mais de toute façon ils ne
-vous oppriment pas parce que vous êtes en mesure de les ouvrir et de les
-fermer.</p>
+vous oppriment pas parce que vous pouvez les ouvrir et les fermer. De même,
+nous constatons que <a
+href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>
+le chiffrement</a> constitue une protection inestimable de nos fichiers
+numériques. Cela aussi est une sorte de serrure sur laquelle vous exercez un
+contrôle.</p>
 <p>
 Un dispositif de DRM est comme un verrou (une serrure) placé(e) sur vous par
 une autre personne qui refuse de vous en donner la clé, autrement dit comme
-des <em>menottes</em>. Par conséquent l'expression qui les désigne de
-manière claire est « menottes numériques » et non « verrous (ou 
serrures)
-numériques ».</p>
+des <em>menottes</em>. Par conséquent la métaphore appropriée au DRM est
+« menottes numériques » et non « verrous (ou serrures) numériques 
».</p>
 <p>
 De nombreuses campagnes d'opposition aux DRM ont choisi la terminologie peu
 judicieuse de « verrous (ou serrures) numériques » ; pour rectifier les
@@ -979,7 +982,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -998,9 +1001,9 @@
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CC BY-ND 3.0 US)</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0 interntional (CC BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -1012,7 +1015,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/05/17 17:28:23 $
+$Date: 2015/05/30 21:28:27 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/copyright-versus-community.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/copyright-versus-community.fr-en.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- philosophy/po/copyright-versus-community.fr-en.html 12 Apr 2014 13:58:31 
-0000      1.42
+++ philosophy/po/copyright-versus-community.fr-en.html 30 May 2015 21:28:27 
-0000      1.43
@@ -810,7 +810,8 @@
 the partly reduced copyright system, which would continue to be a
 copyright system, I propose two other methods.</p>
 
-<p>One is taxes&mdash;distribute tax money directly to artists.  This
+<p><a id="tax-money-for-artists">One [works via]
+taxes</a>&mdash;distribute tax money directly to artists.  This
 could be a special tax, perhaps on Internet connectivity, or it could
 come from general revenue, because it won't be that much money in
 total, not if it's distributed in an efficient way.  To distribute it
@@ -982,7 +983,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -997,17 +998,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2007, 2009, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2007, 2009, 2014, 2015 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:58:31 $
+$Date: 2015/05/30 21:28:27 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/eldred-amicus.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/eldred-amicus.fr-en.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/eldred-amicus.fr-en.html      28 Feb 2013 19:12:27 -0000      
1.30
+++ philosophy/po/eldred-amicus.fr-en.html      30 May 2015 21:28:27 -0000      
1.31
@@ -1,5 +1,7 @@
 <!--#include virtual="/server/header.html" -->
-<title>FSF's Brief Amicus Curiae, Eldred v. Ashcroft</title>
+<!-- Parent-Version: 1.78 -->
+<title>FSF's Brief Amicus Curiae, Eldred v. Ashcroft
+- GNU Project - Free Software Foundation</title>
 
 <meta name="Keywords" content="GNU, FSF, Free Software Foundation, GNU, Linux, 
freedom, software, power, rights, copyright, extension, opinion, eldred, 
ashcroft, mickey mouse, law, disney, sonny bono, retroactive, perpetual" />
 <!--#include virtual="/philosophy/po/eldred-amicus.translist" -->
@@ -7,12 +9,11 @@
 
 <h2>FSF's Brief Amicus Curiae, Eldred v. Ashcroft</h2>
 
-<!--Converted with LaTeX2HTML 99.2beta6 (1.42)
+<!--
 original version by:  Nikos Drakos, CBLU, University of Leeds
 * revised and updated by:  Marcus Hennecke, Ross Moore, Herb Swan
 * with significant contributions from:
-  Jens Lippmann, Marek Rouchal, Martin Wilck and others
-* Converted to use the new template Apr 8, 2007  -->
+  Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
 
 <p>
 [ This file is also available
@@ -827,37 +828,68 @@
 monopoly of copying and distribution lasting decades.</li>
 </ul>
 
-</div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a> 
-the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2002 Eben Moglen</p>
+
+<p>Verbatim copying and distribution of this entire article are
+permitted worldwide, without royalty, in any medium, provided this
+notice, and the copyright notice, are preserved.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:12:27 $
+$Date: 2015/05/30 21:28:27 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/free-hardware-designs.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-hardware-designs.fr-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/free-hardware-designs.fr-en.html      12 May 2015 18:57:21 
-0000      1.1
+++ philosophy/po/free-hardware-designs.fr-en.html      30 May 2015 21:28:27 
-0000      1.2
@@ -50,8 +50,11 @@
 design</em>.  That's simple: it means a design that permits users to
 use the design (i.e., fabricate hardware from it) and to copy and
 redistribute it, with or without changes.  The design must provide the
-same four freedoms that define free software.  Then &ldquo;free
-hardware&rdquo; means hardware with an available free design.</p>
+same four freedoms that define free software.</p>
+
+<p>Then we can refer to hardware made from a free design as
+&ldquo;free hardware,&rdquo; or &ldquo;free design hardware&rdquo;
+to avoid possible misunderstanding.</p>
 
 <p>People first encountering the idea of free software often think it
 means you can get a copy gratis.  Many free programs are available for
@@ -475,7 +478,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -493,14 +496,14 @@
 <p>Copyright &copy; 2015 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/05/12 18:57:21 $
+$Date: 2015/05/30 21:28:27 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/words-to-avoid.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr-en.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- philosophy/po/words-to-avoid.fr-en.html     29 Mar 2015 09:57:13 -0000      
1.78
+++ philosophy/po/words-to-avoid.fr-en.html     30 May 2015 21:28:28 -0000      
1.79
@@ -421,12 +421,15 @@
 <p>
 Locks are not necessarily oppressive or bad.  You probably own several
 locks, and their keys or codes as well; you may find them useful or
-troublesome, but they don't oppress you, because you are in a position
-to open and close them.</p>
+troublesome, but they don't oppress you, because you can open and
+close them.  Likewise, we
+find <a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>encryption</a>
+invaluable for protecting our digital files.  That too is a kind
+of digital lock that you have control over.</p>
 <p>
 DRM is like a lock placed on you by someone else, who refuses to give
 you the key&mdash;in other words, like <em>handcuffs</em>.  Therefore,
-the clear way to refer to them is &ldquo;digital handcuffs,&rdquo; not
+the proper metaphor for DRM is &ldquo;digital handcuffs,&rdquo; not
 &ldquo;digital locks.&rdquo;</p>
 <p>
 A number of opposition campaigns have chosen the unwise term
@@ -1003,7 +1006,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -1022,14 +1025,14 @@
 2008, 2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/03/29 09:57:13 $
+$Date: 2015/05/30 21:28:28 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]