[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: |
Wed, 27 Jun 2018 12:29:25 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/06/27 12:29:25
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.117&r2=1.118
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.292&r2=1.293
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- license-list.ru.html 11 Feb 2018 09:59:49 -0000 1.117
+++ license-list.ru.html 27 Jun 2018 16:29:24 -0000 1.118
@@ -1245,10 +1245,12 @@
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ двойной лиÑензией: EPL или GPL.)
Ðднако EPL2 без ÑÑого
назнаÑÐµÐ½Ð¸Ñ Ð¾ÑÑаеÑÑÑ Ð½ÐµÑовмеÑÑимой Ñ
GPL.</p></dd>
-<dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1">
-ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ ÐвÑопейÑкого ÑоÑза
(European Union Public License,
-EUPL), веÑÑÐ¸Ñ 1.1</a> <span class="anchor-reference-id">(<a
-href="#EUPL">#EUPL</a>)</span></dt>
+<dt><!-- old id, leave for compatibility -->
+<a id="EUPL"></a> <a id="EUPL-1.1"
+href="http://directory.fsf.org/wiki/License:EUPLv1.1">
ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑензиÑ
+ÐвÑопейÑкого ÑоÑза (European Union Public License, EUPL),
+веÑÑÐ¸Ñ 1.1</a> <span class="anchor-reference-id">(<a
+href="#EUPL-1.1">#EUPL-1.1</a>)</span></dt>
<dd>
<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Рней
Ñамой еÑÑÑ Ð°Ð²ÑоÑÑкое лево,
ÑопоÑÑавимое Ñ Ð°Ð²ÑоÑÑким левом GPL и
неÑовмеÑÑимое Ñ Ð½Ð¸Ð¼. Ðднако она
@@ -1277,6 +1279,37 @@
пÑогÑамме. Ðобавление ÑÑой ÑаÑÑи к
пÑогÑамме под CeCILL ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð¾ÑнованиÑ
пеÑелиÑензиÑоваÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPLv3+.</p></dd>
+<dt><a id="EUPL-1.2" href="http://directory.fsf.org/wiki/License:EUPLv1.2">
+ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ ÐвÑопейÑкого ÑоÑза
(European Union Public License,
+EUPL), веÑÑÐ¸Ñ 1.2</a> <span class="anchor-reference-id">(<a
+href="#EUPL">#EUPL-1.2</a>)</span></dt>
+<dd>
+<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Рней
Ñамой еÑÑÑ Ð°Ð²ÑоÑÑкое лево,
+ÑопоÑÑавимое Ñ Ð°Ð²ÑоÑÑким левом GPL и
неÑовмеÑÑимое Ñ Ð½Ð¸Ð¼. Ðднако она
+пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм ÑпоÑобÑ
пеÑелиÑензиÑоваÑÑ Ð¿Ñоизведение на
ÑÑловиÑÑ
+избÑанного ÑиÑла дÑÑгиÑ
лиÑензий, и
некоÑоÑÑе из ниÑ
— в
+ÑаÑÑноÑÑи, ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑензиÑ
Eclipse — пÑедоÑÑавлÑÑÑ ÑолÑко
+более Ñлабое авÑоÑÑкое лево. Таким
обÑазом, ÑазÑабоÑÑики не могÑÑ
+ÑаÑÑÑиÑÑваÑÑ, ÑÑо ÑÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð¾Ð±ÐµÑпеÑиÑ
ÑилÑное авÑоÑÑкое лево.</p>
+
+<p>EUPL допÑÑÐºÐ°ÐµÑ Ð¿ÐµÑелиÑензиÑование под GPLv2
(ÑолÑко) и GPLv3 (ÑолÑко),
+поÑÐ¾Ð¼Ñ ÑÑо ÑÑи лиÑензии пеÑеÑиÑÐ»ÐµÐ½Ñ Ð²
ÑпиÑке алÑÑеÑнаÑивнÑÑ
лиÑензий, на
+коÑоÑÑе могÑÑ Ð¿ÐµÑейÑи полÑзоваÑели. Ðна
Ñакже коÑвенно допÑÑкаеÑ
+пеÑелиÑензиÑование под GPL веÑÑии 3 или
лÑбой более поздней, поÑÐ¾Ð¼Ñ ÑÑо
+еÑÑÑ ÑпоÑоб пеÑелиÑензиÑоваÑÑ Ð¿Ð¾Ð´ CeCILL
веÑÑии 2, а CeCILL
+веÑÑии 2 пÑедоÑÑавлÑÐµÑ ÑпоÑоб
пеÑелиÑензиÑоваÑÑ Ð¿Ð¾Ð´ лÑбÑÑ Ð²ÐµÑÑÐ¸Ñ GNU
+GPL.</p>
+
+<p>ЧÑÐ¾Ð±Ñ Ð¿ÑовеÑÑи Ñакое двÑÑ
ÑÑапное
пеÑелиÑензиÑование, вам нÑжно ÑнаÑала
+напиÑаÑÑ ÑаÑÑÑ Ð¿ÑогÑаммÑ, коÑоÑÑÑ Ð²Ñ
можеÑе лиÑензиÑоваÑÑ Ð¿Ð¾ CeCILL
+веÑÑии 2, или найÑи подÑ
одÑÑий модÑлÑ,
Ñже доÑÑÑпнÑй Ñаким обÑазом, и
+добавиÑÑ ÐµÐ³Ð¾ к пÑогÑамме. Ðобавление ÑÑой
ÑаÑÑи к пÑогÑамме под EUPL ÑоздаеÑ
+оÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÐµÑелиÑензиÑоваÑÑ Ð¿ÑогÑаммÑ
под CeCILL веÑÑии 2. ÐаÑем вам
+нÑжно напиÑаÑÑ ÑаÑÑÑ Ð¿ÑогÑаммÑ, коÑоÑÑÑ Ð²Ñ
можеÑе лиÑензиÑоваÑÑ Ð¿Ð¾ GPLv3+,
+или найÑи подÑ
одÑÑий модÑлÑ, Ñже доÑÑÑпнÑй
Ñаким обÑазом, и добавиÑÑ ÐµÐ³Ð¾ к
+пÑогÑамме. Ðобавление ÑÑой ÑаÑÑи к
пÑогÑамме под CeCILL ÑÐ¾Ð·Ð´Ð°ÐµÑ Ð¾ÑнованиÑ
+пеÑелиÑензиÑоваÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPLv3+.</p></dd>
+
<dt><a id="gnuplot" href="http://directory.fsf.org/wiki/License:Gnuplot">
ÐиÑÐµÐ½Ð·Ð¸Ñ gnuplot</a> <span class="anchor-reference-id">(<a
href="#gnuplot">#gnuplot</a>)</span></dt>
@@ -2731,7 +2764,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2018/02/11 09:59:49 $
+$Date: 2018/06/27 16:29:24 $
<!-- 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.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- po/license-list.ru-en.html 11 Feb 2018 09:59:51 -0000 1.106
+++ po/license-list.ru-en.html 27 Jun 2018 16:29:24 -0000 1.107
@@ -1266,9 +1266,10 @@
piece of code under a dual license, EPL | GPL.) However, the EPL2
without this designation remains incompatible with the GPL.</p></dd>
-<dt><a id="EUPL" href="http://directory.fsf.org/wiki/License:EUPLv1.1">
+<dt><a id="EUPL"></a> <!-- old id, leave for compatibility -->
+ <a id="EUPL-1.1" href="http://directory.fsf.org/wiki/License:EUPLv1.1">
European Union Public License (EUPL) version 1.1</a>
- <span class="anchor-reference-id">(<a href="#EUPL">#EUPL</a>)</span></dt>
+ <span class="anchor-reference-id">(<a
href="#EUPL-1.1">#EUPL-1.1</a>)</span></dt>
<dd>
<p>This is a free software license. By itself, it has a copyleft
comparable to the GPL's, and incompatible with it. However, it gives
@@ -1295,6 +1296,33 @@
Adding that code to the CeCILL-covered program provides grounds to
relicense it to GPLv3+.</p></dd>
+<dt><a id="EUPL-1.2" href="http://directory.fsf.org/wiki/License:EUPLv1.2">
+ European Union Public License (EUPL) version 1.2</a>
+ <span class="anchor-reference-id">(<a
href="#EUPL-1.2">#EUPL-1.2</a>)</span></dt>
+<dd>
+<p>This is a free software license. By itself, it has a copyleft
+comparable to the GPL's, and incompatible with it. However, it gives
+recipients ways to relicense the work under the terms of other selected
+licenses, and some of those—the Eclipse Public License in
+particular—only provide a weaker copyleft. Thus, developers can't
+rely on this license to provide a strong copyleft.</p>
+
+<p>The EUPL allows relicensing to GPLv2 only and GPLv3 only, because
+those licenses are listed as two of the alternative licenses that users
+may convert to. It also, indirectly, allows relicensing to GPL
+version 3 or any later version, because there is a way to relicense
+to the CeCILL v2, and the CeCILL v2 gives a way to relicense to any
+version of the GNU GPL.</p>
+
+<p>To do this two-step relicensing, you need to first write a piece of code
+which you can license under the CeCILL v2, or find a suitable module
+already available that way, and add it to the program. Adding that code
+to the EUPL-covered program provides grounds to relicense it to the
+CeCILL v2. Then you need to write a piece of code which you can license
+under the GPLv3+, or find a suitable module already available that way,
+and add it to the program. Adding that code to the CeCILL-covered
+program provides grounds to relicense it to GPLv3+.</p></dd>
+
<dt><a id="gnuplot"
href="http://directory.fsf.org/wiki/License:Gnuplot">
Gnuplot license</a>
@@ -2723,7 +2751,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/02/11 09:59:51 $
+$Date: 2018/06/27 16:29:24 $
<!-- 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.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- po/license-list.ru.po 27 Jun 2018 15:55:59 -0000 1.292
+++ po/license-list.ru.po 27 Jun 2018 16:29:24 -0000 1.293
@@ -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: 2018-06-26 21:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -2398,25 +2397,16 @@
#. old id, leave for compatibility
#. type: Content of: <dl><dt>
-# | <a [-id=\"EUPL\"-] {+id=\"EUPL\"></a> <a id=\"EUPL-1.1\"+}
-# | href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\"> European Union
-# | Public License (EUPL) version 1.1</a> <span
-# | class=\"anchor-reference-id\">(<a [-href=\"#EUPL\">#EUPL</a>)</span>-]
-# | {+href=\"#EUPL-1.1\">#EUPL-1.1</a>)</span>+}
-#| msgid ""
-#| "<a id=\"EUPL\" href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\"> "
-#| "European Union Public License (EUPL) version 1.1</a> <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#EUPL\">#EUPL</a>)</span>"
msgid ""
"<a id=\"EUPL\"></a> <a id=\"EUPL-1.1\" href=\"http://directory.fsf.org/wiki/"
"License:EUPLv1.1\"> European Union Public License (EUPL) version 1.1</a> "
"<span class=\"anchor-reference-id\">(<a href=\"#EUPL-1.1\">#EUPL-1.1</a>)</"
"span>"
msgstr ""
-"<a id=\"EUPL\"></a> <a id=\"EUPL-1.1\"
href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\"> "
-"ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ ÐвÑопейÑкого ÑоÑза
(European Union Public License, "
-"EUPL), веÑÑÐ¸Ñ 1.1</a> <span class=\"anchor-reference-id\">(<a
href="
-"\"#EUPL-1.1\">#EUPL-1.1</a>)</span>"
+"<a id=\"EUPL\"></a> <a id=\"EUPL-1.1\" href=\"http://directory.fsf.org/wiki/"
+"License:EUPLv1.1\"> ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑензиÑ
ÐвÑопейÑкого ÑоÑза (European Union "
+"Public License, EUPL), веÑÑÐ¸Ñ 1.1</a> <span
class=\"anchor-reference-id"
+"\">(<a href=\"#EUPL-1.1\">#EUPL-1.1</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2475,17 +2465,6 @@
"пеÑелиÑензиÑоваÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPLv3+."
#. type: Content of: <dl><dt>
-# | <a [-id=\"EUPL\"
-# | href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\">-]
-# | {+id=\"EUPL-1.2\"
-# | href=\"http://directory.fsf.org/wiki/License:EUPLv1.2\">+} European Union
-# | Public License (EUPL) version 1.[-1-]{+2+}</a> <span
-# | class=\"anchor-reference-id\">(<a [-href=\"#EUPL\">#EUPL</a>)</span>-]
-# | {+href=\"#EUPL-1.2\">#EUPL-1.2</a>)</span>+}
-#| msgid ""
-#| "<a id=\"EUPL\" href=\"http://directory.fsf.org/wiki/License:EUPLv1.1\"> "
-#| "European Union Public License (EUPL) version 1.1</a> <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#EUPL\">#EUPL</a>)</span>"
msgid ""
"<a id=\"EUPL-1.2\" href=\"http://directory.fsf.org/wiki/License:EUPLv1.2\"> "
"European Union Public License (EUPL) version 1.2</a> <span class=\"anchor-"
@@ -2497,22 +2476,6 @@
"\"#EUPL\">#EUPL-1.2</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This is a free software license. By itself, it has a copyleft comparable
-# | to the GPL's, and incompatible with it. However, it gives recipients ways
-# | to relicense the work under the terms of other selected licenses, and some
-# | of those—the [-<a href=\"#EPL\">Eclipse-] {+Eclipse+} Public
-# | [-License</a> and the <a href=\"#CommonPublicLicense10\">Common Public
-# | License</a>-] {+License+} in particular—only provide a weaker
-# | copyleft. Thus, developers can't rely on this license to provide a strong
-# | copyleft.
-#| msgid ""
-#| "This is a free software license. By itself, it has a copyleft comparable "
-#| "to the GPL's, and incompatible with it. However, it gives recipients "
-#| "ways to relicense the work under the terms of other selected licenses, "
-#| "and some of those—the <a href=\"#EPL\">Eclipse Public License</a> "
-#| "and the <a href=\"#CommonPublicLicense10\">Common Public License</a> in "
-#| "particular—only provide a weaker copyleft. Thus, developers can't "
-#| "rely on this license to provide a strong copyleft."
msgid ""
"This is a free software license. By itself, it has a copyleft comparable to "
"the GPL's, and incompatible with it. However, it gives recipients ways to "
@@ -2525,24 +2488,11 @@
"ÑопоÑÑавимое Ñ Ð°Ð²ÑоÑÑким левом GPL и
неÑовмеÑÑимое Ñ Ð½Ð¸Ð¼. Ðднако она "
"пÑедоÑÑавлÑÐµÑ Ð¿Ð¾Ð»ÑÑаÑелÑм ÑпоÑобÑ
пеÑелиÑензиÑоваÑÑ Ð¿Ñоизведение на
ÑÑловиÑÑ
"
"избÑанного ÑиÑла дÑÑгиÑ
лиÑензий, и
некоÑоÑÑе из ниÑ
— в "
-"ÑаÑÑноÑÑи, ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑензиÑ
Eclipse — "
-"пÑедоÑÑавлÑÑÑ ÑолÑко более Ñлабое
авÑоÑÑкое лево. Таким обÑазом, "
-"ÑазÑабоÑÑики не могÑÑ ÑаÑÑÑиÑÑваÑÑ, ÑÑо
ÑÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð¾Ð±ÐµÑпеÑÐ¸Ñ ÑилÑное "
-"авÑоÑÑкое лево."
+"ÑаÑÑноÑÑи, ÐбÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑензиÑ
Eclipse — пÑедоÑÑавлÑÑÑ ÑолÑко "
+"более Ñлабое авÑоÑÑкое лево. Таким
обÑазом, ÑазÑабоÑÑики не могÑÑ "
+"ÑаÑÑÑиÑÑваÑÑ, ÑÑо ÑÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð¾Ð±ÐµÑпеÑиÑ
ÑилÑное авÑоÑÑкое лево."
#. type: Content of: <dl><dd><p>
-# | The EUPL allows relicensing to [-GPLv2,-] {+GPLv2 only and GPLv3 only,+}
-# | because [-that is-] {+those licenses are+} listed as [-one-] {+two+} of
-# | the alternative licenses that users may convert to. It also, indirectly,
-# | allows relicensing to GPL [-version 3,-] {+version 3 or any later
-# | version,+} because there is a way to relicense to the CeCILL v2, and the
-# | CeCILL v2 gives a way to relicense to any version of the GNU GPL.
-#| msgid ""
-#| "The EUPL allows relicensing to GPLv2, because that is listed as one of "
-#| "the alternative licenses that users may convert to. It also, indirectly, "
-#| "allows relicensing to GPL version 3, because there is a way to relicense "
-#| "to the CeCILL v2, and the CeCILL v2 gives a way to relicense to any "
-#| "version of the GNU GPL."
msgid ""
"The EUPL allows relicensing to GPLv2 only and GPLv3 only, because those "
"licenses are listed as two of the alternative licenses that users may "
@@ -2551,25 +2501,14 @@
"the CeCILL v2 gives a way to relicense to any version of the GNU GPL."
msgstr ""
"EUPL допÑÑÐºÐ°ÐµÑ Ð¿ÐµÑелиÑензиÑование под GPLv2
(ÑолÑко) и GPLv3 (ÑолÑко), "
-"поÑÐ¾Ð¼Ñ ÑÑо ÑÑи лиÑензии пеÑеÑиÑÐ»ÐµÐ½Ñ Ð² "
-"ÑпиÑке алÑÑеÑнаÑивнÑÑ
лиÑензий, на
коÑоÑÑе могÑÑ Ð¿ÐµÑейÑи полÑзоваÑели. Ðна "
-"Ñакже коÑвенно допÑÑкаеÑ
пеÑелиÑензиÑование под GPL веÑÑии 3 или "
-"лÑбой более поздней, поÑÐ¾Ð¼Ñ "
-"ÑÑо еÑÑÑ ÑпоÑоб пеÑелиÑензиÑоваÑÑ Ð¿Ð¾Ð´ CeCILL
веÑÑии 2, а CeCILL "
+"поÑÐ¾Ð¼Ñ ÑÑо ÑÑи лиÑензии пеÑеÑиÑÐ»ÐµÐ½Ñ Ð²
ÑпиÑке алÑÑеÑнаÑивнÑÑ
лиÑензий, на "
+"коÑоÑÑе могÑÑ Ð¿ÐµÑейÑи полÑзоваÑели. Ðна
Ñакже коÑвенно допÑÑÐºÐ°ÐµÑ "
+"пеÑелиÑензиÑование под GPL веÑÑии 3 или
лÑбой более поздней, поÑÐ¾Ð¼Ñ ÑÑо "
+"еÑÑÑ ÑпоÑоб пеÑелиÑензиÑоваÑÑ Ð¿Ð¾Ð´ CeCILL
веÑÑии 2, а CeCILL "
"веÑÑии 2 пÑедоÑÑавлÑÐµÑ ÑпоÑоб
пеÑелиÑензиÑоваÑÑ Ð¿Ð¾Ð´ лÑбÑÑ Ð²ÐµÑÑÐ¸Ñ GNU "
"GPL."
#. type: Content of: <dl><dd><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "To do this two-step relicensing, you need to first write a piece of code "
-#| "which you can license under the CeCILL v2, or find a suitable module "
-#| "already available that way, and add it to the program. Adding that code "
-#| "to the EUPL-covered program provides grounds to relicense it to the "
-#| "CeCILL v2. Then you need to write a piece of code which you can license "
-#| "under the GPLv3+, or find a suitable module already available that way, "
-#| "and add it to the program. Adding that code to the CeCILL-covered "
-#| "program provides grounds to relicense it to GPLv3+."
msgid ""
"To do this two-step relicensing, you need to first write a piece of code "
"which you can license under the CeCILL v2, or find a suitable module already "
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=