[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/common-distros.ru.html distros/po/c...
From: |
GNUN |
Subject: |
www distros/common-distros.ru.html distros/po/c... |
Date: |
Tue, 8 Jan 2019 08:59:01 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/01/08 08:59:01
Modified files:
distros : common-distros.ru.html
distros/po : common-distros.ru-en.html common-distros.ru.po
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/distros/common-distros.ru.html?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru-en.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.161&r2=1.162
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.115&r2=1.116
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.314&r2=1.315
Patches:
Index: distros/common-distros.ru.html
===================================================================
RCS file: /web/www/www/distros/common-distros.ru.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- distros/common-distros.ru.html 19 Dec 2018 03:02:44 -0000 1.86
+++ distros/common-distros.ru.html 8 Jan 2019 13:59:00 -0000 1.87
@@ -107,12 +107,12 @@
ÑаÑпÑоÑÑÑанÑемÑе оÑделÑно. Ðн Ñоже
недоÑÑаÑоÑно оÑделен Ð¾Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ Ñаздела
диÑÑÑибÑÑива Debian.</p>
-<p>ÐÑедÑдÑÑие вÑпÑÑки Debian вклÑÑали в ÑебÑ
неÑвободнÑе клÑкÑÑ Ð² ÑдÑе
-(Linux). С вÑпÑÑком Debian 6.0 (“squeese”) в
ÑевÑале
-2011 года ÑÑи клÑкÑÑ Ð±Ñли вÑнеÑÐµÐ½Ñ Ð¸Ð·
главного диÑÑÑибÑÑива в оÑделÑнÑе
-пакеÑÑ Ð² неÑвободном Ñазделе. Ðднако
пÑоблема ÑаÑÑиÑно оÑÑаеÑÑÑ: пÑогÑамма
-ÑÑÑановки в некоÑоÑÑÑ
ÑлÑÑаÑÑ
ÑекомендÑеÑ
ÑÑи неÑвободнÑе ÑÐ°Ð¹Ð»Ñ Ñ
-пÑогÑаммами Ð´Ð»Ñ Ð¿ÐµÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв
маÑинÑ.</p>
+<p>Debian — единÑÑвеннÑй из попÑлÑÑнÑÑ
неодобÑеннÑÑ
диÑÑÑибÑÑивов,
+коÑоÑÑй оÑделÑÐµÑ Ð½ÐµÑвободнÑе клÑкÑÑ Ð¾Ñ
Ñвоего главного диÑÑÑибÑÑива. Ðднако
+пÑоблема ÑаÑÑиÑно оÑÑаеÑÑÑ. ФайлÑ
неÑвободнÑÑ
пÑогÑамм Ð´Ð»Ñ ÑÑÑÑойÑÑв
+наÑ
одÑÑÑÑ Ð² Ñазделе “nonfree” Debian, на
коÑоÑÑй ÑÑÑлаеÑÑÑ
+докÑменÑаÑÐ¸Ñ debian.org, а ÑÑÑановÑик в
некоÑоÑÑÑ
ÑлÑÑаÑÑ
ÑекомендÑÐµÑ Ð¸Ñ
длÑ
+пеÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв маÑинÑ.</p>
<p>Ðики Debian ÑодеÑÐ¶Ð¸Ñ ÑÑÑаниÑÑ Ð¾Ð± ÑÑÑановке
неÑвободнÑÑ
пÑогÑамм длÑ
пеÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв.</p>
@@ -360,7 +360,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation,
Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
+Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
@@ -380,7 +381,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2018/12/19 03:02:44 $
+$Date: 2019/01/08 13:59:00 $
<!-- timestamp end -->
</p>
Index: distros/po/common-distros.ru-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru-en.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- distros/po/common-distros.ru-en.html 19 Dec 2018 03:02:44 -0000
1.64
+++ distros/po/common-distros.ru-en.html 8 Jan 2019 13:59:00 -0000
1.65
@@ -98,12 +98,11 @@
proprietary programs. This too is not thoroughly separated from the
main Debian distribution.</p>
-<p>Previous releases of Debian included nonfree blobs with Linux, the
-kernel. With the release of Debian 6.0 (“squeeze”) in
-February 2011, these blobs have been moved out of the main
-distribution to separate packages in the nonfree repository. However,
-the problem partly remains: the installer in some cases recommends
-these nonfree firmware files for the peripherals on the machine.</p>
+<p>Debian is the only common non-endorsed distribution to keep nonfree
+blobs out of its main distribution. However, the problem partly remains.
+The nonfree firmware files live in Debian's nonfree repository, which
+is referenced in the documentation on debian.org, and the installer in
+some cases recommends them for the peripherals on the machine.</p>
<p>Debian's wiki includes pages about installing nonfree firmware.</p>
<!-- https://wiki.debian.org/ATIProprietary -->
@@ -334,7 +333,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation,
Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -344,7 +343,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/19 03:02:44 $
+$Date: 2019/01/08 13:59:00 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- distros/po/common-distros.ru.po 8 Jan 2019 13:54:40 -0000 1.161
+++ distros/po/common-distros.ru.po 8 Jan 2019 13:59:00 -0000 1.162
@@ -17,7 +17,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2019-01-08 09:56+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -246,11 +245,11 @@
"cases recommends them for the peripherals on the machine."
msgstr ""
"Debian — единÑÑвеннÑй из попÑлÑÑнÑÑ
неодобÑеннÑÑ
диÑÑÑибÑÑивов, "
-"коÑоÑÑй оÑделÑÐµÑ Ð½ÐµÑвободнÑе клÑкÑÑ Ð¾Ñ
Ñвоего главного диÑÑÑибÑÑива. "
-"Ðднако пÑоблема ÑаÑÑиÑно оÑÑаеÑÑÑ. ФайлÑ
неÑвободнÑÑ
пÑогÑамм Ð´Ð»Ñ ÑÑÑÑойÑÑв "
+"коÑоÑÑй оÑделÑÐµÑ Ð½ÐµÑвободнÑе клÑкÑÑ Ð¾Ñ
Ñвоего главного диÑÑÑибÑÑива. Ðднако "
+"пÑоблема ÑаÑÑиÑно оÑÑаеÑÑÑ. ФайлÑ
неÑвободнÑÑ
пÑогÑамм Ð´Ð»Ñ ÑÑÑÑойÑÑв "
"наÑ
одÑÑÑÑ Ð² Ñазделе “nonfree” Debian, на
коÑоÑÑй ÑÑÑлаеÑÑÑ "
-"докÑменÑаÑÐ¸Ñ debian.org, а ÑÑÑановÑик в
некоÑоÑÑÑ
ÑлÑÑаÑÑ
ÑекомендÑÐµÑ "
-"иÑ
Ð´Ð»Ñ Ð¿ÐµÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв маÑинÑ."
+"докÑменÑаÑÐ¸Ñ debian.org, а ÑÑÑановÑик в
некоÑоÑÑÑ
ÑлÑÑаÑÑ
ÑекомендÑÐµÑ Ð¸Ñ
Ð´Ð»Ñ "
+"пеÑиÑеÑийнÑÑ
ÑÑÑÑойÑÑв маÑинÑ."
#. type: Content of: <p>
msgid "Debian's wiki includes pages about installing nonfree firmware."
@@ -732,16 +731,12 @@
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
#. type: Content of: <div><p>
-# | Copyright © 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
-# | Software Foundation, Inc.
-#| msgid ""
-#| "Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
-#| "Inc."
msgid ""
"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
msgstr ""
-"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software Foundation,
Inc."
+"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- licenses/license-list.ru.html 29 Dec 2018 13:59:27 -0000 1.126
+++ licenses/license-list.ru.html 8 Jan 2019 13:59:01 -0000 1.127
@@ -633,29 +633,26 @@
<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>ÐÑо безволÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она
ÑовмеÑÑима
-Ñ GNU GPL.</p>
-
-<p>ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñакже назÑваÑÑ Ð¸Ð½Ð¾Ð³Ð´Ð°
лиÑензией OpenBSD, Ñ
оÑÑ Ð¼ÐµÐ¶Ð´Ñ ÑÑими двÑмÑ
-лиÑензиÑми еÑÑÑ Ð¾Ð´Ð½Ð¾ неболÑÑое ÑазлиÑие.
ÐиÑÐµÐ½Ð·Ð¸Ñ OpenBSD бÑла изменена,
-ÑÑÐ¾Ð±Ñ ÑÑÑÑаниÑÑ Ð½ÐµÐ¾Ð´Ð½Ð¾Ð·Ð½Ð°Ñное вÑÑажение:
“и/или”. ÐиÑÐµÐ½Ð·Ð¸Ñ ISC
-пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм “ÑазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, изменÑÑÑ
-и/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...”, в
Ñо вÑÐµÐ¼Ñ ÐºÐ°Ðº лиÑензиÑ
-OpenBSD пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм
“ÑазÑеÑение пÑименÑÑÑ, копиÑоваÑÑ,
-изменÑÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ...?rdquo;. </p>
-
-<p>Ðогда бÑла вÑпÑÑена лиÑÐµÐ½Ð·Ð¸Ñ ISC,
конÑÑÑÑкÑÐ¸Ñ “и/или” вÑзÑвала
-опаÑениÑ, поÑÐ¾Ð¼Ñ ÑÑо она ÑÑ
одна Ñ
ÑоÑмÑлиÑовкой, пÑименÑвÑейÑÑ Ð² лиÑензии
-Pine, коÑоÑаÑ, как заÑвил впоÑледÑÑвии
ÑнивеÑÑиÑÐµÑ ÐаÑингÑона, запÑеÑала
-ÑаÑпÑоÑÑÑанение измененнÑÑ
веÑÑий
пÑогÑамм. Ðднако в ISC нам Ñказали, ÑÑо
-они не ÑазделÑÑÑ Ñолкование
ÐаÑингÑонÑкого ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ
вÑе
-оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑиÑÑ ÑÑомÑ. Таким обÑазом, неÑ
пÑиÑин избегаÑÑ Ð¿ÑогÑамм,
-вÑпÑÑеннÑÑ
под ÑÑой лиÑензией. Ðднако
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ, ÑÑо Ñакие
-ÑоÑмÑлиÑовки не ÑоздадÑÑ Ð¿Ñоблем в
бÑдÑÑем, Ð¼Ñ ÑекомендÑем ÑазÑабоÑÑикам
-вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑабоÑ
дÑÑгие лиÑензии. <a
-href="#Expat">ÐиÑÐµÐ½Ð·Ð¸Ñ Expat</a> и <a href="#FreeBSD">
ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a>
-пÑимеÑно Ñак же неогÑаниÑиÑелÑна и
кÑаÑка.</p></dd>
+<p>ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð¸Ð½Ð¾Ð³Ð´Ð° Ñакже назÑваÑÑ
лиÑензией OpenBSD. ÐÑо безволÑнаÑ
+неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она ÑовмеÑÑима Ñ GNU GPL.</p>
+<p>Ð ÑÑой лиÑензии бÑла неÑдаÑно вÑбÑаннаÑ
ÑоÑмÑлиÑовка: она пÑедоÑÑавлÑла
+полÑÑаÑелÑм “РазÑеÑение пÑименÑÑÑ,
копиÑоваÑÑ, изменÑÑÑ Ð¸
+ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...” ÐÑо
пÑимеÑно Ñе же вÑÑажениÑ, ÑÑо в
+лиÑензии Pine, о коÑоÑой ÐаÑингÑонÑкий
ÑнивеÑÑиÑÐµÑ Ð²Ð¿Ð¾ÑледÑÑвии заÑвил, ÑÑо
+они запÑеÑаÑÑ Ð»ÑдÑм ÑаÑпÑоÑÑÑанÑÑÑ
измененнÑе веÑÑии пÑогÑамм.</p>
+
+<p>Ð ISC нам Ñказали, ÑÑо они не ÑазделÑÑÑ
Ñолкование ÐаÑингÑонÑкого
+ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ Ð²Ñе оÑнованиÑ
веÑиÑÑ ÑÑомÑ. Ðни Ñакже изменили
+лиÑензиÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð° вÑглÑдела как “Ð
азÑеÑение пÑименÑÑÑ, копиÑоваÑÑ,
+изменÑÑÑ Ð¸/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи
пÑогÑаммÑ...”. ХоÑÑ ÑпоÑÑебление
+“и/или” не ÑÑÑÑанÑÐµÑ Ð¿ÑоблемÑ
полноÑÑÑÑ, Ð½ÐµÑ Ð¾Ñнований избегаÑÑ
+пÑогÑамм, вÑпÑÑеннÑÑ
под ÑÑой лиÑензией.
Ðднако ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ,
+ÑÑо Ñакие ÑоÑмÑлиÑовки не ÑоздадÑÑ
пÑоблем в бÑдÑÑем, Ð¼Ñ ÑекомендÑем
+ÑазÑабоÑÑикам вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑÐ°Ð±Ð¾Ñ Ð´ÑÑгие лиÑензии. <a
+href="#FreeBSD"> ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a> пÑимеÑно Ñак же
неогÑаниÑиÑелÑна и
+кÑаÑка. Ðднако еÑли вам нÑжна безволÑнаÑ
неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑензиÑ, мÑ
+ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0.</p></dd>
<dt><a id="MPL-2.0"
href="http://directory.fsf.org/wiki/License:MPLv2.0">ÐбÑеÑÑвеннаÑ
лиÑензиÑ
@@ -2780,7 +2777,8 @@
пеÑеводам”</a>.</p>
</div>
-<p>Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation,
Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
+Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
@@ -2800,7 +2798,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2018/12/29 13:59:27 $
+$Date: 2019/01/08 13:59:01 $
<!-- timestamp end -->
</p>
Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- licenses/po/license-list.ru-en.html 29 Dec 2018 13:59:29 -0000 1.115
+++ licenses/po/license-list.ru-en.html 8 Jan 2019 13:59:01 -0000 1.116
@@ -650,31 +650,11 @@
ISC License</a>
<span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
<dd>
-<p>This is a lax, permissive free software license, and compatible
-with the GNU GPL.</p>
+<p>This license is sometimes also known as the OpenBSD License. It is a free
software license, and compatible with the GNU GPL.</p>
-<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>
+<p>This license had an unfortunate wording choice: it provided recipients with
“Permission to use, copy, modify, and distribute this
software…” This was 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. ISC also updated the
license to read “Permission to use, copy, modify, <strong>and/or</strong>
distribute this software…” While the inclusion of
“and/or” doesn't completely solve the issue, 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="#FreeBSD">FreeBSD
License</a> is similarly permissive and brief. However, if you want a lax, weak
license, we recommend using the Apache 2.0 license.</p></dd>
<dt><a id="MPL-2.0"
href="http://directory.fsf.org/wiki/License:MPLv2.0">Mozilla Public
@@ -2777,7 +2757,7 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation,
Inc.</p>
+<p>Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software
Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -2787,7 +2767,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/29 13:59:29 $
+$Date: 2019/01/08 13:59:01 $
<!-- 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.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- licenses/po/license-list.ru.po 8 Jan 2019 13:54:40 -0000 1.314
+++ licenses/po/license-list.ru.po 8 Jan 2019 13:59:01 -0000 1.315
@@ -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: 2019-01-08 04:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1135,33 +1134,14 @@
"span>"
#. type: Content of: <dl><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.
-#| msgid ""
-#| "This is a lax, permissive free software license, and compatible with the "
-#| "GNU GPL."
msgid ""
"This license is sometimes also known as the OpenBSD License. It is a free "
"software license, and compatible with the GNU GPL."
msgstr ""
-"ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð¸Ð½Ð¾Ð³Ð´Ð° Ñакже назÑваÑÑ
лиÑензией OpenBSD. "
-"ÐÑо безволÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она
ÑовмеÑÑима "
-"Ñ GNU GPL."
-
-#. type: Content of: <dl><dd><p>
-# | This license [-does have-] {+had+} an unfortunate wording choice: it
-# | provide[-s-]{+d+} recipients with [-"Permission-]
-# | {+“Permission+} to use, copy, modify, [-and/or-] {+and+} distribute
-# | this [-software…"-] {+software…”+} This [-is
-# | roughly-] {+was+} the same language from the license of Pine that the
-# | University of Washington later claimed prohibited people from distributing
-# | modified versions of the software.
-#| msgid ""
-#| "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."
+"ÐÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð¸Ð½Ð¾Ð³Ð´Ð° Ñакже назÑваÑÑ
лиÑензией OpenBSD. ÐÑо безволÑÐ½Ð°Ñ "
+"неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм, она ÑовмеÑÑима Ñ GNU GPL."
+
+#. type: Content of: <dl><dd><p>
msgid ""
"This license had an unfortunate wording choice: it provided recipients with "
"“Permission to use, copy, modify, and distribute this software…"
@@ -1169,41 +1149,13 @@
"University of Washington later claimed prohibited people from distributing "
"modified versions of the software."
msgstr ""
-"Ð ÑÑой лиÑензии бÑла неÑдаÑно вÑбÑаннаÑ
ÑоÑмÑлиÑовка: она "
-"пÑедоÑÑавлÑла полÑÑаÑелÑм “РазÑеÑение
пÑименÑÑÑ, копиÑоваÑÑ, изменÑÑÑ "
-"и ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...” ÐÑо
пÑимеÑно Ñе же вÑÑажениÑ, "
-"ÑÑо в лиÑензии Pine, о коÑоÑой ÐаÑингÑонÑкий
ÑнивеÑÑиÑÐµÑ Ð²Ð¿Ð¾ÑледÑÑвии "
-"заÑвил, ÑÑо они запÑеÑаÑÑ Ð»ÑдÑм
ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½Ñе веÑÑии
пÑогÑамм."
-
-#. 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,-] {+ISC also updated
-# | the license to read “Permission to use, copy, modify,
-# | <strong>and/or</strong> distribute this software…” While the
-# | inclusion of “and/or” doesn't completely solve the issue,+}
-# | 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-] {+is+} similarly permissive
-# | and brief. {+However, if you want a lax, weak license, we recommend using
-# | the Apache 2.0 license.+}
-#| 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 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."
+"Ð ÑÑой лиÑензии бÑла неÑдаÑно вÑбÑаннаÑ
ÑоÑмÑлиÑовка: она пÑедоÑÑавлÑла "
+"полÑÑаÑелÑм “РазÑеÑение пÑименÑÑÑ,
копиÑоваÑÑ, изменÑÑÑ Ð¸ "
+"ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...” ÐÑо
пÑимеÑно Ñе же вÑÑажениÑ, ÑÑо в "
+"лиÑензии Pine, о коÑоÑой ÐаÑингÑонÑкий
ÑнивеÑÑиÑÐµÑ Ð²Ð¿Ð¾ÑледÑÑвии заÑвил, ÑÑо "
+"они запÑеÑаÑÑ Ð»ÑдÑм ÑаÑпÑоÑÑÑанÑÑÑ
измененнÑе веÑÑии пÑогÑамм."
+
+#. type: Content of: <dl><dd><p>
msgid ""
"ISC has told us they do not share the University of Washington's "
"interpretation, and we have every reason to believe them. ISC also updated "
@@ -1216,18 +1168,17 @@
"\"#FreeBSD\">FreeBSD License</a> is similarly permissive and brief. However, "
"if you want a lax, weak license, we recommend using the Apache 2.0 license."
msgstr ""
-"Ð ISC нам Ñказали, ÑÑо "
-"они не ÑазделÑÑÑ Ñолкование
ÐаÑингÑонÑкого ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ
вÑе "
-"оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²ÐµÑиÑÑ ÑÑомÑ. Ðни Ñакже
изменили лиÑензиÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð° вÑглÑдела "
-"как “РазÑеÑение пÑименÑÑÑ, копиÑоваÑÑ,
изменÑÑÑ "
-"и/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи пÑогÑаммÑ...”.
ХоÑÑ ÑпоÑÑебление “и/или” "
-"не ÑÑÑÑанÑÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ, неÑ
оÑнований избегаÑÑ Ð¿ÑогÑамм, "
-"вÑпÑÑеннÑÑ
под ÑÑой лиÑензией. Ðднако
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ, ÑÑо Ñакие "
-"ÑоÑмÑлиÑовки не ÑоздадÑÑ Ð¿Ñоблем в
бÑдÑÑем, Ð¼Ñ ÑекомендÑем ÑазÑабоÑÑикам "
-"вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑабоÑ
дÑÑгие лиÑензии. "
-"<a href=\"#FreeBSD\"> ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a> пÑимеÑно "
-"Ñак же неогÑаниÑиÑелÑна и кÑаÑка. Ðднако
еÑли вам нÑжна безволÑÐ½Ð°Ñ "
-"неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑензиÑ, мÑ
ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0."
+"Ð ISC нам Ñказали, ÑÑо они не ÑазделÑÑÑ
Ñолкование ÐаÑингÑонÑкого "
+"ÑнивеÑÑиÑеÑа, и Ñ Ð½Ð°Ñ ÐµÑÑÑ Ð²Ñе оÑнованиÑ
веÑиÑÑ ÑÑомÑ. Ðни Ñакже изменили "
+"лиÑензиÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð° вÑглÑдела как “Ð
азÑеÑение пÑименÑÑÑ, копиÑоваÑÑ, "
+"изменÑÑÑ Ð¸/или ÑаÑпÑоÑÑÑанÑÑÑ ÑÑи
пÑогÑаммÑ...”. ХоÑÑ ÑпоÑÑебление "
+"“и/или” не ÑÑÑÑанÑÐµÑ Ð¿ÑоблемÑ
полноÑÑÑÑ, Ð½ÐµÑ Ð¾Ñнований избегаÑÑ "
+"пÑогÑамм, вÑпÑÑеннÑÑ
под ÑÑой лиÑензией.
Ðднако ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð³Ð°ÑанÑиÑоваÑÑ, "
+"ÑÑо Ñакие ÑоÑмÑлиÑовки не ÑоздадÑÑ
пÑоблем в бÑдÑÑем, Ð¼Ñ ÑекомендÑем "
+"ÑазÑабоÑÑикам вÑбиÑаÑÑ Ð´Ð»Ñ ÑвоиÑ
ÑобÑÑвеннÑÑ
ÑÐ°Ð±Ð¾Ñ Ð´ÑÑгие лиÑензии. <a href="
+"\"#FreeBSD\"> ÐиÑÐµÐ½Ð·Ð¸Ñ FreeBSD</a> пÑимеÑно Ñак же
неогÑаниÑиÑелÑна и "
+"кÑаÑка. Ðднако еÑли вам нÑжна безволÑнаÑ
неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑензиÑ, Ð¼Ñ "
+"ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0."
#. type: Content of: <dl><dt>
msgid ""
@@ -5568,16 +5519,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 2014, 2015, 2016, 2017, [-2018-] {+2018, 2019+} Free
-# | Software Foundation, Inc.
-#| msgid ""
-#| "Copyright © 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
-#| "Inc."
msgid ""
"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
"Foundation, Inc."
msgstr ""
-"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software Foundation,
Inc."
+"Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/common-distros.ru.html distros/po/c...,
GNUN <=