www-commits
[Top][All Lists]
Advanced

[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: Tue, 12 Apr 2016 09:58:49 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/04/12 09:58:49

Modified files:
        licenses       : license-list.fr.html 
        licenses/po    : license-list.fr-en.html license-list.fr.po 

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.219&r2=1.220
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.101&r2=1.102
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.308&r2=1.309

Patches:
Index: license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- license-list.fr.html        4 Mar 2016 19:58:28 -0000       1.219
+++ license-list.fr.html        12 Apr 2016 09:58:48 -0000      1.220
@@ -1110,10 +1110,15 @@
 <p>C'est une licence de logiciel libre. Elle a une copyleft faible qui
 s'applique à chaque fichier (comme la version 1 de la Mozilla Public
 License), ce qui la rend incompatible avec la <a
-href="/licenses/gpl.html">GNU GPL</a>. Ce qui signifie qu'un module couvert
-par la GPL et un module couvert par la CDDL ne peuvent pas être liés
-légalement. C'est pourquoi nous vous demandons instamment de ne pas utiliser
-la CDDL.</p>
+href="/licenses/gpl.html">GNU GPL</a>. En d'autres termes, il est illicite
+de lier un module couvert par la GPL et un module couvert par la CDDL. C'est
+pourquoi nous vous demandons instamment de ne pas utiliser la CDDL.</p>
+
+<p>Un exemple concret illustrant pourquoi vous ne devez pas combiner des
+travaux sous CDDL avec des travaux sous GPL se trouve dans cette déclaration
+de la FSF: <a href="https://www.fsf.org/licensing/zfs-and-linux";>
+<em>Interpréter, faire respecter et modifier la GNU GPL - application à la
+combinaison de Linux avec ZFS</em></a>.</p>
 
 <p>Et aussi, malheureusement, il y a l'usage dans la CDDL du terme « <a
 href="/philosophy/not-ipr.html">propriété intellectuelle</a> ».</p></dd>
@@ -2663,7 +2668,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2016/03/04 19:58:28 $
+$Date: 2016/04/12 09:58:48 $
 
 <!-- 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.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- po/license-list.fr-en.html  4 Mar 2016 19:58:28 -0000       1.101
+++ po/license-list.fr-en.html  12 Apr 2016 09:58:48 -0000      1.102
@@ -1132,9 +1132,14 @@
 cannot legally be linked together.  We urge you not to use the CDDL
 for this reason.</p>
 
+<p>For an illustrative example of why you should not combine
+CDDL-licensed works with the GPL-licensed works, see the FSF's
+statement, <a href="https://www.fsf.org/licensing/zfs-and-linux";>
+<em>Interpreting, enforcing and changing the GNU GPL, as applied to
+combining Linux and ZFS</em></a>.</p>
+
 <p>Also unfortunate in the CDDL is its use of the term &ldquo;<a
-href="/philosophy/not-ipr.html">intellectual
-property</a>&rdquo;.</p></dd>
+href="/philosophy/not-ipr.html">intellectual property</a>&rdquo;.</p></dd>
 
 
 <dt><a id="CPAL" 
href="https://www.socialtext.net/open/cpal_license_in_wikitext";>
@@ -2644,7 +2649,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/03/04 19:58:28 $
+$Date: 2016/04/12 09:58:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- po/license-list.fr.po       12 Apr 2016 09:30:14 -0000      1.308
+++ po/license-list.fr.po       12 Apr 2016 09:58:48 -0000      1.309
@@ -397,8 +397,8 @@
 msgstr ""
 "<a id=\"LGPL\"></a> <a id=\"LGPLv3\" href=\"/licenses/lgpl.html\"> GNU "
 "Lesser General Public License (LGPL), version 3</a> <span class=\"anchor-"
-"reference-id\">(<a href=\"#LGPL\">#LGPL</a>)  (<a href=\"#LGPL\">#LGPLv3</"
-"a>)</span>"
+"reference-id\">(<a href=\"#LGPL\">#LGPL</a>)  (<a href=\"#LGPL\">#LGPLv3</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -649,8 +649,8 @@
 "(<a href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 msgstr ""
 "<a id=\"ModifiedBSD\" href=\"http://directory.fsf.org/wiki/License:";
-"BSD_3Clause\"> Licence BSD modifiée</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
+"BSD_3Clause\"> Licence BSD modifiée</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ModifiedBSD\">#ModifiedBSD</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -813,8 +813,8 @@
 "\"> (<a href=\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
 msgstr ""
 "<a id=\"CryptixGeneralLicense\" href=\"http://directory.fsf.org/wiki/License:";
-"CryptixGL\"> Cryptix General License</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
+"CryptixGL\"> Cryptix General License</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -855,8 +855,8 @@
 "(<a href=\"#ECL2.0\">#ECL2.0</a>)</span>"
 msgstr ""
 "<a id=\"ECL2.0\" href=\"http://directory.fsf.org/wiki/License:ECL2.0\";> "
