[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-list.fr.html po/license-li...
From: |
GNUN |
Subject: |
www/licenses license-list.fr.html po/license-li... |
Date: |
Thu, 29 Jan 2015 13:30:19 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/01/29 13:30:17
Modified files:
licenses : license-list.fr.html
licenses/po : license-list.fr-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.fr.html?cvsroot=www&r1=1.194&r2=1.195
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.78&r2=1.79
Patches:
Index: license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- license-list.fr.html 7 Dec 2014 12:30:01 -0000 1.194
+++ license-list.fr.html 29 Jan 2015 13:30:14 -0000 1.195
@@ -2290,16 +2290,14 @@
<dl class="orange">
-<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode">
-Licence Creative Commons paternité 2.0</a>, aussi appelée CC BY [<a
-href="http://creativecommons.org/licenses/by/2.0/deed.fr">résumé en
+<dt><a id="ccby" href="http://creativecommons.org/licenses/by/4.0/legalcode">
+Licence Creative Commons paternité 4.0</a>, aussi appelée CC BY [<a
+href="http://creativecommons.org/licenses/by/4.0/deed.fr">résumé en
français</a>] <span class="anchor-reference-id">(<a
href="#ccby">#ccby</a>)</span></dt>
<dd>
<p>C'est une licence libre sans copyleft qui convient aux Åuvres artistiques
et
-de divertissement, ainsi qu'au matériel pédagogique. Veuillez ne pas
-l'utiliser pour des logiciels ou de la documentation, car elle est
-incompatible avec la GNU GPL et la GNUÂ FDL.</p>
+de divertissement, ainsi qu'au matériel pédagogique.</p>
<p id="which-cc">
<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2314,17 +2312,15 @@
<dt><a id="ccbysa"
-href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">Licence
-Creative Commons paternité, partage dans les mêmes conditions 2.0</a>, aussi
+href="http://creativecommons.org/licenses/by-sa/4.0/legalcode">Licence
+Creative Commons paternité, partage dans les mêmes conditions 4.0</a>, aussi
appelée CC BY-SA [<a
-href="http://creativecommons.org/licenses/by-sa/2.0/deed.fr">résumé en
+href="http://creativecommons.org/licenses/by-sa/4.0/deed.fr">résumé en
français</a>] <span class="anchor-reference-id"> (<a
href="#ccbysa">#ccbysa</a>)</span></dt>
<dd>
<p>C'est une licence libre avec copyleft qui convient aux Åuvres artistiques
et
-de divertissement, ainsi qu'au matériel pédagogique. Veuillez ne pas
-l'utiliser pour des logiciels ou de la documentation, car elle est
-incompatible avec la GNU GPL et la GNUÂ FDL.</p>
+de divertissement, ainsi qu'au matériel pédagogique.</p>
<p>Veuillez <a href="#which-cc">être spécifique sur la licence Creative
Commons
qui est utilisée</a>.</p></dd>
@@ -2560,7 +2556,7 @@
href="/server/standards/README.translations.html">guide de traduction</a>.</p>
</div>
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>Cette page peut être utilisée suivant les conditions de la licence <a
rel="license"
@@ -2578,7 +2574,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2014/12/07 12:30:01 $
+$Date: 2015/01/29 13:30:14 $
<!-- timestamp end -->
</p>
Index: po/license-list.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr-en.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- po/license-list.fr-en.html 21 Nov 2014 20:58:22 -0000 1.78
+++ po/license-list.fr-en.html 29 Jan 2015 13:30:16 -0000 1.79
@@ -2307,15 +2307,13 @@
<dl class="orange">
-<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode">
- Creative Commons Attribution 2.0 license</a>
+<dt><a id="ccby" href="http://creativecommons.org/licenses/by/4.0/legalcode">
+ Creative Commons Attribution 4.0 license</a>
(a.k.a. CC BY)
<span class="anchor-reference-id">(<a href="#ccby">#ccby</a>)</span></dt>
<dd>
<p>This is a non-copyleft free license that is good for art and
-entertainment works, and educational works. Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.</p>
<p id="which-cc">
<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2331,16 +2329,14 @@
<dt><a id="ccbysa"
- href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">
- Creative Commons Attribution-Sharealike 2.0 license</a>
+ href="http://creativecommons.org/licenses/by-sa/4.0/legalcode">
+ Creative Commons Attribution-Sharealike 4.0 license</a>
(a.k.a. CC BY-SA)
<span class="anchor-reference-id">
(<a href="#ccbysa">#ccbysa</a>)</span></dt>
<dd>
<p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works. Please don't use it for
-software or documentation, since it is incompatible with the GNU GPL
-and with the GNU FDL.</p>
+entertainment works, and educational works.</p>
<p>Please <a href="#which-cc">be specific about which Creative
Commons license is being used</a>.</p></dd>
@@ -2548,7 +2544,7 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 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
@@ -2558,7 +2554,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/11/21 20:58:22 $
+$Date: 2015/01/29 13:30:16 $
<!-- timestamp end -->
</p>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.fr.html po/license-li...,
GNUN <=