www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www licenses/gpl-faq.ru.html licenses/license-l...

From: GNUN
Subject: www licenses/gpl-faq.ru.html licenses/license-l...
Date: Sat, 28 Jun 2014 09:28:43 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/06/28 09:28:43

Modified files:
        licenses       : gpl-faq.ru.html license-list.ru.html 
        licenses/po    : gpl-faq.ru-en.html gpl-faq.ru.po 
                         license-list.ru-en.html license-list.ru.po 
        software       : recent-releases-include.ru.html 
        software/po    : recent-releases-include.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.136&r2=1.137
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.391&r2=1.392
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.483&r2=1.484

Patches:
Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses/gpl-faq.ru.html    26 Jun 2014 20:59:43 -0000      1.49
+++ licenses/gpl-faq.ru.html    28 Jun 2014 09:28:40 -0000      1.50
@@ -11,7 +11,7 @@
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Ответы на вопросы о лицензиях GNU</h2>
 
-<!--#include virtual="/licenses/fsf-licensing.html" -->
+<!--#include virtual="/licenses/fsf-licensing.ru.html" -->
 <p>
 На этой странице размещены ответы на часто 
задаваемые вопросы о <a
 href="/licenses/licenses.html">лицензиях GNU</a>.
@@ -536,8 +536,9 @@
 требуется ли от меня использование GPL в 
качестве лицензии для моего
 модуля?</a></li>
   
-    <li><a href="#GPLAndPlugins">Если программа, 
выпущенная под GPL, пользуется
-внешними модулями, каковы требования к 
лицензиям модуля?</a></li>
+    <li><a href="#GPLAndPlugins">Если я пишу внешний 
модуль для применения с
+программой, выпущенной под GPL, какие 
требования это налагает на лицензии,
+под которыми я могу распространять свой 
модуль?</a></li>
   
     <li><a href="#GPLPluginsInNF">Могу я применять GPL, 
когда пишу внешний модуль к
 несвободной программе?</a></li>
@@ -1621,8 +1622,9 @@
 <p>В пересмотренной лицензии BSD пункта о 
