www/licenses license-list.fr.html license-list....

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/09/25 08:57:25

Modified files:
        licenses       : license-list.fr.html license-list.ru.html 
        licenses/po    : license-list.fr-en.html license-list.ru-en.html 
                         license-list.ru.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.210&r2=1.211
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.79&r2=1.80
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.207&r2=1.208

Patches:
Index: license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- license-list.fr.html        25 Sep 2015 07:02:17 -0000      1.210
+++ license-list.fr.html        25 Sep 2015 08:57:23 -0000      1.211
@@ -34,16 +34,13 @@
 }
 #content div#legend {
    float: right;
-   width: 18.4em;
+   width: auto; max-width: 100%;
    font-style: normal;
    padding: 0 1em 1em 1em;
-   margin: 2.5em 0 1.5em 1.5em;
+   margin: 2.5em 1.5em 1.5em 1.5em;
    background: #f0f2f4;
    border: 1px solid #c9cccf;
 }
address@hidden (max-width: 50em) {
-   #content div#legend { float: none; width: 40em; max-width: 80%; margin: 2em 
auto 0 auto; }
-}
 
 #content div#legend dl { margin: 1em 0 0 0; }
 #content div#legend dt { padding: 1em 0; margin: 0; }
@@ -86,16 +83,16 @@
 </style>
 
 <!--#include virtual="/server/banner.fr.html" -->
-<h2 class="c">Licences commentées</h2>
+<h2>Licences commentées</h2>
 
 <div class="toc">
 
 <h3 id="TableOfContents">Table des matières</h3>
 
 <ul>
-<li><strong><a href="#Introduction">Introduction</a></strong></li>
+<li><a href="#Introduction">Introduction</a></li>
 
-<li><strong><a href="#SoftwareLicenses">Licences de logiciel</a></strong>
+<li><a href="#NonFreeSoftwareLicenses">Licences de logiciel non libre</a>
   <ul>
   <li><a href="#GPLCompatibleLicenses">Licences de logiciel libre compatibles 
avec
 la GPL</a></li>
@@ -105,8 +102,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#DocumentationLicenses">Licences pour la
-documentation</a></strong>
+<li><a href="#DocumentationLicenses">Licences pour la documentation</a>
   <ul>
   <li><a href="#FreeDocumentationLicenses">Licences libres pour la
 documentation</a></li>
@@ -115,8 +111,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#OtherLicenses">Licences pour les autres types
-d'œuvres</a></strong>
+<li><a href="#OtherLicenses">Licences pour les autres types d'œuvres</a>
   <ul>
   <li><a href="#OtherLicenses">Licences pour les œuvres à usage pratique 
autres
 que les logiciels et la documentation</a></li>
@@ -853,6 +848,20 @@
 dans la communauté du logiciel libre.</p></dd>
 
 
