[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, 09 Oct 2015 05:28:26 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/10/09 05:28:26
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.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.214&r2=1.215
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- license-list.ru.html 8 Oct 2015 09:27:42 -0000 1.89
+++ license-list.ru.html 9 Oct 2015 05:28:24 -0000 1.90
@@ -2355,8 +2355,29 @@
CC BY-SA) <span class="anchor-reference-id"> (<a
href="#ccbysa">#ccbysa</a>)</span></dt>
<dd>
-<p>ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким
левом, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
,
-ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений.</p>
+
+<p>ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким
левом, коÑоÑÐ°Ñ Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
,
+ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима в однÑ
+ÑÑоÑÐ¾Ð½Ñ Ñ GNU GPL веÑÑии 3.0, ÑÑо ознаÑаеÑ,
ÑÑо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе лиÑензиÑоваÑÑ
+Ñвои Ð²ÐºÐ»Ð°Ð´Ñ Ð¸ доÑабоÑки в маÑеÑÐ¸Ð°Ð»Ñ Ð¿Ð¾Ð´
CC BY-SA 4.0 на ÑÑловиÑÑ
+GNU GPL веÑÑии 3.0, но Ð²Ñ Ð½Ðµ можеÑе
лиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU
+GPL веÑÑии 3.0 на ÑÑловиÑÑ
CC BY-SA 4.0. </p>
+
+<p>ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3.0 GNU GPL в Ñвоем
+<a href="http://creativecommons.org/compatiblelicenses">ÑпиÑке
ÑовмеÑÑимÑÑ
+лиÑензий</a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои доÑабоÑки пÑоизведений под
+CC BY-SA на ÑÑловиÑÑ
“GNU GPL веÑÑии 3 или
(по ваÑемÑ
+вÑбоÑÑ) более поздней веÑÑии”. Ðднако
Ñаздел 14 GNU GPL
+веÑÑии 3.0 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑдеÑ
+опÑеделÑÑÑ, можно ли полÑзоваÑÑÑÑ
бÑдÑÑими веÑÑиÑми GNU GPL. Таким обÑазом,
+еÑли кÑо-Ñо доÑабоÑÐ°ÐµÑ Ð¿Ñоизведение под
CC BY-SA 4.0 и вклÑÑÐ¸Ñ ÐµÐ³Ð¾
+в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL
веÑÑии 3.0, <a
+href="https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions">они
+могÑÑ Ð½Ð°Ð·Ð½Ð°ÑиÑÑ Creative Commons Ñвоим
поÑÑедником</a> (в виде <a
+href="http://creativecommons.org/compatiblelicenses">http://creativecommons.org/compatiblelicenses</a>),
+Ñак ÑÑо еÑли Creative Commons опÑеделиÑ, ÑÑо
бÑдÑÑÐ°Ñ Ð²ÐµÑÑÐ¸Ñ GNU GPL
+ÑовмеÑÑима, Ñо доÑабоÑанное и
комбиниÑованное пÑоизведение можно бÑло бÑ
+иÑполÑзоваÑÑ Ð¿Ð¾Ð´ ÑÑой более поздней
веÑÑией GNU GPL.</p>
<p>ÐожалÑйÑÑа, <a href="#which-cc">говоÑиÑе
конкÑеÑно, ÐºÐ°ÐºÐ°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Creative
Commons иÑполÑзÑеÑÑÑ</a>.</p></dd>
@@ -2621,7 +2642,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/10/08 09:27:42 $
+$Date: 2015/10/09 05:28: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.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- po/license-list.ru-en.html 8 Oct 2015 09:27:42 -0000 1.81
+++ po/license-list.ru-en.html 9 Oct 2015 05:28:25 -0000 1.82
@@ -561,7 +561,9 @@
<span class="anchor-reference-id">
(<a href="#HPND">#HPND</a>)</span></dt>
<dd>
-<p>This is a lax, permissive, and weak free software license that is
compatible with the GPL. It is similar to the license of <a
href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
+<p>This is a lax, permissive, and weak free software license that is
+compatible with the GPL. It is similar to the license of <a
+href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
<dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL">
@@ -1977,7 +1979,9 @@
(<a href="#Scilab">#Scilab</a>)</span></dt>
<dd>
<p>This is not a free software license because it does not allow
-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>
+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 1.4 license</a>
@@ -2361,8 +2365,29 @@
<span class="anchor-reference-id">
(<a href="#ccbysa">#ccbysa</a>)</span></dt>
<dd>
+
<p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works.</p>
+entertainment works, and educational works. It is one-way compatible
+with the GNU GPL version 3.0, which means you may license your
+contributions to adaptations of CC BY-SA 4.0 materials under the terms
+of the GNU GPL version 3.0, but you may not license your GNU GPL
+version 3.0 licensed works under the terms of CC BY-SA 4.0. </p>
+
+<p>Because Creative Commons lists only version 3.0 of the GNU GPL on
+its <a href="http://creativecommons.org/compatiblelicenses">compatible
+licenses</a> list, it means that you can not license your adapted CC
+BY-SA works under the terms of “GNU GPL version 3, or (at your option)
+any later version.” However, Section 14 of the GNU GPL version 3.0
+allows licensors to specify a proxy to determine whether future
+versions of the GNU GPL can be used. Therefore, if someone adapts a CC
+BY-SA 4.0 work and incorporates it into a GNU GPL version 3.0 licensed
+project, <a
+href="https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:_GPLv3#Option_to_comply_with_later_versions">they
+can specify Creative Commons as their proxy</a> (via <a
+href="http://creativecommons.org/compatiblelicenses">http://creativecommons.org/compatiblelicenses</a>)
+so that if and when Creative Commons determines that a future version
+of the GNU GPL is a compatible license, the adapted and combined work
+could be used under that later version of the GNU GPL.</p>
<p>Please <a href="#which-cc">be specific about which Creative
Commons license is being used</a>.</p></dd>
@@ -2383,7 +2408,13 @@
<span class="anchor-reference-id">
(<a href="#FreeArt">#FreeArt</a>)</span></dt>
<dd>
-<p>This is a free and copyleft license meant for artistic works. It permits
commercial distribution, as any free license must. It is a copyleft license
because any larger work that includes part of the work you received must be
released, as a whole, either under the same license or under a similar license
that meets stated criteria. Please don't use it for software or documentation,
since it is incompatible with the GNU GPL and with the GNU FDL.</p></dd>
+<p>This is a free and copyleft license meant for artistic works. It
+permits commercial distribution, as any free license must. It is a
+copyleft license because any larger work that includes part of the
+work you received must be released, as a whole, either under the same
+license or under a similar license that meets stated criteria. Please
+don't use it for software or documentation, since it is incompatible
+with the GNU GPL and with the GNU FDL.</p></dd>
<dt><a id="ODbl" href="http://directory.fsf.org/wiki/License:ODbl">
Open Database license</a>
@@ -2602,7 +2633,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/08 09:27:42 $
+$Date: 2015/10/09 05:28:25 $
<!-- 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.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- po/license-list.ru.po 9 Oct 2015 05:14:09 -0000 1.214
+++ po/license-list.ru.po 9 Oct 2015 05:28:25 -0000 1.215
@@ -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: 2015-10-08 21:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -4721,11 +4720,11 @@
"of CC BY-SA 4.0."
msgstr ""
"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким левом,
коÑоÑÐ°Ñ Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
-"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима в однÑ
ÑÑоÑÐ¾Ð½Ñ "
-"Ñ GNU GPL веÑÑии 3.0, ÑÑо ознаÑаеÑ, ÑÑо вÑ
можеÑе лиÑензиÑоваÑÑ Ñвои "
-"Ð²ÐºÐ»Ð°Ð´Ñ Ð¸ доÑабоÑки в маÑеÑÐ¸Ð°Ð»Ñ Ð¿Ð¾Ð´
CC BY-SA 4.0 на ÑÑловиÑÑ
GNU GPL "
-"веÑÑии 3.0, но Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL "
-"веÑÑии 3.0 на ÑÑловиÑÑ
CC BY-SA 4.0."
+"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима в Ð¾Ð´Ð½Ñ "
+"ÑÑоÑÐ¾Ð½Ñ Ñ GNU GPL веÑÑии 3.0, ÑÑо ознаÑаеÑ,
ÑÑо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе лиÑензиÑоваÑÑ "
+"Ñвои Ð²ÐºÐ»Ð°Ð´Ñ Ð¸ доÑабоÑки в маÑеÑÐ¸Ð°Ð»Ñ Ð¿Ð¾Ð´
CC BY-SA 4.0 на ÑÑловиÑÑ
"
+"GNU GPL веÑÑии 3.0, но Ð²Ñ Ð½Ðµ можеÑе
лиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU "
+"GPL веÑÑии 3.0 на ÑÑловиÑÑ
CC BY-SA 4.0."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4745,19 +4744,20 @@
"GNU GPL is a compatible license, the adapted and combined work could be used "
"under that later version of the GNU GPL."
msgstr ""
-"ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3.0 GNU GPL в Ñвоем <a "
-"href=\"http://creativecommons.org/compatiblelicenses\">ÑпиÑке
ÑовмеÑÑимÑÑ
лиÑензий</"
-"a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ Ñвои
доÑабоÑки пÑоизведений под CC BY-SA на
ÑÑловиÑÑ
"
-"“GNU GPL веÑÑии 3 или (по ваÑÐµÐ¼Ñ Ð²ÑбоÑÑ)
более поздней веÑÑии"
-"”. Ðднако Ñаздел 14 GNU GPL веÑÑии 3.0
позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим "
-"назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑдеÑ
опÑеделÑÑÑ, можно ли полÑзоваÑÑÑÑ Ð±ÑдÑÑими
"
-"веÑÑиÑми GNU GPL. Таким обÑазом, еÑли кÑо-Ñо
доÑабоÑÐ°ÐµÑ Ð¿Ñоизведение под CC BY-SA 4.0 "
-"и вклÑÑÐ¸Ñ ÐµÐ³Ð¾ в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU
GPL веÑÑии 3.0, <a href="
-"\"https://wiki.creativecommons.org/wiki/ShareAlike_compatibility:"
+"ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3.0 GNU GPL в Ñвоем "
+"<a href=\"http://creativecommons.org/compatiblelicenses\">ÑпиÑке
ÑовмеÑÑимÑÑ
"
+"лиÑензий</a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои доÑабоÑки пÑоизведений под "
+"CC BY-SA на ÑÑловиÑÑ
“GNU GPL веÑÑии 3 или
(по ваÑÐµÐ¼Ñ "
+"вÑбоÑÑ) более поздней веÑÑии”. Ðднако
Ñаздел 14 GNU GPL "
+"веÑÑии 3.0 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑÐ´ÐµÑ "
+"опÑеделÑÑÑ, можно ли полÑзоваÑÑÑÑ
бÑдÑÑими веÑÑиÑми GNU GPL. Таким обÑазом, "
+"еÑли кÑо-Ñо доÑабоÑÐ°ÐµÑ Ð¿Ñоизведение под
CC BY-SA 4.0 и вклÑÑÐ¸Ñ ÐµÐ³Ð¾ "
+"в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL
веÑÑии 3.0, <a href=\"https://wiki."
+"creativecommons.org/wiki/ShareAlike_compatibility:"
"_GPLv3#Option_to_comply_with_later_versions\">они могÑÑ
назнаÑиÑÑ Creative "
"Commons Ñвоим поÑÑедником</a> (в виде <a
href=\"http://creativecommons.org/"
-"compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>),
Ñак ÑÑо "
-"еÑли Creative Commons опÑеделиÑ, ÑÑо бÑдÑÑаÑ
веÑÑÐ¸Ñ GNU GPL ÑовмеÑÑима, "
+"compatiblelicenses\">http://creativecommons.org/compatiblelicenses</a>),
Ñак "
+"ÑÑо еÑли Creative Commons опÑеделиÑ, ÑÑо бÑдÑÑаÑ
веÑÑÐ¸Ñ GNU GPL ÑовмеÑÑима, "
"Ñо доÑабоÑанное и комбиниÑованное
пÑоизведение можно бÑло Ð±Ñ Ð¸ÑполÑзоваÑÑ "
"под ÑÑой более поздней веÑÑией GNU GPL."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=