рекламе нет, что устраняет проблему.</p></dd>
 
 
-<dt id="GPLAndPlugins">Если программа, выпущенная 
под GPL, пользуется внешними модулями, каковы
-требования к лицензиям модуля? <span 
class="anchor-reference-id">(<a
+<dt id="GPLAndPlugins">Если я пишу внешний модуль для 
применения с программой, выпущенной под GPL,
+какие требования это налагает на лицензии, 
под которыми я могу
+распространять свой модуль? <span 
class="anchor-reference-id">(<a
 href="#GPLAndPlugins" >#GPLAndPlugins</a>)</span></dt>
 <dd><p>
 Это зависит от того, как программа 
задействует свои внешние модули. Если
@@ -1633,9 +1635,9 @@
 <p>Если программа динамически компонуется 
с модулями и они вызывают функции
 друг из друга и разделяют общие структуры 
данных, мы убеждены, что они
 формируют единую программу, которая 
должна рассматриваться как расширение и
-главной программы, и модулей. Это значит, 
что модули должны выпускаться под
-GPL или совместимой с ней лицензией 
свободных программ и что условия GPL
-должны соблюдаться при распространении 
этих модулей.</p>
+главной программы, и модулей. Это значит, 
что вы должны выпускать модуль под
+GPL или совместимой с ней лицензией 
свободных программ и распространять его
+с исходным текстом так, чтобы это было 
совместимо с GPL.</p>
 
 <p>Как предельный может рассматриваться 
случай, когда программа динамически
 компонуется с модулями, но сообщение между 
ними ограничивается вызовом
@@ -3748,7 +3750,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/06/26 20:59:43 $
+$Date: 2014/06/28 09:28:40 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- licenses/license-list.ru.html       26 Jun 2014 20:28:28 -0000      1.65
+++ licenses/license-list.ru.html       28 Jun 2014 09:28:40 -0000      1.66
@@ -125,7 +125,7 @@
 </div>
 <div style="clear: left;"></div>
 
-<!--#include virtual="/licenses/fsf-licensing.html" -->
+<!--#include virtual="/licenses/fsf-licensing.ru.html" -->
 <p>Мы классифицируем лицензии по 
определенным ключевым критериям:</p>
 
 <ul>
@@ -1931,6 +1931,15 @@
 версии&nbsp;2.</p></dd>
 
 
+<dt><a id="Scratch"
+href="http://directory.fsf.org/wiki/License:Scratch";>Scratch</a> <span
+class="anchor-reference-id"> (<a href="#Scratch">#Scratch</a>)</span></dt>
+<dd>
+<p>Это не лицензия свободных программ, 
потому что она не допускает
+коммерческого распространения измененной 
версии. Кроме того, условие&nbsp;4
+существенно ограничивает 
функциональность производных 
произведений.</p></dd>
+
+
 <dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";> 
Лицензия
 &ldquo;Простых машин&rdquo; (Simple Machines License)</a> <span
 class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
@@ -2503,7 +2512,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/06/26 20:28:28 $
+$Date: 2014/06/28 09:28:40 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- licenses/po/gpl-faq.ru-en.html      26 Jun 2014 20:28:31 -0000      1.39
+++ licenses/po/gpl-faq.ru-en.html      28 Jun 2014 09:28:41 -0000      1.40
@@ -548,9 +548,9 @@
     program, do I have to use the GPL as the license for my
     module?</a></li>
   
-    <li><a href="#GPLAndPlugins">If a program released under the GPL
-    uses plug-ins, what are the requirements for the licenses of a
-    plug-in?</a></li>
+    <li><a href="#GPLAndPlugins">If I write a plug-in to use with
+    a GPL-covered program, what requirements does that impose
+    on the licenses I can use for distributing my plug-in?</a></li>
   
     <li><a href="#GPLPluginsInNF">Can I apply the GPL when writing a
     plug-in for a non-free program?</a></li>
@@ -1657,9 +1657,9 @@
 eliminates the problem.</p></dd>
 
 
-<dt id="GPLAndPlugins">If a program
-  released under the GPL uses plug-ins, what are the requirements for
-  the licenses of a plug-in?
+<dt id="GPLAndPlugins">If I write a plug-in to use with a GPL-covered
+  program, what requirements does that impose on the licenses I can
+  use for distributing my plug-in?
  <span class="anchor-reference-id">(<a href="#GPLAndPlugins"
  >#GPLAndPlugins</a>)</span></dt>
 <dd><p>
@@ -1671,10 +1671,9 @@
 <p>If the program dynamically links plug-ins, and they make function
 calls to each other and share data structures, we believe they form a
 single program, which must be treated as an extension of both the main
-program and the plug-ins.  This means the plug-ins must be released
-under the GPL or a GPL-compatible free software license, and that the
-terms of the GPL must be followed when those plug-ins are
-distributed.</p>
+program and the plug-ins.  This means you must license the plug-in
+under the GPL or a GPL-compatible free software license and distribute
+it with source code in a GPL-compliant way.</p>
 
 <p>If the program dynamically links plug-ins, but the communication
 between them is limited to invoking the &lsquo;main&rsquo; function of
@@ -3780,7 +3779,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/06/26 20:28:31 $
+$Date: 2014/06/28 09:28:41 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- licenses/po/gpl-faq.ru.po   28 Jun 2014 08:58:50 -0000      1.70
+++ licenses/po/gpl-faq.ru.po   28 Jun 2014 09:28:41 -0000      1.71
@@ -19,7 +19,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-06-27 13:57+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1179,16 +1178,6 @@
 "</a>"
 
 #. type: Content of: <ul><li>
-# | [-If-]{+<a href=\"#GPLAndPlugins\">If I write+} a [-program released under
-# | the GPL uses plug-ins,-] {+plug-in to use with a GPL-covered program,+}
-# | what [-are the-] requirements [-for-] {+does that impose on+} the licenses
-# | [-of a plug-in? <span class=\"anchor-reference-id\">(<a
-# | href=\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>-] {+I can use for
-# | distributing my plug-in?</a>+}
-#| msgid ""
-#| "If a program released under the GPL uses plug-ins, what are the "
-#| "requirements for the licenses of a plug-in? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>"
 msgid ""
 "<a href=\"#GPLAndPlugins\">If I write a plug-in to use with a GPL-covered "
 "program, what requirements does that impose on the licenses I can use for "
@@ -3483,24 +3472,15 @@
 "В пересмотренной лицензии BSD пункта о 
рекламе нет, что устраняет проблему."
 
 #. type: Content of: <dl><dt>
-# | If {+I write+} a [-program released under the GPL uses plug-ins,-]
-# | {+plug-in to use with a GPL-covered program,+} what [-are the-]
-# | requirements [-for-] {+does that impose on+} the licenses [-of a-] {+I can
-# | use for distributing my+} plug-in? <span class=\"anchor-reference-id\">(<a
-# | href=\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>
-#| msgid ""
-#| "If a program released under the GPL uses plug-ins, what are the "
-#| "requirements for the licenses of a plug-in? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>"
 msgid ""
 "If I write a plug-in to use with a GPL-covered program, what requirements "
 "does that impose on the licenses I can use for distributing my plug-in? "
 "<span class=\"anchor-reference-id\">(<a href=\"#GPLAndPlugins\" "
 ">#GPLAndPlugins</a>)</span>"
 msgstr ""
-"Если я пишу внешний модуль для применения 
с "
-"программой, выпущенной под GPL, какие 
требования это налагает на лицензии, "
-"под которыми я могу распространять свой 
модуль? <span class=\"anchor-reference-id\">(<a href="
+"Если я пишу внешний модуль для применения 
с программой, выпущенной под GPL, "
+"какие требования это налагает на 
лицензии, под которыми я могу "
+"распространять свой модуль? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#GPLAndPlugins\" >#GPLAndPlugins</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
@@ -3515,21 +3495,6 @@
 "программы не предъявляет к ним никаких 
требований."
 
 #. type: Content of: <dl><dd><p>
-# | If the program dynamically links plug-ins, and they make function calls to
-# | each other and share data structures, we believe they form a single
-# | program, which must be treated as an extension of both the main program
-# | and the plug-ins.  This means [-the plug-ins-] {+you+} must [-be
-# | released-] {+license the plug-in+} under the GPL or a GPL-compatible free
-# | software license[-,-] and [-that the terms of the GPL must be followed
-# | when those plug-ins are distributed.-] {+distribute it with source code in
-# | a GPL-compliant way.+}
-#| msgid ""
-#| "If the program dynamically links plug-ins, and they make function calls "
-#| "to each other and share data structures, we believe they form a single "
-#| "program, which must be treated as an extension of both the main program "
-#| "and the plug-ins.  This means the plug-ins must be released under the GPL "
-#| "or a GPL-compatible free software license, and that the terms of the GPL "
-#| "must be followed when those plug-ins are distributed."
 msgid ""
 "If the program dynamically links plug-ins, and they make function calls to "
 "each other and share data structures, we believe they form a single program, "

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- licenses/po/license-list.ru-en.html 26 Jun 2014 20:28:34 -0000      1.57
+++ licenses/po/license-list.ru-en.html 28 Jun 2014 09:28:41 -0000      1.58
@@ -1947,6 +1947,15 @@
 commercial distribution of a modified version.  Thankfully, starting from 
version 5.0.0, the Scilab software is free software, released under CeCILL 
version&nbsp;2.</p></dd>
 
 
+<dt><a id="Scratch" 
href="http://directory.fsf.org/wiki/License:Scratch";>Scratch</a>
+    <span class="anchor-reference-id">
+       (<a href="#Scratch">#Scratch</a>)</span></dt>
+<dd>
+<p>This is not a free software license because it does not allow
+commercial distribution of a modified version.  In addition, condition
+4 substantively restricts the functionality of derivative works.</p></dd>
+
+
 <dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM";>
     Simple Machines License</a>
     <span class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
@@ -2487,7 +2496,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/06/26 20:28:34 $
+$Date: 2014/06/28 09:28:41 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- licenses/po/license-list.ru.po      28 Jun 2014 08:58:50 -0000      1.136
+++ licenses/po/license-list.ru.po      28 Jun 2014 09:28:42 -0000      1.137
@@ -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: 2014-06-27 13:57+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -3900,17 +3899,6 @@
 "версии&nbsp;2."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"Scilab\"
-# | href=\"http://directory.fsf.org/wiki/License:Scilab-old\";>Scilab
-# | license</a>-] {+id=\"Scratch\"
-# | href=\"http://directory.fsf.org/wiki/License:Scratch\";>Scratch</a>+} <span
-# | class=\"anchor-reference-id\"> (<a
-# | [-href=\"#Scilab\">#Scilab</a>)</span>-]
-# | {+href=\"#Scratch\">#Scratch</a>)</span>+}
-#| msgid ""
-#| "<a id=\"Scilab\" href=\"http://directory.fsf.org/wiki/License:Scilab-old";
-#| "\">Scilab license</a> <span class=\"anchor-reference-id\"> (<a href="
-#| "\"#Scilab\">#Scilab</a>)</span>"
 msgid ""
 "<a id=\"Scratch\" href=\"http://directory.fsf.org/wiki/License:Scratch";
 "\">Scratch</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scratch"
@@ -3921,16 +3909,6 @@
 "\">#Scratch</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is not a free software license because it does not allow commercial
-# | distribution of a modified version.  [-Thankfully, starting from version
-# | 5.0.0,-]  {+In addition, condition 4 substantively restricts+} the
-# | [-Scilab software is free software, released under CeCILL
-# | version&nbsp;2.-] {+functionality of derivative works.+}
-#| msgid ""
-#| "This is not a free software license because it does not allow commercial "
-#| "distribution of a modified version.  Thankfully, starting from version "
-#| "5.0.0, the Scilab software is free software, released under CeCILL "
-#| "version&nbsp;2."
 msgid ""
 "This is not a free software license because it does not allow commercial "
 "distribution of a modified version.  In addition, condition 4 substantively "

Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -b -r1.391 -r1.392
--- software/recent-releases-include.ru.html    27 Jun 2014 21:27:21 -0000      
1.391
+++ software/recent-releases-include.ru.html    28 Jun 2014 09:28:42 -0000      
1.392
@@ -1,12 +1,12 @@
 <ul>
-<li><strong>June 27, 2014</strong>
+<li><strong>27 июня 2014</strong>
 <ul>
 <li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00014.html";>FreeIPMI
-1.4.4 Released</a>, <i>Albert Chu</i>, <tt>17:08</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00014.html";>Выпущен
+FreeIPMI 1.4.4</a>, <i>Альберт Чу</i>, <tt>17:08</tt></li>
 <li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00013.html";>Release
-of GNU Electric, version 9.05</a>, <i>Steven Rubin</i>, <tt>08:41</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00013.html";>Выпуск
+GNU Electric, версия 9.05</a>, <i>Стивен Рубин</i>, 
<tt>08:41</tt></li>
 </ul></li>
 <li><strong>24 июня 2014</strong>
 <ul>

Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -b -r1.483 -r1.484
--- software/po/recent-releases-include.ru.po   28 Jun 2014 09:02:05 -0000      
1.483
+++ software/po/recent-releases-include.ru.po   28 Jun 2014 09:28:42 -0000      
1.484
@@ -14,24 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-06-27 12:59+0000\n"
 
 #. type: Content of: <ul><li>
-# | <strong>June 2[-4-]{+7+}, 2014</strong>
-#| msgid "<strong>June 24, 2014</strong>"
 msgid "<strong>June 27, 2014</strong>"
 msgstr "<strong>27 июня 2014</strong>"
 
 #. type: Content of: <ul><li><ul><li>
-# | <a
-# | 
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2014-05/msg00002.html\";>FreeIPMI
-# | 1.4.2-]
-# | 
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00014.html\";>FreeIPMI
-# | 1.4.4+} Released</a>, <i>Albert Chu</i>, [-<tt>02:42</tt>-]
-# | {+<tt>17:08</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2014-05/msg00002.html";
-#| "\">FreeIPMI 1.4.2 Released</a>, <i>Albert Chu</i>, <tt>02:42</tt>"
 msgid ""
 "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00014.html";
 "\">FreeIPMI 1.4.4 Released</a>, <i>Albert Chu</i>, <tt>17:08</tt>"
@@ -40,24 +28,13 @@
 "\">Выпущен FreeIPMI 1.4.4</a>, <i>Альберт Чу</i>, 
<tt>17:08</tt>"
 
 #. type: Content of: <ul><li><ul><li>
-# | <a
-# | 
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2013-09/msg00019.html\";>Release-]
-# | 
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00013.html\";>Release+}
-# | of [-remotecontrol - Version 1.1</a>, <i>Stephen H. Dawson</i>,
-# | <tt>17:30</tt>-] {+GNU Electric, version 9.05</a>, <i>Steven Rubin</i>,
-# | <tt>08:41</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2013-09/msg00019.html";
-#| "\">Release of remotecontrol - Version 1.1</a>, <i>Stephen H. Dawson</i>, "
-#| "<tt>17:30</tt>"
 msgid ""
 "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00013.html";
 "\">Release of GNU Electric, version 9.05</a>, <i>Steven Rubin</i>, "
 "<tt>08:41</tt>"
 msgstr ""
 "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2014-06/msg00013.html";
-"\">Выпуск GNU Electric, версия 9.05</a>, <i>Стивен Р
убин</i>, "
-"<tt>08:41</tt>"
+"\">Выпуск GNU Electric, версия 9.05</a>, <i>Стивен Р
убин</i>, <tt>08:41</tt>"
 
 #. type: Content of: <ul><li>
 msgid "<strong>June 24, 2014</strong>"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]