+<dt><a id="UPL"
+href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+Licence permissive universelle (<abbr title="Universal Permissive
+License">UPL</abbr>)</a> <span class="anchor-reference-id"> (<a
+href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>C'est une licence de logiciel libre permissive, voire laxiste, sans copyleft
+et compatible avec la GNU GPL. Elle offre la possibilité de donner une
+licence de brevet en même temps que le logiciel ; nous recommandons
+cependant la licence Apache 2.O, pour éviter les entourloupes relatives aux
+brevets lorsque vous choisissez de mettre votre travail sous une licence
+laxiste.
+</p></dd>    
+
 <dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
 Unlicense</a> <span class="anchor-reference-id">(<a
 href="#Unlicense">#Unlicense</a>)</span></dt>
@@ -2619,7 +2628,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/09/25 07:02:17 $
+$Date: 2015/09/25 08:57:23 $
 
 <!-- timestamp end -->
 </p>

Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- license-list.ru.html        19 Sep 2015 10:58:31 -0000      1.87
+++ license-list.ru.html        25 Sep 2015 08:57:24 -0000      1.88
@@ -93,7 +93,7 @@
 <ul>
 <li><a href="#Introduction">Введение</a></li>
 
-<li><a href="#SoftwareLicenses">Лицензии для программ</a>
+<li><a href="#SoftwareLicenses"> Лицензии для программ</a>
   <ul>
   <li><a href="#GPLCompatibleLicenses">Лицензии свободных 
программ, совместимые с
 GPL</a></li>
@@ -1975,7 +1975,9 @@
 коммерческого перераспространения. Кроме 
того, условие&nbsp;4 существенно
 ограничивает функциональность измененных 
версий.</p>
 
-<p>К счастью, Scratch 2.0 распространяется 
теперь по GNU GPL.</p></dd>
+<p>Новые версии программ Scratch 
распространяются по GNU GPL, но некоторые из
+этих новых версий мы не рекомендуем, 
потому что для них нужна несвободная
+программа Adobe Air. </p></dd>
 
 
 <dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";> 
Лицензия
@@ -2619,7 +2621,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/09/19 10:58:31 $
+$Date: 2015/09/25 08:57:24 $
 
 <!-- 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.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- po/license-list.fr-en.html  25 Sep 2015 07:02:47 -0000      1.93
+++ po/license-list.fr-en.html  25 Sep 2015 08:57:24 -0000      1.94
@@ -31,16 +31,13 @@
 }
 #content div#legend {
    float: right;
-   width: 18.4em;
+   width: auto; max-width: 100%;
    font-style: normal;
    padding: 0 1em 1em 1em;
-   margin: 2.5em 0 1.5em 1.5em;
+   margin: 2.5em 1.5em 1.5em 1.5em;
    background: #f0f2f4;
    border: 1px solid #c9cccf;
 }
address@hidden (max-width: 50em) {
-   #content div#legend { float: none; width: 40em; max-width: 80%; margin: 2em 
auto 0 auto; }
-}
 
 #content div#legend dl { margin: 1em 0 0 0; }
 #content div#legend dt { padding: 1em 0; margin: 0; }
@@ -55,7 +52,7 @@
      and their contents aren't commented out on purpose:
      they should be translated, preferably as separate strings.  -->
 <style type="text/css" media="print,screen">
-#legend blockquote:before { content: "Meaning of the left border"; }
+#legend blockquote:before { content: "Code for the left border"; }
 </style>
 <style type="text/css" media="print,screen">
 #legend dl.green dt:after {
@@ -80,16 +77,16 @@
 </style>
 
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">Various Licenses and Comments about&nbsp;Them</h2>
+<h2>Various Licenses and Comments about Them</h2>
 
 <div class="toc">
 
 <h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
-<li><strong><a href="#Introduction">Introduction</a></strong></li>
+<li><a href="#Introduction">Introduction</a></li>
 
-<li><strong><a href="#SoftwareLicenses">Software Licenses</a></strong>
+<li><a href="#SoftwareLicenses">Software Licenses</a>
   <ul>
   <li><a href="#GPLCompatibleLicenses">
       GPL-Compatible Free Software Licenses</a></li>
@@ -99,7 +96,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#DocumentationLicenses">Licenses For 
Documentation</a></strong>
+<li><a href="#DocumentationLicenses">Licenses For Documentation</a>
   <ul>
   <li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
   <li><a href="#NonFreeDocumentationLicenses">
@@ -107,7 +104,7 @@
   </ul>
 </li>
 
-<li><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
   <ul>
   <li><a href="#OtherLicenses">Licenses for Works of Practical Use
       besides Software and Documentation</a></li>
@@ -864,6 +861,18 @@
 common, and widely recognized in the free software community.</p></dd>
 
 
