www/licenses license-list.ru.html po/license-li...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/02/27 13:56:56

Modified files:
        licenses       : license-list.ru.html 
        licenses/po    : 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.ru.html?cvsroot=www&r1=1.79&r2=1.80
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.180&r2=1.181

Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- license-list.ru.html        7 Feb 2015 07:39:11 -0000       1.79
+++ license-list.ru.html        27 Feb 2015 13:56:55 -0000      1.80
@@ -2281,7 +2281,8 @@
 href="#ccby">#ccby</a>)</span></dt>
 <dd>
 <p>Это свободная лицензия без авторского 
лева, она хороша для художественных,
-развлекательных и образовательных 
произведений. Она совместима с GPLv3.</p>
+развлекательных и образовательных 
произведений. Она совместима со всеми
+версиями GNU GPL; однако она не рекомендуется 
для программ.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2296,7 +2297,6 @@
 любое обсуждение, совершенно необходимо 
спросить: &ldquo;Какую из лицензий
 Creative Commons?&rdquo;</p></dd>
 
-
 <dt><a id="ccbysa"
 href="http://creativecommons.org/licenses/by-sa/4.0/legalcode";> 
Лицензия
 Creative Commons Attribution-Sharealike 4.0</a> (она же&nbsp;&mdash;
@@ -2569,7 +2569,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/02/07 07:39:11 $
+$Date: 2015/02/27 13:56:55 $
 
 <!-- timestamp end -->
 </p>

Index: po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- po/license-list.ru-en.html  5 Feb 2015 03:28:22 -0000       1.71
+++ po/license-list.ru-en.html  27 Feb 2015 13:56:55 -0000      1.72
@@ -392,7 +392,7 @@
 such as small programs, because confusion could easily occur and lead
 to use of the flawed <a href="#OriginalBSD"><em>original</em> BSD
 license</a>.  To avoid this risk, you can suggest the X11 license
-instead.  The X11 license and the Modified BSD license are
+instead.  The X11 license and the modified BSD license are
 more or less equivalent.</p>
 
 <p>However, the Apache 2.0 license is better for substantial programs,
@@ -2290,7 +2290,9 @@
     <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. It is compatible with GPLv3.</p>
+entertainment works, and educational works.  It is compatible with all
+versions of the GNU GPL; however, it is not recommended for use on
+software.</p>
 
 <p id="which-cc">
 <span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2304,7 +2306,6 @@
 certain work, it is vital to ask &ldquo;Which Creative Commons
 license?&rdquo; before proceeding any further.</p></dd>
 
-
 <dt><a id="ccbysa"
        href="http://creativecommons.org/licenses/by-sa/4.0/legalcode";>
     Creative Commons Attribution-Sharealike 4.0 license</a>
@@ -2552,7 +2553,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/02/05 03:28:22 $
+$Date: 2015/02/27 13:56:55 $
 <!-- 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.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- po/license-list.ru.po       27 Feb 2015 13:53:26 -0000      1.180
+++ po/license-list.ru.po       27 Feb 2015 13:56:55 -0000      1.181
@@ -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-02-27 02:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -649,21 +648,6 @@
 msgstr "На эту лицензию иногда ссылаются как 
на трехпунктную лицензию BSD."
 
 #. type: Content of: <dl><dd><p>
-# | The modified BSD license is not bad, as lax permissive licenses go, though
-# | the Apache 2.0 license is preferable.  However, it is risky to recommend
-# | use of &ldquo;the BSD license&rdquo;, even for special cases such as small
-# | programs, because confusion could easily occur and lead to use of the
-# | flawed <a href=\"#OriginalBSD\"><em>original</em> BSD license</a>.  To
-# | avoid this risk, you can suggest the X11 license instead.  The X11 license
-# | and the [-M-]{+m+}odified BSD license are more or less equivalent.
-#| msgid ""
-#| "The modified BSD license is not bad, as lax permissive licenses go, "
-#| "though the Apache 2.0 license is preferable.  However, it is risky to "
-#| "recommend use of &ldquo;the BSD license&rdquo;, even for special cases "
-#| "such as small programs, because confusion could easily occur and lead to "
-#| "use of the flawed <a href=\"#OriginalBSD\"><em>original</em> BSD license</"
-#| "a>.  To avoid this risk, you can suggest the X11 license instead.  The "
-#| "X11 license and the Modified BSD license are more or less equivalent."
 msgid ""
 "The modified BSD license is not bad, as lax permissive licenses go, though "
 "the Apache 2.0 license is preferable.  However, it is risky to recommend use "
@@ -4588,13 +4572,6 @@
 "a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a non-copyleft free license that is good for art and entertainment
-# | works, and educational works.  It is compatible with [-GPLv3.-] {+all
-# | versions of the GNU GPL; however, it is not recommended for use on
-# | software.+}
-#| msgid ""
-#| "This is a non-copyleft free license that is good for art and "
-#| "entertainment works, and educational works. It is compatible with GPLv3."
 msgid ""
 "This is a non-copyleft free license that is good for art and entertainment "
 "works, and educational works.  It is compatible with all versions of the GNU "