-"Educational Community License 2.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ECL2.0\">#ECL2.0</a>)</span>"
+"Educational Community License 2.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ECL2.0\">#ECL2.0</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1061,8 +1061,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#informal\">#informal</a>)</span>"
 msgstr ""
 "<a id=\"informal\">Licence informelle</a> <span class=\"anchor-reference-id"
 "\">(<a href=\"#informal\">#informal</a>)</span>"
@@ -1470,12 +1470,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> License "
-"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 msgstr ""
 "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> Licence "
-"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1700,12 +1700,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"WebM\" href=\"http://directory.fsf.org/wiki/License:WebM\";> License "
-"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</"
-"a>)</span>"
+"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)"
+"</span>"
 msgstr ""
 "<a id=\"WebM\" href=\"http://directory.fsf.org/wiki/License:WebM\";> Licence "
-"de WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</"
-"a>)</span>"
+"de WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1767,8 +1767,8 @@
 "<a id=\"Wx\"></a>WxWidgets License <span class=\"anchor-reference-id\">(<a "
 "href=\"#Wx\">#Wx</a>)</span>"
 msgstr ""
-"<a id=\"Wx\"></a>Licence de WxWidgets <span class=\"anchor-reference-id"
-"\">(<a href=\"#Wx\">#Wx</a>)</span>"
+"<a id=\"Wx\"></a>Licence de WxWidgets <span class=\"anchor-reference-id\">"
+"(<a href=\"#Wx\">#Wx</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1874,12 +1874,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
-"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 msgstr ""
 "<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";>Licence "
-"de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"de ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid "This is a free software license, and compatible with the GPL."
@@ -2259,12 +2259,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
-"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
-"Eclipse Public License, version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"Eclipse Public License, version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2535,13 +2535,13 @@
 msgid ""
 "<a id=\"lucent102\" href=\"http://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"> Lucent Public License Version 1.02 (Plan 9 license)</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)"
+"</span>"
 msgstr ""
 "<a id=\"lucent102\" href=\"http://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"> Lucent Public License, version 1.02 (licence de Plan 9)</a> 
"
-"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2578,12 +2578,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-rl\" href=\"http://directory.fsf.org/wiki/License:MsRL\";> "
-"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
 msgstr ""
 "<a id=\"ms-rl\" href=\"http://directory.fsf.org/wiki/License:MsRL\";> "
-"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -2908,12 +2908,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
-"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#QPL\">#QPL</a>)</span>"
+"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#QPL\">#QPL</a>)</span>"
 msgstr ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
-"Public License (QPL), version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#QPL\">#QPL</a>)</span>"
+"Public License (QPL), version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#QPL\">#QPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -3641,8 +3641,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The JSON "
-"License</a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</"
-"a>)</span>"
+"License</a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)"
+"</span>"
 msgstr ""
 "<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";>La "
 "licence de <abbr title=\"JavaScript Object Notation\">JSON</abbr></a> <span "
@@ -3666,8 +3666,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ksh93\">Old license of ksh93</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ksh93\">#ksh93</a>)</span>"
+"<a id=\"ksh93\">Old license of ksh93</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ksh93\">#ksh93</a>)</span>"
 msgstr ""
 "<a id=\"ksh93\"> Ancienne licence de ksh93</a> <span class=\"anchor-"
 "reference-id\">(<a href=\"#ksh93\">#ksh93</a>)</span>"
@@ -3876,8 +3876,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
-"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</"
-"a>)</span>"
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
 "<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>Licence "
 "de <abbr title=\"Program for Internet News and Email\">Pine</abbr></a> <span "
@@ -3905,8 +3905,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Plan9\">Old Plan 9 license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#Plan9\">#Plan9</a>)</span>"
+"<a id=\"Plan9\">Old Plan 9 license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Plan9\">#Plan9</a>)</span>"
 msgstr ""
 "<a id=\"Plan9\">Ancienne licence de Plan 9</a> <span class=\"anchor-"
 "reference-id\">(<a href=\"#Plan9\">#Plan9</a>)</span>"
@@ -4596,8 +4596,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CC-BY-ND\" href=\"?\">Creative Commons Noderivatives, any version</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</a>)"
+"</span>"
 msgstr ""
 "<a id=\"CC-BY-ND\" href=\"?\">Creative Commons, pas de modification, toute "
 "version</a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-"
@@ -4634,12 +4634,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -4914,12 +4914,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -4961,12 +4961,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ecfonts\" href=\"http://directory.fsf.org/wiki/License:LaTeX_ecfonts";
-"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
 msgstr ""
 "<a id=\"ecfonts\" href=\"http://directory.fsf.org/wiki/License:LaTeX_ecfonts";
-"\">Licence des polices ec pour LaTeX</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+"\">Licence des polices ec pour LaTeX</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""



reply via email to

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