[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-list.ru.html po/license-li...
From: |
GNUN |
Subject: |
www/licenses license-list.ru.html po/license-li... |
Date: |
Fri, 8 Jul 2016 17:31:51 +0000 (UTC) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/07/08 17:31:51
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.99&r2=1.100
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.248&r2=1.249
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- license-list.ru.html 29 Jun 2016 15:00:43 -0000 1.99
+++ license-list.ru.html 8 Jul 2016 17:31:50 -0000 1.100
@@ -615,22 +615,28 @@
<dt><a id="ISC" href="http://directory.fsf.org/wiki/License:ISC">
ÐиÑензиÑ
ISC</a> <span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
<dd>
-<p>ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ Ñакже назÑваеÑÑÑ Ð¸Ð½Ð¾Ð³Ð´Ð°
лиÑензией OpenBSD. ÐÑо лиÑензиÑ
-либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑÐ½Ð°Ñ ÑвободнÑÑ
пÑогÑамм, ÑовмеÑÑÐ¸Ð¼Ð°Ñ Ñ GNU GPL.</p>
+<p>ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она
+ÑовмеÑÑима Ñ GNU GPL.</p>
-<p>Ð ÑÑой лиÑензии вÑе же еÑÑÑ Ð½ÐµÑдаÑно
вÑбÑÐ°Ð½Ð½Ð°Ñ ÑоÑмÑлиÑовка: она
-пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм “РазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, изменÑÑÑ
-и/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...”
ÐÑо пÑимеÑно Ñе же вÑÑажениÑ,
-ÑÑо в лиÑензии Pine, о коÑоÑой ÐаÑингÑонÑкий
ÑнивеÑÑиÑÐµÑ Ð²Ð¿Ð¾ÑледÑÑвии
-заÑвил, ÑÑо они запÑеÑаÑÑ Ð»ÑдÑм
ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñе веÑÑии
пÑогÑамм.</p>
-
-<p>Ð ISC нам Ñказали, ÑÑо они не ÑазделÑÑÑ
Ñолкование ÐаÑингÑонÑкого
-ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ Ð²Ñе оÑнованиÑ
веÑиÑÑ ÑÑомÑ. Таким обÑазом, неÑ
-пÑиÑин избегаÑÑ Ð¿ÑогÑамм, вÑпÑÑеннÑÑ
под
ÑÑой лиÑензией. Ðднако ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ
-гаÑанÑиÑоваÑÑ, ÑÑо Ñакие ÑоÑмÑлиÑовки не
ÑоздадÑÑ Ð¿Ñоблем в бÑдÑÑем, мÑ
-ÑекомендÑем ÑазÑабоÑÑикам вÑбиÑаÑÑ Ð´Ð»Ñ
ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑÐ°Ð±Ð¾Ñ Ð´ÑÑгие
-лиÑензии. <a href="#Expat">ÐиÑÐµÐ½Ð·Ð¸Ñ Expat</a> и <a
href="#FreeBSD"> ÐиÑензиÑ
-FreeBSD</a> пÑимеÑно Ñак же неогÑаниÑиÑелÑна и
кÑаÑка.</p></dd>
+<p>ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñакже назÑваÑÑ Ð¸Ð½Ð¾Ð³Ð´Ð°
лиÑензией OpenBSD, Ñ
оÑÑ Ð¼ÐµÐ¶Ð´Ñ ÑÑими двÑмÑ
+лиÑензиÑми еÑÑÑ Ð¾Ð´Ð½Ð¾ неболÑÑое ÑазлиÑие.
ÐиÑÐµÐ½Ð·Ð¸Ñ OpenBSD бÑла изменена,
+ÑÑÐ¾Ð±Ñ ÑÑÑÑаниÑÑ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñное вÑÑажение:
“и/или”. ÐиÑÐµÐ½Ð·Ð¸Ñ ISC
+пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм “ÑазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, изменÑÑÑ
+и/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...”, в
Ñо вÑÐµÐ¼Ñ ÐºÐ°Ðº лиÑензиÑ
+OpenBSD пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм
“ÑазÑеÑение пÑименÑÑÑ, копиÑоваÑÑ,
+изменÑÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ...?rdquo;. </p>
+
+<p>Ðогда бÑла вÑпÑÑена лиÑÐµÐ½Ð·Ð¸Ñ ISC,
конÑÑÑÑкÑÐ¸Ñ “и/или” вÑзÑвала
+опаÑениÑ, поÑÐ¾Ð¼Ñ ÑÑо она ÑÑ
одна Ñ
ÑоÑмÑлиÑовкой, пÑименÑвÑейÑÑ Ð² лиÑензии
+Pine, коÑоÑаÑ, как заÑвил впоÑледÑÑвии
ÑнивеÑÑиÑÐµÑ ÐаÑингÑона, запÑеÑала
+ÑаÑпÑоÑÑÑанение измененнÑÑ
веÑÑий
пÑогÑамм. Ðднако в ISC нам Ñказали, ÑÑо
+они не ÑазделÑÑÑ Ñолкование
ÐаÑингÑонÑкого ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ
вÑе
+оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑиÑÑ ÑÑомÑ. Таким обÑазом, неÑ
пÑиÑин избегаÑÑ Ð¿ÑогÑамм,
+вÑпÑÑеннÑÑ
под ÑÑой лиÑензией. Ðднако
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ, ÑÑо Ñакие
+ÑоÑмÑлиÑовки не ÑоздадÑÑ Ð¿Ñоблем в
бÑдÑÑем, Ð¼Ñ ÑекомендÑем ÑазÑабоÑÑикам
+вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑабоÑ
дÑÑгие лиÑензии. <a
+href="#Expat">ÐиÑÐµÐ½Ð·Ð¸Ñ Expat</a> и <a href="#FreeBSD">
ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a>
+пÑимеÑно Ñак же неогÑаниÑиÑелÑна и
кÑаÑка.</p></dd>
<dt><a id="MPL-2.0"
@@ -2661,7 +2667,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2016/06/29 15:00:43 $
+$Date: 2016/07/08 17:31:50 $
<!-- 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.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- po/license-list.ru-en.html 29 Jun 2016 15:00:44 -0000 1.92
+++ po/license-list.ru-en.html 8 Jul 2016 17:31:51 -0000 1.93
@@ -633,23 +633,30 @@
ISC License</a>
<span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
<dd>
-<p>This license is sometimes also known as the OpenBSD License. It is a
-lax, permissive free software license, and compatible with the GNU GPL.</p>
+<p>This is a lax, permissive free software license, and compatible
+with the GNU GPL.</p>
-<p>This license does have an unfortunate wording choice: it provides
-recipients with "Permission to use, copy, modify, and/or distribute
-this software…" This is roughly the same language from the
-license of Pine that the University of Washington later claimed
-prohibited people from distributing modified versions of the
-software.</p>
-
-<p>ISC has told us they do not share the University of Washington's
-interpretation, and we have every reason to believe them. Thus, there's
-no reason to avoid software released under this license. However, to
-help make sure this language cannot cause any trouble in the future, we
-encourage developers to choose a different license for their own works.
-The <a href="#Expat">Expat License</a> and <a href="#FreeBSD">FreeBSD
-License</a> are similarly permissive and brief.</p></dd>
+<p>This license is sometimes also known as the OpenBSD License,
+although there is one minor difference between the two licenses. The
+OpenBSD license was updated to remove the ambiguous term:
+"and/or". The ISC license provides recipients with
+"Permission to use, copy, modify, and/or distribute this
+software…", whereas the OpenBSD license provides
+recipients with "Permission to use, copy, modify, and
+distribute…". </p>
+
+<p>At the time the ISC license was released, the use of
+"and/or" construct was a concern because it is similar
+language used in the license of Pine that the University of Washington
+later claimed prohibited people from distributing modified versions of
+the software. However, ISC has told us they do not share the
+University of Washington's interpretation, and we have every reason to
+believe them. Thus, there's no reason to avoid software released
+under this license. However, to help make sure this language cannot
+cause any trouble in the future, we encourage developers to choose a
+different license for their own works. The <a href="#Expat">Expat
+License</a> and <a href="#FreeBSD">FreeBSD License</a> are similarly
+permissive and brief.</p></dd>
<dt><a id="MPL-2.0"
@@ -2650,7 +2657,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/29 15:00:44 $
+$Date: 2016/07/08 17:31:51 $
<!-- 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.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- po/license-list.ru.po 8 Jul 2016 17:22:47 -0000 1.248
+++ po/license-list.ru.po 8 Jul 2016 17:31:51 -0000 1.249
@@ -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: 2016-07-08 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1129,16 +1128,12 @@
"span>"
#. type: Content of: <dl><dd><p>
-# | This is a lax, permissive [-non-copyleft-] free software license, {+and+}
-# | compatible with the GNU GPL.
-#| msgid ""
-#| "This is a lax, permissive non-copyleft free software license, compatible "
-#| "with the GNU GPL."
msgid ""
"This is a lax, permissive free software license, and compatible with the GNU "
"GPL."
msgstr ""
-"ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она
ÑовмеÑÑима Ñ GNU GPL."
+"ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она "
+"ÑовмеÑÑима Ñ GNU GPL."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1151,33 +1146,14 @@
""."
msgstr ""
"ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñакже назÑваÑÑ Ð¸Ð½Ð¾Ð³Ð´Ð°
лиÑензией OpenBSD, Ñ
оÑÑ Ð¼ÐµÐ¶Ð´Ñ ÑÑими двÑÐ¼Ñ "
-"лиÑензиÑми еÑÑÑ Ð¾Ð´Ð½Ð¾ неболÑÑое ÑазлиÑие.
ÐиÑÐµÐ½Ð·Ð¸Ñ OpenBSD бÑла изменена, ÑÑÐ¾Ð±Ñ "
-"ÑÑÑÑаниÑÑ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñное вÑÑажение:
“и/или”. ÐиÑÐµÐ½Ð·Ð¸Ñ ISC "
-"пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм “ÑазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, "
-"изменÑÑÑ Ð¸/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи
пÑогÑаммÑ...”, в Ñо вÑÐµÐ¼Ñ ÐºÐ°Ðº лиÑÐµÐ½Ð·Ð¸Ñ "
+"лиÑензиÑми еÑÑÑ Ð¾Ð´Ð½Ð¾ неболÑÑое ÑазлиÑие.
ÐиÑÐµÐ½Ð·Ð¸Ñ OpenBSD бÑла изменена, "
+"ÑÑÐ¾Ð±Ñ ÑÑÑÑаниÑÑ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñное вÑÑажение:
“и/или”. ÐиÑÐµÐ½Ð·Ð¸Ñ ISC "
+"пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм “ÑазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, изменÑÑÑ "
+"и/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...”,
в Ñо вÑÐµÐ¼Ñ ÐºÐ°Ðº лиÑÐµÐ½Ð·Ð¸Ñ "
"OpenBSD пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм
“ÑазÑеÑение пÑименÑÑÑ, копиÑоваÑÑ, "
"изменÑÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ...?rdquo;."
#. type: Content of: <dl><dd><p>
-# | {+At the time the ISC license was released, the use of "and/or"
-# | construct was a concern because it is similar language used in the license
-# | of Pine that the University of Washington later claimed prohibited people
-# | from distributing modified versions of the software. However,+} ISC has
-# | told us they do not share the University of Washington's interpretation,
-# | and we have every reason to believe them. Thus, there's no reason to
-# | avoid software released under this license. However, to help make sure
-# | this language cannot cause any trouble in the future, we encourage
-# | developers to choose a different license for their own works. The <a
-# | href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD
-# | License</a> are similarly permissive and brief.
-#| msgid ""
-#| "ISC has told us they do not share the University of Washington's "
-#| "interpretation, and we have every reason to believe them. Thus, there's "
-#| "no reason to avoid software released under this license. However, to "
-#| "help make sure this language cannot cause any trouble in the future, we "
-#| "encourage developers to choose a different license for their own works. "
-#| "The <a href=\"#Expat\">Expat License</a> and <a href=\"#FreeBSD\">FreeBSD "
-#| "License</a> are similarly permissive and brief."
msgid ""
"At the time the ISC license was released, the use of "and/or" "
"construct was a concern because it is similar language used in the license "
@@ -1194,14 +1170,14 @@
"Ðогда бÑла вÑпÑÑена лиÑÐµÐ½Ð·Ð¸Ñ ISC,
конÑÑÑÑкÑÐ¸Ñ “и/или” вÑзÑвала "
"опаÑениÑ, поÑÐ¾Ð¼Ñ ÑÑо она ÑÑ
одна Ñ
ÑоÑмÑлиÑовкой, пÑименÑвÑейÑÑ Ð² лиÑензии "
"Pine, коÑоÑаÑ, как заÑвил впоÑледÑÑвии
ÑнивеÑÑиÑÐµÑ ÐаÑингÑона, запÑеÑала "
-"ÑаÑпÑоÑÑÑанение измененнÑÑ
веÑÑий
пÑогÑамм. Ðднако "
-"в ISC нам Ñказали, ÑÑо они не ÑазделÑÑÑ
Ñолкование ÐаÑингÑонÑкого "
-"ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ Ð²Ñе оÑнованиÑ
веÑиÑÑ ÑÑомÑ. Таким обÑазом, Ð½ÐµÑ "
-"пÑиÑин избегаÑÑ Ð¿ÑогÑамм, вÑпÑÑеннÑÑ
под
ÑÑой лиÑензией. Ðднако ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ "
-"гаÑанÑиÑоваÑÑ, ÑÑо Ñакие ÑоÑмÑлиÑовки не
ÑоздадÑÑ Ð¿Ñоблем в бÑдÑÑем, Ð¼Ñ "
-"ÑекомендÑем ÑазÑабоÑÑикам вÑбиÑаÑÑ Ð´Ð»Ñ
ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑÐ°Ð±Ð¾Ñ Ð´ÑÑгие "
-"лиÑензии. <a href=\"#Expat\">ÐиÑÐµÐ½Ð·Ð¸Ñ Expat</a> и <a
href=\"#FreeBSD\"> "
-"ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a> пÑимеÑно Ñак же
неогÑаниÑиÑелÑна и кÑаÑка."
+"ÑаÑпÑоÑÑÑанение измененнÑÑ
веÑÑий
пÑогÑамм. Ðднако в ISC нам Ñказали, ÑÑо "
+"они не ÑазделÑÑÑ Ñолкование
ÐаÑингÑонÑкого ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ
вÑе "
+"оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑиÑÑ ÑÑомÑ. Таким обÑазом, неÑ
пÑиÑин избегаÑÑ Ð¿ÑогÑамм, "
+"вÑпÑÑеннÑÑ
под ÑÑой лиÑензией. Ðднако
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ, ÑÑо Ñакие "
+"ÑоÑмÑлиÑовки не ÑоздадÑÑ Ð¿Ñоблем в
бÑдÑÑем, Ð¼Ñ ÑекомендÑем ÑазÑабоÑÑикам "
+"вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑабоÑ
дÑÑгие лиÑензии. <a href=\"#Expat"
+"\">ÐиÑÐµÐ½Ð·Ð¸Ñ Expat</a> и <a href=\"#FreeBSD\"> ÐиÑензиÑ
FreeBSD</a> пÑимеÑно "
+"Ñак же неогÑаниÑиÑелÑна и кÑаÑка."
#. type: Content of: <dl><dt>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=