[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses gpl-faq.ru.html license-list.ru.ht...
From: |
GNUN |
Subject: |
www/licenses gpl-faq.ru.html license-list.ru.ht... |
Date: |
Sat, 11 Oct 2014 06:29:07 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/10/11 06:29:07
Modified files:
licenses : gpl-faq.ru.html license-list.ru.html
licenses/old-licenses: gpl-2.0-faq.ru.html
licenses/old-licenses/po: gpl-2.0-faq.ru-en.html
gpl-2.0-faq.ru.po
licenses/po : gpl-faq.ru-en.html gpl-faq.ru.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/gpl-faq.ru.html?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/gpl-2.0-faq.ru.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.151&r2=1.152
Patches:
Index: gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- gpl-faq.ru.html 28 Jun 2014 09:28:40 -0000 1.50
+++ gpl-faq.ru.html 11 Oct 2014 06:28:58 -0000 1.51
@@ -90,7 +90,7 @@
пÑогÑÐ°Ð¼Ð¼Ñ Ð·Ð° денÑги?</a></li>
<li><a href="#DoesTheGPLAllowDownloadFee">ÐозволÑÐµÑ Ð»Ð¸ мне
GPL бÑаÑÑ Ð¿Ð»Ð°ÑÑ Ð·Ð°
-полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑайÑа?</a></li>
+полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾
ÑаÑпÑоÑÑÑанÑÑÑего ÑайÑа?</a></li>
<li><a href="#DoesTheGPLAllowRequireFee">ÐозволÑÐµÑ Ð»Ð¸ мне
GPL ÑÑебоваÑÑ, ÑÑобÑ
вÑÑкий, кÑо полÑÑÐ°ÐµÑ Ð¿ÑогÑаммÑ, плаÑил мне
или извеÑал менÑ?</a></li>
@@ -815,8 +815,8 @@
Ð Ñазделе 2 Ñказано, ÑÑо измененнÑе
веÑÑии, коÑоÑÑе Ð²Ñ ÑаÑпÑоÑÑÑанÑеÑе,
Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð»Ð¸ÑензиÑÐ¾Ð²Ð°Ð½Ñ Ð´Ð»Ñ Ð²ÑеÑ
ÑÑеÑÑиÑ
ÑÑоÑон по GPL. Слова “вÑе
ÑÑеÑÑи ÑÑоÑонє ознаÑаÑÑ Ð°Ð±ÑолÑÑно вÑеÑ
— но ÑÑо не ÑÑебÑеÑ
-Ð¾Ñ Ð²Ð°Ñ <strong>делаÑÑ</strong> Ð´Ð»Ñ Ð½Ð¸Ñ
ÑÑо-Ñо
ÑизиÑеÑки. ÐÑо ÑолÑко знаÑиÑ,
-ÑÑо Ð²Ñ Ð´Ð°Ð»Ð¸ им ÑазÑеÑение пÑименÑÑÑ Ð²Ð°ÑÑ
веÑÑÐ¸Ñ Ð¿Ð¾ GPL. </p></dd>
+Ð¾Ñ Ð²Ð°Ñ <em>делаÑÑ</em> Ð´Ð»Ñ Ð½Ð¸Ñ
ÑÑо-Ñо
ÑизиÑеÑки. ÐÑо ÑолÑко знаÑиÑ, ÑÑо вÑ
+дали им ÑазÑеÑение пÑименÑÑÑ Ð²Ð°ÑÑ Ð²ÐµÑÑиÑ
по GPL. </p></dd>
<dt id="RequiredToClaimCopyright">ТÑебÑеÑÑÑ Ð»Ð¸ Ð¾Ñ Ð¼ÐµÐ½Ñ
заÑвление авÑоÑÑкиÑ
пÑав на мои изменениÑ
в пÑогÑамме
@@ -865,7 +865,8 @@
обÑзаÑелÑное пиÑÑменное пÑедложение
поÑÑавки иÑÑ
одного ÑекÑÑа, коÑоÑое
должно ÑопÑовождаÑÑ Ð²ÑпÑÑк ÑолÑко
двоиÑнÑÑ
Ñайлов).</p></dd>
-<dt id="DoesTheGPLAllowDownloadFee">ÐозволÑÐµÑ Ð»Ð¸ мне GPL
бÑаÑÑ Ð¿Ð»Ð°ÑÑ Ð·Ð° полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾
ÑайÑа?</dt>
+<dt id="DoesTheGPLAllowDownloadFee">ÐозволÑÐµÑ Ð»Ð¸ мне GPL
бÑаÑÑ Ð¿Ð»Ð°ÑÑ Ð·Ð° полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾
+ÑаÑпÑоÑÑÑанÑÑÑего ÑайÑа?</dt>
<dd><p>
Ðа. ÐÑ Ð¼Ð¾Ð¶ÐµÑе бÑаÑÑ Ð»ÑбÑÑ Ð¿Ð»Ð°ÑÑ, какÑÑ
ÑолÑко пожелаеÑе, за ÑаÑпÑоÑÑÑанение
копии пÑогÑаммÑ. ÐÑли Ð²Ñ ÑаÑпÑоÑÑÑанÑеÑе
двоиÑнÑе ÑÐ°Ð¹Ð»Ñ Ð¿Ð¾ ÑеÑи, Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
@@ -885,7 +886,12 @@
<p>GPL — лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, и
ÑледоваÑелÑно, она ÑазÑеÑаеÑ
лÑдÑм иÑполÑзоваÑÑ Ð¸ даже ÑаÑпÑоÑÑÑанÑÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð»Ð°ÑиÑÑ Ð·Ð°
-ÑÑо ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни бÑло.</p></dd>
+ÑÑо ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни бÑло.</p>
+
+<p>ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a
+href="DoesTheGPLAllowMoney">полÑÑение копии оÑ
<em>ваÑ</em></a>. ÐÑ Ð½Ðµ
+можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди плаÑили вам,
когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>оÑ
+кого-Ñо дÑÑгого</em>.</p></dd>
<dt id="DoesTheGPLRequireAvailabilityToPublic">ÐÑли Ñ
ÑаÑпÑоÑÑÑанÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL за денÑги,
ÑÑебÑеÑÑÑ Ð»Ð¸ Ð¾Ñ Ð¼ÐµÐ½Ñ Ñакже
@@ -3750,7 +3756,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/06/28 09:28:40 $
+$Date: 2014/10/11 06:28:58 $
<!-- timestamp end -->
</p>
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- license-list.ru.html 10 Sep 2014 11:56:45 -0000 1.70
+++ license-list.ru.html 11 Oct 2014 06:28:58 -0000 1.71
@@ -1858,6 +1858,29 @@
NASA и пÑизовиÑе пÑименÑÑÑ Ð½Ð°ÑÑоÑÑÑÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм.</p></dd>
+<dt><a id="OculusRift"
+href="http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License">
+ÐиÑÐµÐ½Ð·Ð¸Ñ Oculus Rift SDK</a> <span class="anchor-reference-id"> (<a
+href="#OculusRiftSDK">#OculusRiftSDK</a>)</span></dt>
+<dd>
+<p>ÐÑо не лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, в ней
еÑÑÑ Ð½ÐµÑколÑко кÑиÑиÑеÑкиÑ
+недоÑÑаÑков.
+</p>
+
+<ul>
+<li>ÐелÑÐ·Ñ ÑаÑпÑоÑÑÑанÑÑÑ Ð½Ð¸ÑÑо менÑÑее,
Ñем вÑÑ Ð¿ÑогÑамма libOVR.</li>
+<li>ÐÑава на ÑаÑпÑоÑÑÑанение могÑÑ Ð±ÑÑÑ
пÑеÑÐ²Ð°Ð½Ñ Ð½Ð° неÑÑнÑÑ
ÑÑловиÑÑ
.</li>
+<li>Те, кÑо Ð´ÐµÐ»Ð°ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñе веÑÑии, должнÑ
вÑÑÑлаÑÑ Ð¸Ñ
в Oculus по ÑÑебованиÑ.</li>
+<li>ÐÑполÑзование допÑÑкаеÑÑÑ ÑолÑко Ñ Ð¸Ñ
пÑодÑкÑом.</li>
+<li>ÐовÑе веÑÑии лиÑензии полноÑÑÑÑ
заменÑÑÑ ÑÑаÑÑе веÑÑии; ÑÑо знаÑиÑ, ÑÑо Ñже
+вÑданнÑе ÑазÑеÑÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ
оÑозванÑ.</li>
+</ul>
+
+ÐогÑÑ Ð±ÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑе кÑиÑиÑеÑкие
недоÑÑаÑки; поÑле Ñого как Ð¼Ñ Ð½Ð°Ñли иÑ
+в Ñаком колиÑеÑÑве, Ð¼Ñ Ð¾ÑказалиÑÑ Ð¾Ñ
далÑнейÑего анализа.
+</dd>
+
+
<dt><!-- old id, leave for compatibility -->
<a id="OPL"></a> <a id="OpenPublicL"
href="http://directory.fsf.org/wiki/License:OpenPLv1.0"> ÐÑкÑÑÑаÑ
@@ -1937,12 +1960,15 @@
<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>
+href="http://directory.fsf.org/wiki/License:Scratch">ÐиÑÐµÐ½Ð·Ð¸Ñ Scratch
+1.4</a> <span class="anchor-reference-id"> (<a
+href="#Scratch">#Scratch</a>)</span></dt>
<dd>
<p>ÐÑо не лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм,
поÑÐ¾Ð¼Ñ ÑÑо она не допÑÑкаеÑ
коммеÑÑеÑкого пеÑеÑаÑпÑоÑÑÑанениÑ. ÐÑоме
Ñого, ÑÑловие 4 ÑÑÑеÑÑвенно
-огÑаниÑÐ¸Ð²Ð°ÐµÑ ÑÑнкÑионалÑноÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÑ
веÑÑий.</p></dd>
+огÑаниÑÐ¸Ð²Ð°ÐµÑ ÑÑнкÑионалÑноÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÑ
веÑÑий.</p>
+
+<p>Ð ÑÑаÑÑÑÑ, Scratch 2.0 ÑаÑпÑоÑÑÑанÑеÑÑÑ
ÑепеÑÑ Ð¿Ð¾ GNU GPL.</p></dd>
<dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM">
ÐиÑензиÑ
@@ -2530,7 +2556,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/09/10 11:56:45 $
+$Date: 2014/10/11 06:28:58 $
<!-- timestamp end -->
</p>
Index: old-licenses/gpl-2.0-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/gpl-2.0-faq.ru.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- old-licenses/gpl-2.0-faq.ru.html 12 Apr 2014 13:54:15 -0000 1.32
+++ old-licenses/gpl-2.0-faq.ru.html 11 Oct 2014 06:29:00 -0000 1.33
@@ -1,11 +1,9 @@
-
+<!--#set var="ENGLISH_PAGE" value="/licenses/old-licenses/gpl-2.0-faq.en.html"
-->
<!--#include virtual="/server/header.ru.html" -->
<!-- Parent-Version: 1.77 -->
<!-- This file is automatically generated by GNUnited Nations! -->
- <!--#set var="ENGLISH_PAGE"
value="/licenses/old-licenses/gpl-2.0-faq.en.html" -->
-
<title>ÐÑвеÑÑ Ð½Ð° вопÑоÑÑ Ð¾ GNU GPL v2.0 - пÑÐ¾ÐµÐºÑ GNU -
Фонд Ñвободного пÑогÑаммного
обеÑпеÑениÑ</title>
@@ -108,7 +106,7 @@
<li><a href="#DoesTheGPLAllowDownloadFee"
name="TOCDoesTheGPLAllowDownloadFee">ÐозволÑÐµÑ Ð»Ð¸ мне GPL
бÑаÑÑ Ð¿Ð»Ð°ÑÑ Ð·Ð°
-полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑайÑа?</a></li>
+полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾
ÑаÑпÑоÑÑÑанÑÑÑего ÑайÑа?</a></li>
<li><a href="#DoesTheGPLAllowRequireFee"
name="TOCDoesTheGPLAllowRequireFee">ÐозволÑÐµÑ Ð»Ð¸ мне GPL
ÑÑебоваÑÑ, ÑÑобÑ
@@ -602,8 +600,7 @@
<dd>
ÐеÑ. GPL Ð´Ð°ÐµÑ ÐµÐ¼Ñ ÑазÑеÑение ÑоздаваÑÑ Ð¸
ÑаÑпÑоÑÑÑанÑÑÑ ÐºÐ¾Ð¿Ð¸Ð¸ пÑогÑаммÑ,
<em>еÑли он ÑеÑÐ¸Ñ ÑÑо делаÑÑ</em>. У него еÑÑÑ
Ñакже пÑаво не ÑаÑпÑоÑÑÑанÑÑÑ
-пÑогÑаммÑ, еÑли Ñаково его ÑеÑение.
-<p></p></dd>
+пÑогÑаммÑ, еÑли Ñаково его ÑеÑение.<p></p></dd>
<dt><a href="#TOCWhatDoesWrittenOfferValid"
name="WhatDoesWrittenOfferValid">ЧÑо
ознаÑÐ°ÐµÑ Ð² GPL веÑÑии 2 “пиÑÑменное
пÑедложение, дейÑÑвиÑелÑное
@@ -685,7 +682,7 @@
<dt><a href="#TOCDoesTheGPLAllowDownloadFee"
name="DoesTheGPLAllowDownloadFee">ÐозволÑÐµÑ Ð»Ð¸ мне GPL
бÑаÑÑ Ð¿Ð»Ð°ÑÑ Ð·Ð°
-полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑайÑа?</a></dt>
+полÑÑение пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¼Ð¾ÐµÐ³Ð¾
ÑаÑпÑоÑÑÑанÑÑÑего ÑайÑа?</a></dt>
<dd>
Ðа. ÐÑ Ð¼Ð¾Ð¶ÐµÑе бÑаÑÑ Ð»ÑбÑÑ Ð¿Ð»Ð°ÑÑ, какÑÑ
ÑолÑко пожелаеÑе, за ÑаÑпÑоÑÑÑанение
@@ -707,8 +704,12 @@
<p>
GPL — лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, и
ÑледоваÑелÑно, она ÑазÑеÑаеÑ
лÑдÑм иÑполÑзоваÑÑ Ð¸ даже ÑаÑпÑоÑÑÑанÑÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð»Ð°ÑиÑÑ Ð·Ð°
-ÑÑо ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни бÑло.
-</p></dd>
+ÑÑо ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни бÑло.</p>
+
+<p>ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a
+href="DoesTheGPLAllowMoney">полÑÑение копии оÑ
<em>ваÑ</em></a>. ÐÑ Ð½Ðµ
+можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди плаÑили вам,
когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>оÑ
+кого-Ñо дÑÑгого</em>.</p></dd>
<dt><a href="#TOCDoesTheGPLRequireAvailabilityToPublic"
name="DoesTheGPLRequireAvailabilityToPublic">ÐÑли Ñ
ÑаÑпÑоÑÑÑанÑÑ Ð¿ÑогÑаммÑ
@@ -2483,7 +2484,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/04/12 13:54:15 $
+$Date: 2014/10/11 06:29:00 $
<!-- timestamp end -->
</p>
Index: old-licenses/po/gpl-2.0-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- old-licenses/po/gpl-2.0-faq.ru-en.html 12 Apr 2014 13:54:20 -0000
1.26
+++ old-licenses/po/gpl-2.0-faq.ru-en.html 11 Oct 2014 06:29:00 -0000
1.27
@@ -99,7 +99,8 @@
<li><a href="#DoesTheGPLAllowDownloadFee"
name="TOCDoesTheGPLAllowDownloadFee"> Does the GPL allow me to
- charge a fee for downloading the program from my site?</a></li>
+ charge a fee for downloading the program from my distribution
+ site?</a></li>
<li><a href="#DoesTheGPLAllowRequireFee"
name="TOCDoesTheGPLAllowRequireFee">
Does the GPL allow me to require that anyone who receives the software
@@ -594,9 +595,9 @@
<dd>
No. The GPL gives him permission to make and redistribute copies of
-the program <em>if he chooses to do so</em>. He also has the right
-not to redistribute the program, if that is what he chooses.
-<p></p></dd>
+the program <em>if and when he chooses to do so</em>. He also has the
+right not to redistribute the program, when that is what he
+chooses.<p></p></dd>
<dt><b><a href="#TOCWhatDoesWrittenOfferValid"
name="WhatDoesWrittenOfferValid"> What does this
@@ -678,7 +679,7 @@
<dt><b><a href="#TOCDoesTheGPLAllowDownloadFee"
name="DoesTheGPLAllowDownloadFee">
Does the GPL allow me to
- charge a fee for downloading the program from my site?</a></b></dt>
+ charge a fee for downloading the program from my distribution
site?</a></b></dt>
<dd>
Yes. You can charge any fee you wish for distributing a copy of the
@@ -701,8 +702,12 @@
<p>
The GPL is a free software license, and therefore it permits people
to use and even redistribute the software without being required to
-pay anyone a fee for doing so.
-</p></dd>
+pay anyone a fee for doing so.</p>
+
+<p>You <em>can</em> charge people a fee
+to <a href="DoesTheGPLAllowMoney">get a copy <em>from you</em></a>.
+You can't require people to pay you when they get a copy <em>from
+someone else</em>.</p></dd>
<dt><b><a href="#TOCDoesTheGPLRequireAvailabilityToPublic"
name="DoesTheGPLRequireAvailabilityToPublic">If I
@@ -2461,7 +2466,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:54:20 $
+$Date: 2014/10/11 06:29:00 $
<!-- timestamp end -->
</p>
</div>
Index: old-licenses/po/gpl-2.0-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- old-licenses/po/gpl-2.0-faq.ru.po 11 Oct 2014 06:22:55 -0000 1.28
+++ old-licenses/po/gpl-2.0-faq.ru.po 11 Oct 2014 06:29:01 -0000 1.29
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-10-11 05:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -234,13 +233,6 @@
"ли мне GPL пÑодаваÑÑ ÐºÐ¾Ð¿Ð¸Ð¸ пÑогÑÐ°Ð¼Ð¼Ñ Ð·Ð°
денÑги?</a>"
#. type: Content of: <ul><li>
-# | <a href=\"#DoesTheGPLAllowDownloadFee\"
-# | name=\"TOCDoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a
-# | fee for downloading the program from my {+distribution+} site?</a>
-#| msgid ""
-#| "<a href=\"#DoesTheGPLAllowDownloadFee\" name="
-#| "\"TOCDoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a fee "
-#| "for downloading the program from my site?</a>"
msgid ""
"<a href=\"#DoesTheGPLAllowDownloadFee\" name=\"TOCDoesTheGPLAllowDownloadFee"
"\"> Does the GPL allow me to charge a fee for downloading the program from "
@@ -1328,14 +1320,6 @@
"копиÑ?</a>"
#. type: Content of: <dl><dd>
-# | No. The GPL gives him permission to make and redistribute copies of the
-# | program <em>if {+and when+} he chooses to do so</em>. He also has the
-# | right not to redistribute the program, [-if-] {+when+} that is what he
-# | chooses.
-#| msgid ""
-#| "No. The GPL gives him permission to make and redistribute copies of the "
-#| "program <em>if he chooses to do so</em>. He also has the right not to "
-#| "redistribute the program, if that is what he chooses."
msgid ""
"No. The GPL gives him permission to make and redistribute copies of the "
"program <em>if and when he chooses to do so</em>. He also has the right not "
@@ -1500,13 +1484,6 @@
"должно ÑопÑовождаÑÑ Ð²ÑпÑÑк ÑолÑко
двоиÑнÑÑ
Ñайлов)."
#. type: Content of: <dl><dt>
-# | <b><a href=\"#TOCDoesTheGPLAllowDownloadFee\"
-# | name=\"DoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a fee
-# | for downloading the program from my {+distribution+} site?</a></b>
-#| msgid ""
-#| "<b><a href=\"#TOCDoesTheGPLAllowDownloadFee\" name="
-#| "\"DoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a fee for "
-#| "downloading the program from my site?</a></b>"
msgid ""
"<b><a href=\"#TOCDoesTheGPLAllowDownloadFee\" name="
"\"DoesTheGPLAllowDownloadFee\"> Does the GPL allow me to charge a fee for "
@@ -1567,10 +1544,9 @@
"a copy <em>from you</em></a>. You can't require people to pay you when they "
"get a copy <em>from someone else</em>."
msgstr ""
-"ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a "
-"href=\"DoesTheGPLAllowMoney\">полÑÑение копии оÑ
<em>ваÑ</em></a>. ÐÑ Ð½Ðµ "
-"можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди плаÑили вам,
когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>Ð¾Ñ "
-"кого-Ñо дÑÑгого</em>."
+"ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a
href=\"DoesTheGPLAllowMoney"
+"\">полÑÑение копии Ð¾Ñ <em>ваÑ</em></a>. ÐÑ Ð½Ðµ
можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди "
+"плаÑили вам, когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>оÑ
кого-Ñо дÑÑгого</em>."
#. type: Content of: <dl><dt>
msgid ""
Index: po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/gpl-faq.ru-en.html 28 Jun 2014 09:28:41 -0000 1.40
+++ po/gpl-faq.ru-en.html 11 Oct 2014 06:29:02 -0000 1.41
@@ -89,7 +89,8 @@
copies of the program for money?</a></li>
<li><a href="#DoesTheGPLAllowDownloadFee">Does the GPL allow me to
- charge a fee for downloading the program from my site?</a></li>
+ charge a fee for downloading the program from my distribution
+ site?</a></li>
<li><a href="#DoesTheGPLAllowRequireFee">Does the GPL allow me to
require that anyone who receives the software must pay me a fee
@@ -802,8 +803,9 @@
>#CanIDemandACopy</a>)</span></dt>
<dd><p>
No. The GPL gives him permission to make and redistribute copies of
-the program <em>if he chooses to do so</em>. He also has the right not to
-redistribute the program, if that is what he chooses.</p></dd>
+the program <em>if and when he chooses to do so</em>. He also has the
+right not to redistribute the program, when that is what he
+chooses.</p></dd>
<dt id="WhatDoesWrittenOfferValid">What does “written offer
@@ -838,7 +840,7 @@
Section 2 says that modified versions you distribute must be
licensed to all third parties under the GPL. “All third
parties” means absolutely everyone—but this does not require
-you to *do* anything physically for them. It only means they have a
+you to <em>do</em> anything physically for them. It only means they have a
license from you, under the GPL, for your version. </p></dd>
@@ -893,7 +895,7 @@
binary-only release.)</p></dd>
<dt id="DoesTheGPLAllowDownloadFee">Does the GPL allow me to charge a
- fee for downloading the program from my site?</dt>
+ fee for downloading the program from my distribution site?</dt>
<dd><p>
Yes. You can charge any fee you wish for distributing a copy of the
program. If you distribute binaries by download, you must provide
@@ -916,7 +918,12 @@
<p>The GPL is a free software license, and therefore it permits people
to use and even redistribute the software without being required to
-pay anyone a fee for doing so.</p></dd>
+pay anyone a fee for doing so.</p>
+
+<p>You <em>can</em> charge people a fee
+to <a href="DoesTheGPLAllowMoney">get a copy <em>from you</em></a>.
+You can't require people to pay you when they get a copy <em>from
+someone else</em>.</p></dd>
<dt id="DoesTheGPLRequireAvailabilityToPublic">If I
@@ -3779,7 +3786,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/28 09:28:41 $
+$Date: 2014/10/11 06:29:02 $
<!-- timestamp end -->
</p>
</div>
Index: po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/gpl-faq.ru.po 11 Oct 2014 06:22:54 -0000 1.73
+++ po/gpl-faq.ru.po 11 Oct 2014 06:29:02 -0000 1.74
@@ -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-10-10 19:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -217,11 +216,6 @@
"пÑогÑÐ°Ð¼Ð¼Ñ Ð·Ð° денÑги?</a>"
#. type: Content of: <ul><li>
-# | <a href=\"#DoesTheGPLAllowDownloadFee\">Does the GPL allow me to charge a
-# | fee for downloading the program from my {+distribution+} site?</a>
-#| msgid ""
-#| "<a href=\"#DoesTheGPLAllowDownloadFee\">Does the GPL allow me to charge a "
-#| "fee for downloading the program from my site?</a>"
msgid ""
"<a href=\"#DoesTheGPLAllowDownloadFee\">Does the GPL allow me to charge a "
"fee for downloading the program from my distribution site?</a>"
@@ -1699,14 +1693,6 @@
"href=\"#CanIDemandACopy\" >#CanIDemandACopy</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | No. The GPL gives him permission to make and redistribute copies of the
-# | program <em>if {+and when+} he chooses to do so</em>. He also has the
-# | right not to redistribute the program, [-if-] {+when+} that is what he
-# | chooses.
-#| msgid ""
-#| "No. The GPL gives him permission to make and redistribute copies of the "
-#| "program <em>if he chooses to do so</em>. He also has the right not to "
-#| "redistribute the program, if that is what he chooses."
msgid ""
"No. The GPL gives him permission to make and redistribute copies of the "
"program <em>if and when he chooses to do so</em>. He also has the right not "
@@ -1777,17 +1763,6 @@
"\"#TheGPLSaysModifiedVersions\" >#TheGPLSaysModifiedVersions</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | Section 2 says that modified versions you distribute must be licensed to
-# | all third parties under the GPL. “All third parties” means
-# | absolutely everyone—but this does not require you to [-*do*-]
-# | {+<em>do</em>+} anything physically for them. It only means they have a
-# | license from you, under the GPL, for your version.
-#| msgid ""
-#| "Section 2 says that modified versions you distribute must be licensed to "
-#| "all third parties under the GPL. “All third parties” means "
-#| "absolutely everyone—but this does not require you to *do* anything "
-#| "physically for them. It only means they have a license from you, under "
-#| "the GPL, for your version."
msgid ""
"Section 2 says that modified versions you distribute must be licensed to all "
"third parties under the GPL. “All third parties” means "
@@ -1798,8 +1773,8 @@
"Ð Ñазделе 2 Ñказано, ÑÑо измененнÑе
веÑÑии, коÑоÑÑе Ð²Ñ ÑаÑпÑоÑÑÑанÑеÑе, "
"Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð»Ð¸ÑензиÑÐ¾Ð²Ð°Ð½Ñ Ð´Ð»Ñ Ð²ÑеÑ
ÑÑеÑÑиÑ
ÑÑоÑон по GPL. Слова “вÑе "
"ÑÑеÑÑи ÑÑоÑонє ознаÑаÑÑ Ð°Ð±ÑолÑÑно
вÑеÑ
— но ÑÑо не ÑÑебÑÐµÑ "
-"Ð¾Ñ Ð²Ð°Ñ <em>делаÑÑ</em> Ð´Ð»Ñ Ð½Ð¸Ñ
ÑÑо-Ñо
ÑизиÑеÑки. ÐÑо ÑолÑко знаÑиÑ, "
-"ÑÑо Ð²Ñ Ð´Ð°Ð»Ð¸ им ÑазÑеÑение пÑименÑÑÑ Ð²Ð°ÑÑ
веÑÑÐ¸Ñ Ð¿Ð¾ GPL."
+"Ð¾Ñ Ð²Ð°Ñ <em>делаÑÑ</em> Ð´Ð»Ñ Ð½Ð¸Ñ
ÑÑо-Ñо
ÑизиÑеÑки. ÐÑо ÑолÑко знаÑиÑ, ÑÑо Ð²Ñ "
+"дали им ÑазÑеÑение пÑименÑÑÑ Ð²Ð°ÑÑ Ð²ÐµÑÑиÑ
по GPL."
#. type: Content of: <dl><dt>
msgid ""
@@ -1904,11 +1879,6 @@
"должно ÑопÑовождаÑÑ Ð²ÑпÑÑк ÑолÑко
двоиÑнÑÑ
Ñайлов)."
#. type: Content of: <dl><dt>
-# | Does the GPL allow me to charge a fee for downloading the program from my
-# | {+distribution+} site?
-#| msgid ""
-#| "Does the GPL allow me to charge a fee for downloading the program from my "
-#| "site?"
msgid ""
"Does the GPL allow me to charge a fee for downloading the program from my "
"distribution site?"
@@ -1967,10 +1937,9 @@
"a copy <em>from you</em></a>. You can't require people to pay you when they "
"get a copy <em>from someone else</em>."
msgstr ""
-"ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a "
-"href=\"DoesTheGPLAllowMoney\">полÑÑение копии оÑ
<em>ваÑ</em></a>. ÐÑ Ð½Ðµ "
-"можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди плаÑили вам,
когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>Ð¾Ñ "
-"кого-Ñо дÑÑгого</em>."
+"ÐÑ <em>можеÑе</em> взимаÑÑ Ð¿Ð»Ð°ÑÑ Ñ Ð»Ñдей за <a
href=\"DoesTheGPLAllowMoney"
+"\">полÑÑение копии Ð¾Ñ <em>ваÑ</em></a>. ÐÑ Ð½Ðµ
можеÑе ÑÑебоваÑÑ, ÑÑÐ¾Ð±Ñ Ð»Ñди "
+"плаÑили вам, когда они полÑÑаÑÑ ÐºÐ¾Ð¿Ð¸Ñ <em>оÑ
кого-Ñо дÑÑгого</em>."
#. type: Content of: <dl><dt>
msgid ""
Index: po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- po/license-list.ru-en.html 10 Sep 2014 11:56:46 -0000 1.62
+++ po/license-list.ru-en.html 11 Oct 2014 06:29:05 -0000 1.63
@@ -1878,6 +1878,29 @@
truly free software license.</p></dd>
+<dt><a id="OculusRift"
href="http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License">
+ Oculus Rift SDK License</a>
+ <span class="anchor-reference-id">
+ (<a href="#OculusRiftSDK">#OculusRiftSDK</a>)</span></dt>
+<dd>
+<p>This is not a free software license; it has several fatal flaws.
+</p>
+
+<ul>
+<li>One can't redistribute anything less than the whole program libOVR.</li>
+<li>One's distribution rights can be terminated on vague conditions.</li>
+<li>Those who make modified versions are required to send them to
+Oculus on demand.</li>
+<li>Use is allowed only with their product.</li>
+<li>New license versions totally supplant old versions, which means
+that permissions already given can be withdrawn.</li>
+</ul>
+
+There might be additional fatal flaws; after seeing this many,
+we stopped looking for more.
+</dd>
+
+
<dt><a id="OPL"></a> <!-- old id, leave for compatibility -->
<a id="OpenPublicL"
href="http://directory.fsf.org/wiki/License:OpenPLv1.0">
Open Public License</a>
@@ -1952,13 +1975,15 @@
commercial distribution of a modified version. Thankfully, starting from
version 5.0.0, the Scilab software is free software, released under CeCILL
version 2.</p></dd>
-<dt><a id="Scratch"
href="http://directory.fsf.org/wiki/License:Scratch">Scratch</a>
+<dt><a id="Scratch"
href="http://directory.fsf.org/wiki/License:Scratch">Scratch 1.4 license</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 redistribution. In addition, condition 4 substantively
-restricts the functionality of modified versions.</p></dd>
+restricts the functionality of modified versions.</p>
+
+<p>Fortunately Scratch 2.0 is now distributed under the GNU GPL.</p></dd>
<dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM">
@@ -2514,7 +2539,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/09/10 11:56:46 $
+$Date: 2014/10/11 06:29:05 $
<!-- 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.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- po/license-list.ru.po 11 Oct 2014 06:22:54 -0000 1.151
+++ po/license-list.ru.po 11 Oct 2014 06:29:06 -0000 1.152
@@ -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-10-10 21:02+0000\n"
#. type: Content of: <title>
msgid ""
@@ -3742,17 +3741,6 @@
"NASA и пÑизовиÑе пÑименÑÑÑ Ð½Ð°ÑÑоÑÑÑÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм."
#. type: Content of: <dl><dt>
-# | <a [-id=\"gnuplot\"
-# | href=\"http://directory.fsf.org/wiki/License:Gnuplot\"> Gnuplot
-# | license</a>-] {+id=\"OculusRift\"
-# | href=\"http://directory.fsf.org/wiki/License:Oculus_VR_Rift_SDK_License\">
-# | Oculus Rift SDK License</a>+} <span [-class=\"anchor-reference-id\">(<a
-# | href=\"#gnuplot\">#gnuplot</a>)</span>-] {+class=\"anchor-reference-id\">
-# | (<a href=\"#OculusRiftSDK\">#OculusRiftSDK</a>)</span>+}
-#| msgid ""
-#| "<a id=\"gnuplot\" href=\"http://directory.fsf.org/wiki/License:Gnuplot\"> "
-#| "Gnuplot license</a> <span class=\"anchor-reference-id\">(<a href="
-#| "\"#gnuplot\">#gnuplot</a>)</span>"
msgid ""
"<a id=\"OculusRift\" href=\"http://directory.fsf.org/wiki/License:"
"Oculus_VR_Rift_SDK_License\"> Oculus Rift SDK License</a> <span class="
@@ -3765,9 +3753,6 @@
"span>"
#. type: Content of: <dl><dd><p>
-# | This is {+not+} a free software [-license and is GPL compatible.-]
-# | {+license; it has several fatal flaws.+}
-#| msgid "This is a free software license and is GPL compatible."
msgid "This is not a free software license; it has several fatal flaws."
msgstr ""
"ÐÑо не лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, в ней
еÑÑÑ Ð½ÐµÑколÑко кÑиÑиÑеÑкиÑ
"
@@ -3979,23 +3964,14 @@
"веÑÑии 2."
#. type: Content of: <dl><dt>
-# | <a id=\"Scratch\"
-# | [-href=\"http://directory.fsf.org/wiki/License:Scratch\">Scratch</a>-]
-# | {+href=\"http://directory.fsf.org/wiki/License:Scratch\">Scratch 1.4
-# | license</a>+} <span class=\"anchor-reference-id\"> (<a
-# | href=\"#Scratch\">#Scratch</a>)</span>
-#| msgid ""
-#| "<a id=\"Scratch\" href=\"http://directory.fsf.org/wiki/License:Scratch"
-#| "\">Scratch</a> <span class=\"anchor-reference-id\"> (<a href=\"#Scratch"
-#| "\">#Scratch</a>)</span>"
msgid ""
"<a id=\"Scratch\" href=\"http://directory.fsf.org/wiki/License:Scratch"
"\">Scratch 1.4 license</a> <span class=\"anchor-reference-id\"> (<a href="
"\"#Scratch\">#Scratch</a>)</span>"
msgstr ""
"<a id=\"Scratch\" href=\"http://directory.fsf.org/wiki/License:Scratch"
-"\">ÐиÑÐµÐ½Ð·Ð¸Ñ Scratch 1.4</a> <span class=\"anchor-reference-id\"> (<a
href=\"#Scratch"
-"\">#Scratch</a>)</span>"
+"\">ÐиÑÐµÐ½Ð·Ð¸Ñ Scratch 1.4</a> <span class=\"anchor-reference-id\"> (<a
href="
+"\"#Scratch\">#Scratch</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses gpl-faq.ru.html license-list.ru.ht...,
GNUN <=