+<dt><a id="UPL" 
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+    Universal Permissive License (UPL)</a>
+    <span class="anchor-reference-id">
+       (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive non-copyleft free software license, compatible
+with the GNU GPL. The license does provide the ability to license
+patents along with the software work, however, we still recommend the
+Apache 2.0 license for avoiding patent treachery when choosing to put
+your work under a lax license.
+</p></dd>    
+
 <dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
     The Unlicense</a>
     <span class="anchor-reference-id">
@@ -2592,7 +2601,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/25 07:02:47 $
+$Date: 2015/09/25 08:57:24 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- po/license-list.ru-en.html  19 Sep 2015 10:58:32 -0000      1.79
+++ po/license-list.ru-en.html  25 Sep 2015 08:57:24 -0000      1.80
@@ -1988,7 +1988,9 @@
 commercial redistribution.  In addition, condition 4 substantively
 restricts the functionality of modified versions.</p>
 
-<p>Fortunately Scratch 2.0 is now distributed under the GNU GPL.</p></dd>
+<p>Newer versions Scratch software are distributed under the GNU GPL,
+but some of those newer version we do not recommend, because they
+depend on the proprietary software, Adobe Air. </p></dd>
 
 
 <dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";>
@@ -2599,7 +2601,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/19 10:58:32 $
+$Date: 2015/09/25 08:57:24 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- po/license-list.ru.po       25 Sep 2015 08:35:52 -0000      1.207
+++ po/license-list.ru.po       25 Sep 2015 08:57:24 -0000      1.208
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-09-24 15:29+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -26,9 +25,7 @@
 "программного обеспечения"
 
 #. type: Content of: <style>
-# || No change detected.  The change might only be in amounts of spaces.
 #, no-wrap
-#| msgid "#legend blockquote:before { content: \"Code for the left border\"; 
}\n"
 msgid "#legend blockquote:before { content: \"Code for the left border\"; }\n"
 msgstr "#legend blockquote:before { content: \"Классы 
лицензий\"; }\n"
 
@@ -76,8 +73,6 @@
 msgstr "#legend dl.blue dt:after { content: \"Лицензии для 
работ, выражающих мнение\"; }\n"
 
 #. type: Content of: <h2>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Various Licenses and Comments about Them"
 msgid "Various Licenses and Comments about Them"
 msgstr "Различные лицензии и комментарии к 
ним"
 
@@ -86,18 +81,12 @@
 msgstr "Содержание"
 
 #. type: Content of: <div><ul><li>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"#Introduction\">Introduction</a>"
 msgid "<a href=\"#Introduction\">Introduction</a>"
 msgstr "<a href=\"#Introduction\">Введение</a>"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"#NonFreeSoftwareLicenses\">Nonfree Software-]
-# | {+href=\"#SoftwareLicenses\">Software+} Licenses</a>
-#| msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
 msgid "<a href=\"#SoftwareLicenses\">Software Licenses</a>"
-msgstr ""
-"<a href=\"#SoftwareLicenses\"> Лицензии для программ</a>"
+msgstr "<a href=\"#SoftwareLicenses\"> Лицензии для 
программ</a>"
 
 #. type: Content of: <div><ul><li><ul><li>
 msgid ""
@@ -120,8 +109,6 @@
 "<a href=\"#NonFreeSoftwareLicenses\"> Лицензии несвободных 
программ</a>"
 
 #. type: Content of: <div><ul><li>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"#DocumentationLicenses\">Licenses For Documentation</a>"
 msgid "<a href=\"#DocumentationLicenses\">Licenses For Documentation</a>"
 msgstr "<a href=\"#DocumentationLicenses\"> Лицензии для 
документации</a>"
 
@@ -138,8 +125,6 @@
 "документации</a>"
 
 #. type: Content of: <div><ul><li>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"#OtherLicenses\">Licenses for Other Works</a>"
 msgid "<a href=\"#OtherLicenses\">Licenses for Other Works</a>"
 msgstr "<a href=\"#OtherLicenses\">Лицензии для других 
работ</a>"