[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-compatibility.ru.html po/l...
From: |
GNUN |
Subject: |
www/licenses license-compatibility.ru.html po/l... |
Date: |
Fri, 20 Nov 2020 13:02:19 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 20/11/20 13:02:19
Modified files:
licenses : license-compatibility.ru.html
licenses/po : license-compatibility.ru-en.html
license-compatibility.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-compatibility.ru.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.ru-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.ru.po?cvsroot=www&r1=1.8&r2=1.9
Patches:
Index: license-compatibility.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-compatibility.ru.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- license-compatibility.ru.html 15 Dec 2018 14:46:15 -0000 1.5
+++ license-compatibility.ru.html 20 Nov 2020 18:02:18 -0000 1.6
@@ -84,18 +84,20 @@
неÑовмеÑÑимÑ, еÑли ÑовмеÑÑимоÑÑÑ Ð½Ðµ
оговоÑена в ниÑ
ÑвнÑм обÑазом. ÐÑо не
ÑвÑзано Ñ Ð¾Ñибкой в деÑалÑÑ
; ÑÑо ÑледÑÑвие
пÑинÑипов авÑоÑÑкого лева. СÑÑÑ
авÑоÑÑкого лева заклÑÑаеÑÑÑ Ð² Ñом, ÑÑо
“измененнÑе и ÑаÑÑиÑеннÑе
-веÑÑии Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ Ñой же Ñамой
лиÑензией”. ÐÑли в лиÑензии Ð
-Ñказано, ÑÑо ÑаÑÑиÑеннÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
бÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, а в лиÑензии
-Ð Ñказано, ÑÑо ÑаÑÑиÑеннÑе пÑогÑаммÑ
Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, Ñо ÑÑо
-неÑÑÑÑанимое ÑазноглаÑие; лиÑензиÑ
ÑовмеÑенной пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° бÑÑÑ
-лиÑензией Ð <em>и</em> она должна бÑÑÑ
лиÑензией Ð. ÐÐ¾Ñ Ð¿Ð¾ÑÐµÐ¼Ñ GPL
-веÑÑии 2 неÑовмеÑÑима Ñ GPL веÑÑии 3;
избежаÑÑ ÑÑого бÑло
-невозможно. ТоÑно Ñак же ÑÑловиÑ
CC BY-SA 4.0 бÑли бÑ
+веÑÑии Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ Ñой же Ñамой
лиÑензией”. ÐÑли в лиÑензии Ð (на
+пÑогÑÐ°Ð¼Ð¼Ñ Ð) Ñказано, ÑÑо ÑаÑÑиÑеннÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð,
+а в лиÑензии Ð (на пÑогÑÐ°Ð¼Ð¼Ñ Ð ) Ñказано, ÑÑо
ÑаÑÑиÑеннÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
+бÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, Ñо ÑÑо неÑÑÑÑанимое
ÑазноглаÑие; лиÑÐµÐ½Ð·Ð¸Ñ ÑовмеÑенной
+пÑогÑаммÑ, коÑоÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ ÑаÑÑи из Ри
ÑаÑÑи из Ð , должна бÑÑÑ Ð»Ð¸Ñензией Ð
+<em>и</em> она должна бÑÑÑ Ð»Ð¸Ñензией Ð.</p>
+
+<p>ÐÐ¾Ñ Ð¿Ð¾ÑÐµÐ¼Ñ GPL веÑÑии 2 неÑовмеÑÑима Ñ GPL
веÑÑии 3; избежаÑÑ
+ÑÑого бÑло невозможно. ТоÑно Ñак же
ÑÑÐ»Ð¾Ð²Ð¸Ñ CC BY-SA 4.0 бÑли бÑ
пÑинÑипиалÑно неÑовмеÑÑÐ¸Ð¼Ñ Ñ ÑÑловиÑми
CC BY-SA 3.0, и авÑоÑам не
ÑдалоÑÑ Ð±Ñ ÑÑого избежаÑÑ.</p>
-<p>ЧÑÐ¾Ð±Ñ ÑгладиÑÑ Ð½ÐµÑовмеÑÑимоÑÑÑ,
пÑиÑÑÑÑÑ Ð½Ð¾Ð²Ñм веÑÑиÑм лиÑензий Ñ
авÑоÑÑким
-левом, еÑÑÑ Ð´Ð²Ð° подÑ
ода.</p>
+<p>ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑоблемÑ
неÑовмеÑÑимоÑÑи, вÑзванной ÑазнÑми
веÑÑиÑми Ñ
+авÑоÑÑким левом, еÑÑÑ Ð´Ð²Ð° подÑ
ода.</p>
<p>ÐодÑ
од ФСÐÐ ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð¿ÑоÑиÑÑ
лÑдей вÑпÑÑкаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´
“GNU GPL веÑÑии N или лÑбой более
поздней”. ÐÑо ÑовмеÑÑимо Ñ
@@ -111,11 +113,11 @@
ÑазÑеÑаеÑе обновление до GNU GPL веÑÑии 4,
еÑли она нам поÑÑебÑеÑÑÑ.</p>
<p>ÐÑÑгой подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð²
каждой веÑÑии лиÑензии ÑвнÑм обÑазом
-допÑÑкаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ до более поздниÑ
веÑÑий. ÐÑо-Ñо и Ð´ÐµÐ»Ð°ÐµÑ Creative
-Commons: напÑимеÑ, в CC BY-SA веÑÑии 4.0
(ÑекÑÑей веÑÑии) лÑбомÑ
-полÑзоваÑÐµÐ»Ñ ÑвнÑм обÑазом ÑазÑеÑено
обновлÑÑÑÑÑ Ð´Ð¾ более поздниÑ
веÑÑий
-CC BY-SA, как ÑолÑко они поÑвÑÑÑÑ. Mozilla Foundation
Ñакже полÑзÑеÑÑÑ
-ÑÑим подÑ
одом.</p>
+допÑÑкаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ до более поздниÑ
веÑÑий. ÐÑÐ¾Ñ Ð¿Ð¾Ð´Ñ
од пÑименÑÐµÑ Mozilla
+Foundation, как и PHP. Creative Commons пÑименÑÐµÑ ÐµÐ³Ð¾ длÑ
CC BY-SA:
+веÑÑÐ¸Ñ 4.0 (ÑекÑÑаÑ) лÑÐ±Ð¾Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ
ÑвнÑм обÑазом ÑазÑеÑено
+обновлÑÑÑÑÑ Ð´Ð¾ более поздниÑ
веÑÑий
CC BY-SA Ð´Ð»Ñ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованнÑÑ
+ÑабоÑ.</p>
<p>ТолÑко лиÑензии GNU пÑедоÑÑавлÑÑÑ Ð°Ð²ÑоÑам
вÑбиÑаÑÑ, ÑазÑеÑиÑÑ Ð»Ð¸ обновление
до бÑдÑÑиÑ
веÑÑий лиÑензии. Ðогда
в 1989 Ð³Ð¾Ð´Ñ Ñ Ð¿Ð¸Ñал пеÑвÑÑ
@@ -128,8 +130,9 @@
<p>ÐÑоÑло вÑемÑ, и Ñ ÑÑал ÑомневаÑÑÑÑ Ð²
мÑдÑоÑÑи ÑÑого ÑеÑениÑ. Такие
пÑогÑаммÑ, как Linux, коÑоÑÑе допÑÑкаÑÑ
ÑолÑко Ð¾Ð´Ð½Ñ Ð²ÐµÑÑÐ¸Ñ GNU GPL и
оÑвеÑгаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, на пÑакÑике
пÑиводÑÑ Ðº неÑовмеÑÑимоÑÑи.<a
-href="#f4">(****)</a> Ðозможно, нам ÑледÑÐµÑ Ð²ÐºÐ»ÑÑиÑÑ
пÑÐ½ÐºÑ Ð¾Ð± обновлении в
-GPL веÑÑии 4, еÑли веÑÑÐ¸Ñ 4 нам
когда-нибÑÐ´Ñ Ð¿Ð¾Ð½Ð°Ð´Ð¾Ð±Ð¸ÑÑÑ.</p>
+href="#f4">(****)</a> ÐÑли Ð¼Ñ ÐºÐ¾Ð³Ð´Ð°-нибÑÐ´Ñ Ð½Ð°Ð¿Ð¸Ñем GPL
веÑÑии 4, возможно,
+нам ÑледÑÐµÑ Ð²ÐºÐ»ÑÑиÑÑ Ð¿ÑÐ½ÐºÑ Ð¾Ð± обновлении,
коÑоÑÑй авÑомаÑиÑеÑки ÑазÑеÑаеÑ
+пеÑелиÑензиÑование на веÑÑии Ñ Ð¿Ð¾Ð²ÑÑением
номеÑа — 5 и вÑÑе.</p>
<p>ÐекоÑоÑÑе лиÑензии Ñ Ð°Ð²ÑоÑÑким левом
допÑÑкаÑÑ ÑоÑеÑÐ°Ð½Ð¸Ñ Ð¿ÑогÑамм под ÑазнÑм
авÑоÑÑким левом Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ñвного пÑнкÑа о
пеÑелиÑензиÑовании, даÑÑего
@@ -369,7 +372,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
@@ -389,7 +392,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2018/12/15 14:46:15 $
+$Date: 2020/11/20 18:02:18 $
<!-- timestamp end -->
</p>
Index: po/license-compatibility.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.ru-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/license-compatibility.ru-en.html 15 Dec 2018 14:46:19 -0000 1.4
+++ po/license-compatibility.ru-en.html 20 Nov 2020 18:02:19 -0000 1.5
@@ -77,17 +77,21 @@
incompatible unless they have explicit compatibility provisions. This
is not due to a mistake in the details; it's inherent in the idea of
copyleft. The idea of copyleft is that “Modified and extended
-versions must be under the same license.” If license A says extended
-programs must be under license A, and license B says extended programs
-must be under license B, they have an irreconcilable disagreement; the
-license of the combined program would have to be A, <em>and</em> it would
-have to be B. This is why GPL version 2 is incompatible with GPL
-version 3; it could not be avoided. Likewise, the conditions of
-CC-BY-SA 4.0 would be inherently incompatible with those of CC-BY-SA
-3.0, and the authors could not have avoided this.</p>
+versions must be under the same license.” If license A (on
+program P) says extended programs must be under license A, and license
+B (on program Q) says extended programs must be under license B, they
+have an irreconcilable disagreement; the license of the combined
+program which includes code from P plus code from Q would have to be
+A, <em>and</em> it would have to be B.</p>
+
+<p>This is why GPL version 2 is
+incompatible with GPL version 3; it could not be avoided. Likewise,
+the conditions of CC-BY-SA 4.0 would be inherently incompatible with
+those of CC-BY-SA 3.0, and the authors could not have avoided
+this.</p>
-<p>There are two approaches for smoothing out the incompatibility
-inherent in new versions of copyleft licenses.</p>
+<p>There are two approaches for avoiding the incompatibility problem
+caused by different versions of copyleft licenses.</p>
<p>The FSF uses the approach of asking people to release programs under
“GNU GPL version N or any later version.” This licensing is
@@ -102,11 +106,11 @@
releasing your code under GNU GPL 3 or later, you permit your code to
upgrade to GNU GPL version 4 if we ever need one.</p>
-<p>The other approach is to make each version of the license explicitly
-allow upgrading to later versions. This is what Creative Commons
-does: for instance, CC-BY-SA version 4.0 (the current version)
-explicitly permits any user to upgrade to later versions of CC-BY-SA
-once those exist. The Mozilla Foundation also uses this approach.</p>
+<p>The other approach is to make each version of the license
+explicitly allow upgrading to later versions. The Mozilla Foundation
+uses this approach, as does PHP. Creative Commons, uses it for
+CC-BY-SA: version 4.0 (the current version) explicitly permits any
+user to upgrade to later versions of CC-BY-SA for modified works.</p>
<p>Only the GNU licenses give authors a choice about whether to permit
upgrades to future license versions. When I wrote the first version
@@ -119,8 +123,9 @@
<p>Since then, I have come to question the wisdom of that decision.
Programs such as Linux, which allow only one GNU GPL version and
reject license upgrades, cause practical
-incompatibility.<a href="#f4">(****)</a> Perhaps we should include an
-upgrade clause in GPL version 4, if we ever need a version 4.</p>
+incompatibility.<a href="#f4">(****)</a> If we ever make a GPL version
+4, perhaps we should include an upgrade clause that automatically
+permits relicensing to higher-numbered versions, 5 and up.</p>
<p>Some copyleft licenses allow cross-copyleft combinations with an
explicit relicensing clause giving permission to put the code under a
@@ -344,7 +349,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016, 2018, 2020 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
@@ -354,7 +359,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:19 $
+$Date: 2020/11/20 18:02:19 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-compatibility.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.ru.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/license-compatibility.ru.po 20 Nov 2020 17:35:42 -0000 1.8
+++ po/license-compatibility.ru.po 20 Nov 2020 18:02:19 -0000 1.9
@@ -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: 2020-11-20 16:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -180,32 +179,6 @@
"единÑÑвенной”) лиÑензии BSD</a>."
#. type: Content of: <p>
-# | In general, two different copyleft licenses are unavoidably incompatible
-# | unless they have explicit compatibility provisions. This is not due to a
-# | mistake in the details; it's inherent in the idea of copyleft. The idea
-# | of copyleft is that “Modified and extended versions must be under
-# | the same license.” If license A {+(on program P)+} says extended
-# | programs must be under license A, and license B {+(on program Q)+} says
-# | extended programs must be under license B, they have an irreconcilable
-# | disagreement; the license of the combined program {+which includes code
-# | from P plus code from Q+} would have to be A, <em>and</em> it would have
-# | to be B. [-This is why GPL version 2 is incompatible with GPL version 3;
-# | it could not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would
-# | be inherently incompatible with those of CC-BY-SA 3.0, and the authors
-# | could not have avoided this.-]
-#| msgid ""
-#| "In general, two different copyleft licenses are unavoidably incompatible "
-#| "unless they have explicit compatibility provisions. This is not due to a "
-#| "mistake in the details; it's inherent in the idea of copyleft. The idea "
-#| "of copyleft is that “Modified and extended versions must be under "
-#| "the same license.” If license A says extended programs must be "
-#| "under license A, and license B says extended programs must be under "
-#| "license B, they have an irreconcilable disagreement; the license of the "
-#| "combined program would have to be A, <em>and</em> it would have to be B. "
-#| "This is why GPL version 2 is incompatible with GPL version 3; it could "
-#| "not be avoided. Likewise, the conditions of CC-BY-SA 4.0 would be "
-#| "inherently incompatible with those of CC-BY-SA 3.0, and the authors could "
-#| "not have avoided this."
msgid ""
"In general, two different copyleft licenses are unavoidably incompatible "
"unless they have explicit compatibility provisions. This is not due to a "
@@ -221,12 +194,12 @@
"неÑовмеÑÑимÑ, еÑли ÑовмеÑÑимоÑÑÑ Ð½Ðµ
оговоÑена в ниÑ
ÑвнÑм обÑазом. ÐÑо не "
"ÑвÑзано Ñ Ð¾Ñибкой в деÑалÑÑ
; ÑÑо ÑледÑÑвие
пÑинÑипов авÑоÑÑкого лева. СÑÑÑ "
"авÑоÑÑкого лева заклÑÑаеÑÑÑ Ð² Ñом, ÑÑо
“измененнÑе и ÑаÑÑиÑеннÑе "
-"веÑÑии Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ Ñой же Ñамой
лиÑензией”. ÐÑли в лиÑензии Ð "
-"(на пÑогÑÐ°Ð¼Ð¼Ñ Ð) Ñказано, ÑÑо ÑаÑÑиÑеннÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, а в
лиÑензии "
-"Ð (на пÑогÑÐ°Ð¼Ð¼Ñ Ð ) Ñказано, ÑÑо ÑаÑÑиÑеннÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, Ñо
ÑÑо "
-"неÑÑÑÑанимое ÑазноглаÑие; лиÑензиÑ
ÑовмеÑенной пÑогÑаммÑ, коÑоÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ "
-"ÑаÑÑи из Ри ÑаÑÑи из Ð , должна бÑÑÑ "
-"лиÑензией Ð <em>и</em> она должна бÑÑÑ
лиÑензией Ð."
+"веÑÑии Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ Ñой же Ñамой
лиÑензией”. ÐÑли в лиÑензии Ð (на "
+"пÑогÑÐ°Ð¼Ð¼Ñ Ð) Ñказано, ÑÑо ÑаÑÑиÑеннÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, "
+"а в лиÑензии Ð (на пÑогÑÐ°Ð¼Ð¼Ñ Ð ) Ñказано, ÑÑо
ÑаÑÑиÑеннÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ "
+"бÑÑÑ Ð¿Ð¾Ð´ лиÑензией Ð, Ñо ÑÑо неÑÑÑÑанимое
ÑазноглаÑие; лиÑÐµÐ½Ð·Ð¸Ñ ÑовмеÑенной "
+"пÑогÑаммÑ, коÑоÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ ÑаÑÑи из Ри
ÑаÑÑи из Ð , должна бÑÑÑ Ð»Ð¸Ñензией Ð "
+"<em>и</em> она должна бÑÑÑ Ð»Ð¸Ñензией Ð."
#. type: Content of: <p>
msgid ""
@@ -235,25 +208,18 @@
"incompatible with those of CC-BY-SA 3.0, and the authors could not have "
"avoided this."
msgstr ""
-"ÐÐ¾Ñ Ð¿Ð¾ÑÐµÐ¼Ñ GPL "
-"веÑÑии 2 неÑовмеÑÑима Ñ GPL веÑÑии 3;
избежаÑÑ ÑÑого бÑло "
-"невозможно. ТоÑно Ñак же ÑÑловиÑ
CC BY-SA 4.0 бÑли Ð±Ñ "
+"ÐÐ¾Ñ Ð¿Ð¾ÑÐµÐ¼Ñ GPL веÑÑии 2 неÑовмеÑÑима Ñ GPL
веÑÑии 3; избежаÑÑ "
+"ÑÑого бÑло невозможно. ТоÑно Ñак же
ÑÑÐ»Ð¾Ð²Ð¸Ñ CC BY-SA 4.0 бÑли Ð±Ñ "
"пÑинÑипиалÑно неÑовмеÑÑÐ¸Ð¼Ñ Ñ ÑÑловиÑми
CC BY-SA 3.0, и авÑоÑам не "
"ÑдалоÑÑ Ð±Ñ ÑÑого избежаÑÑ."
#. type: Content of: <p>
-# | There are two approaches for [-smoothing out-] {+avoiding+} the
-# | incompatibility [-inherent in new-] {+problem caused by different+}
-# | versions of copyleft licenses.
-#| msgid ""
-#| "There are two approaches for smoothing out the incompatibility inherent "
-#| "in new versions of copyleft licenses."
msgid ""
"There are two approaches for avoiding the incompatibility problem caused by "
"different versions of copyleft licenses."
msgstr ""
-"ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð½ÐµÑовмеÑÑимоÑÑи,
вÑзванной ÑазнÑми веÑÑиÑми Ñ Ð°Ð²ÑоÑÑким "
-"левом, еÑÑÑ Ð´Ð²Ð° подÑ
ода."
+"ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð½ÐµÑовмеÑÑимоÑÑи,
вÑзванной ÑазнÑми веÑÑиÑми Ñ "
+"авÑоÑÑким левом, еÑÑÑ Ð´Ð²Ð° подÑ
ода."
#. type: Content of: <p>
msgid ""
@@ -285,19 +251,6 @@
"ÑазÑеÑаеÑе обновление до GNU GPL веÑÑии 4,
еÑли она нам поÑÑебÑеÑÑÑ."
#. type: Content of: <p>
-# | The other approach is to make each version of the license explicitly allow
-# | upgrading to later versions. [-This is what-] {+The Mozilla Foundation
-# | uses this approach, as does PHP.+} Creative [-Commons does:-] {+Commons,
-# | uses it+} for [-instance, CC-BY-SA-] {+CC-BY-SA:+} version 4.0 (the
-# | current version) explicitly permits any user to upgrade to later versions
-# | of CC-BY-SA [-once those exist. The Mozilla Foundation also uses this
-# | approach.-] {+for modified works.+}
-#| msgid ""
-#| "The other approach is to make each version of the license explicitly "
-#| "allow upgrading to later versions. This is what Creative Commons does: "
-#| "for instance, CC-BY-SA version 4.0 (the current version) explicitly "
-#| "permits any user to upgrade to later versions of CC-BY-SA once those "
-#| "exist. The Mozilla Foundation also uses this approach."
msgid ""
"The other approach is to make each version of the license explicitly allow "
"upgrading to later versions. The Mozilla Foundation uses this approach, as "
@@ -306,11 +259,10 @@
"SA for modified works."
msgstr ""
"ÐÑÑгой подÑ
од ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð²
каждой веÑÑии лиÑензии ÑвнÑм обÑазом "
-"допÑÑкаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ до более поздниÑ
веÑÑий. ÐÑÐ¾Ñ Ð¿Ð¾Ð´Ñ
од пÑименÑÐµÑ "
-"Mozilla Foundation, как и PHP. Creative "
-"Commons пÑименÑÐµÑ ÐµÐ³Ð¾ Ð´Ð»Ñ CC BY-SA: веÑÑÐ¸Ñ 4.0
(ÑекÑÑаÑ) лÑÐ±Ð¾Ð¼Ñ "
-"полÑзоваÑÐµÐ»Ñ ÑвнÑм обÑазом ÑазÑеÑено
обновлÑÑÑÑÑ Ð´Ð¾ более поздниÑ
веÑÑий "
-"CC BY-SA Ð´Ð»Ñ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованнÑÑ
ÑабоÑ."
+"допÑÑкаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ до более поздниÑ
веÑÑий. ÐÑÐ¾Ñ Ð¿Ð¾Ð´Ñ
од пÑименÑÐµÑ Mozilla "
+"Foundation, как и PHP. Creative Commons пÑименÑÐµÑ ÐµÐ³Ð¾ длÑ
CC BY-SA: "
+"веÑÑÐ¸Ñ 4.0 (ÑекÑÑаÑ) лÑÐ±Ð¾Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ
ÑвнÑм обÑазом ÑазÑеÑено "
+"обновлÑÑÑÑÑ Ð´Ð¾ более поздниÑ
веÑÑий
CC BY-SA Ð´Ð»Ñ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованнÑÑ
ÑабоÑ."
#. type: Content of: <p>
msgid ""
@@ -330,19 +282,6 @@
"веÑÑии 1 или более поздней”."
#. type: Content of: <p>
-# | Since then, I have come to question the wisdom of that decision. Programs
-# | such as Linux, which allow only one GNU GPL version and reject license
-# | upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</a>
-# | [-Perhaps-] {+If we ever make a GPL version 4, perhaps+} we should include
-# | an upgrade clause [-in GPL version 4, if we ever need a version 4.-]
-# | {+that automatically permits relicensing to higher-numbered versions, 5
-# | and up.+}
-#| msgid ""
-#| "Since then, I have come to question the wisdom of that decision. "
-#| "Programs such as Linux, which allow only one GNU GPL version and reject "
-#| "license upgrades, cause practical incompatibility.<a href=\"#f4\">(****)</"
-#| "a> Perhaps we should include an upgrade clause in GPL version 4, if we "
-#| "ever need a version 4."
msgid ""
"Since then, I have come to question the wisdom of that decision. Programs "
"such as Linux, which allow only one GNU GPL version and reject license "
@@ -354,8 +293,8 @@
"пÑогÑаммÑ, как Linux, коÑоÑÑе допÑÑкаÑÑ
ÑолÑко Ð¾Ð´Ð½Ñ Ð²ÐµÑÑÐ¸Ñ GNU GPL и "
"оÑвеÑгаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, на пÑакÑике
пÑиводÑÑ Ðº неÑовмеÑÑимоÑÑи.<a href=\"#f4\">"
"(****)</a> ÐÑли Ð¼Ñ ÐºÐ¾Ð³Ð´Ð°-нибÑÐ´Ñ Ð½Ð°Ð¿Ð¸Ñем GPL
веÑÑии 4, возможно, нам ÑледÑÐµÑ "
-"вклÑÑиÑÑ Ð¿ÑÐ½ÐºÑ Ð¾Ð± обновлении, коÑоÑÑй
авÑомаÑиÑеÑки ÑазÑеÑаеÑ
пеÑелиÑензиÑование "
-"на веÑÑии Ñ Ð¿Ð¾Ð²ÑÑением номеÑа — 5 и
вÑÑе."
+"вклÑÑиÑÑ Ð¿ÑÐ½ÐºÑ Ð¾Ð± обновлении, коÑоÑÑй
авÑомаÑиÑеÑки ÑазÑеÑÐ°ÐµÑ "
+"пеÑелиÑензиÑование на веÑÑии Ñ
повÑÑением номеÑа — 5 и вÑÑе."
#. type: Content of: <p>
msgid ""
@@ -801,9 +740,6 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 2016, [-2018-] {+2018, 2020+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright © 2016, 2018 Free Software Foundation, Inc."
msgid "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
msgstr "Copyright © 2016, 2018, 2020 Free Software Foundation, Inc."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-compatibility.ru.html po/l...,
GNUN <=