[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/license-list.ru.html licenses/po/l...
|
From: |
GNUN |
|
Subject: |
www licenses/license-list.ru.html licenses/po/l... |
|
Date: |
Sun, 17 Jan 2016 15:28:21 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/01/17 15:28:21
Modified files:
licenses : license-list.ru.html
licenses/po : license-list.ru-en.html license-list.ru.po
server/po : sitemap.ru-en.html sitemap.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.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.229&r2=1.230
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru-en.html?cvsroot=www&r1=1.137&r2=1.138
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru.po?cvsroot=www&r1=1.258&r2=1.259
Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- licenses/license-list.ru.html 13 Jan 2016 18:01:27 -0000 1.93
+++ licenses/license-list.ru.html 17 Jan 2016 15:28:20 -0000 1.94
@@ -640,8 +640,8 @@
<dd>
<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Ð
аздел 3.3 коÑвенно обеÑпеÑиваеÑ
ÑовмеÑÑимоÑÑÑ ÑÑой лиÑензии Ñ GNU GPL
веÑÑии 2.0, GNU LGPL
-веÑÑии 2.1, GNU AGPL веÑÑии 3.0 и вÑеми более
поздними веÑÑиÑми
-ÑÑиÑ
лиÑензий. Ðогда Ð²Ñ Ð¿Ð¾Ð»ÑÑаеÑе
пÑоизведение под MPL 2.0, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
+веÑÑии 2.1, GNU AGPL веÑÑии 3 и вÑеми более
поздними веÑÑиÑми ÑÑиÑ
+лиÑензий. Ðогда Ð²Ñ Ð¿Ð¾Ð»ÑÑаеÑе пÑоизведение
под MPL 2.0, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
ÑделаÑÑ “более кÑÑпное
пÑоизведение”, в коÑоÑом ÑÑо
пÑоизведение
ÑоÑеÑаеÑÑÑ Ñ Ð¿Ñоизведением под ÑÑими
лиÑензиÑми GNU. Ðогда Ð²Ñ ÑÑо делаеÑе,
Ñаздел 3.3 Ð´Ð°ÐµÑ Ð²Ð°Ð¼ ÑазÑеÑение
ÑаÑпÑоÑÑÑанÑÑÑ Ð¿Ñоизведение под MPL на
@@ -2334,7 +2334,9 @@
<dd>
<p>ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð±ÐµÐ· авÑоÑÑкого
лева, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
,
ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима Ñо вÑеми
-веÑÑиÑми GNU GPL; однако она не ÑекомендÑеÑÑÑ
Ð´Ð»Ñ Ð¿ÑогÑамм.</p>
+веÑÑиÑми GNU GPL; однако, как и вÑе лиÑензии
Creative Commons, <a
+href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>ее
+<em>не ÑледÑÐµÑ Ð¿ÑименÑÑÑ Ð´Ð»Ñ
пÑогÑамм</em></a>.</p>
<p id="which-cc">
<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2360,23 +2362,27 @@
href="#ccbysa">#ccbysa</a>)</span></dt>
<dd>
-<p>ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким
левом, коÑоÑÐ°Ñ Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
,
-ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. 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. </p>
+<p>ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким
левом, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
,
+ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðак и вÑе лиÑензии Creative
+Commons, <a
+href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>ее
+<em>не ÑледÑÐµÑ Ð¿ÑименÑÑÑ Ð´Ð»Ñ
пÑогÑамм</em></a>.</p>
+
+<p>CC BY-SA 4.0 ÑовмеÑÑима в Ð¾Ð´Ð½Ñ ÑÑоÑÐ¾Ð½Ñ Ñ
GNU GPL веÑÑии 3:
+ÑÑо ознаÑаеÑ, ÑÑо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе вÑпÑÑкаÑÑ Ñвои
измененнÑе веÑÑии маÑеÑиалов под
+CC BY-SA 4.0 на ÑÑловиÑÑ
GNU GPL веÑÑии 3, но
Ð²Ñ Ð½Ðµ можеÑе
+пеÑелиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL
веÑÑии 3 на ÑÑловиÑÑ
+CC BY-SA 4.0.</p>
-<p>ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3.0 GNU GPL в Ñвоем
-<a href="http://creativecommons.org/compatiblelicenses";>ÑпиÑке
ÑовмеÑÑимÑÑ
+<p>ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3 GNU GPL в Ñвоем <a
+href="http://creativecommons.org/compatiblelicenses";>ÑпиÑке
ÑовмеÑÑимÑÑ
лиÑензий</a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои доÑабоÑки пÑоизведений под
CC BY-SA на ÑÑловиÑÑ
“GNU GPL веÑÑии 3 или
(по ваÑемÑ
вÑбоÑÑ) более поздней веÑÑии”. Ðднако
Ñаздел 14 GNU GPL
-веÑÑии 3.0 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑдеÑ
+веÑÑии 3 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑдеÑ
опÑеделÑÑÑ, можно ли полÑзоваÑÑÑÑ
бÑдÑÑими веÑÑиÑми GNU GPL. Таким обÑазом,
еÑли кÑо-Ñо доÑабоÑÐ°ÐµÑ Ð¿Ñоизведение под
CC BY-SA 4.0 и вклÑÑÐ¸Ñ ÐµÐ³Ð¾
-в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL
веÑÑии 3.0, <a
+в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL веÑÑии 3,
<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>),
@@ -2647,7 +2653,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2016/01/13 18:01:27 $
+$Date: 2016/01/17 15:28:20 $
<!-- 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.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- licenses/po/license-list.ru-en.html 13 Jan 2016 18:01:27 -0000 1.86
+++ licenses/po/license-list.ru-en.html 17 Jan 2016 15:28:20 -0000 1.87
@@ -659,7 +659,7 @@
<dd>
<p>This is a free software license. Section 3.3 provides indirect
compatibility between this license and the GNU GPL version 2.0, the
-GNU LGPL version 2.1, the GNU AGPL version 3.0, and all later versions
+GNU LGPL version 2.1, the GNU AGPL version 3, and all later versions
of those licenses. When you receive work under MPL 2.0,
you may make a “Larger Work” that combines that work with
work under those GNU licenses. When you do, section 3.3 gives
@@ -2345,8 +2345,9 @@
<dd>
<p>This is a non-copyleft free license that is good for art and
entertainment works, and educational works. It is compatible with all
-versions of the GNU GPL; however, it is not recommended for use on
-software.</p>
+versions of the GNU GPL; however, like all CC
+licenses, <a
href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>it
<em>should
+not be used on software</em></a>.</p>
<p id="which-cc">
<span class="anchor-reference-id">(<a href="#which-cc">#which-cc</a>)</span>
@@ -2372,20 +2373,23 @@
<dd>
<p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works. CC BY-SA 4.0 is one-way
-compatible with the GNU GPL version 3.0: this means you may license
-your modified versions of CC BY-SA 4.0 materials under GNU GPL version
-3.0, but you may not relicense GNU GPL version 3.0 licensed works
-under CC BY-SA 4.0. </p>
+entertainment works, and educational works. Like all CC
+licenses, <a
href="https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software";>it
<em>should
+not be used on software</em></a>.</p>
+
+<p>CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this
+means you may license your modified versions of CC BY-SA 4.0 materials
+under GNU GPL version 3, but you may not relicense GPL 3 licensed
+works under CC BY-SA 4.0.</p>
-<p>Because Creative Commons lists only version 3.0 of the GNU GPL on
+<p>Because Creative Commons lists only version 3 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
+any later version.” However, Section 14 of the GNU GPL version 3
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
+BY-SA 4.0 work and incorporates it into a GNU GPL version 3 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
@@ -2638,7 +2642,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/01/13 18:01:27 $
+$Date: 2016/01/17 15:28:20 $
<!-- 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.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- licenses/po/license-list.ru.po 17 Jan 2016 14:25:46 -0000 1.229
+++ licenses/po/license-list.ru.po 17 Jan 2016 15:28:21 -0000 1.230
@@ -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-01-16 16:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1180,41 +1179,6 @@
"a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This is a free software license. Section 3.3 provides indirect
-# | compatibility between this license and the GNU GPL version 2.0, the GNU
-# | LGPL version 2.1, the GNU AGPL version [-3.0,-] {+3,+} and all later
-# | versions of those licenses. When you receive work under MPL 2.0, you may
-# | make a “Larger Work” that combines that work with work under
-# | those GNU licenses. When you do, section 3.3 gives you permission to
-# | distribute the MPL-covered work under the terms of the same GNU licenses,
-# | with one condition: you must make sure that the files that were originally
-# | under the MPL are still available under the MPL's terms as well. In other
-# | words, when you make a combination this way, the files that were
-# | originally under the MPL will be dual licensed under the MPL and the GNU
-# | license(s). The end result is that the Larger Work, as a whole, will be
-# | covered under the GNU license(s). People who receive that combination
-# | from you will have the option to use any files that were originally
-# | covered by the MPL under that license's terms, or distribute the Larger
-# | Work in whole or in part under the GNU licenses' terms with no further
-# | restrictions.
-#| msgid ""
-#| "This is a free software license. Section 3.3 provides indirect "
-#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
-#| "LGPL version 2.1, the GNU AGPL version 3.0, and all later versions of "
-#| "those licenses. When you receive work under MPL 2.0, you may make a "
-#| "“Larger Work” that combines that work with work under those "
-#| "GNU licenses. When you do, section 3.3 gives you permission to "
-#| "distribute the MPL-covered work under the terms of the same GNU licenses, "
-#| "with one condition: you must make sure that the files that were "
-#| "originally under the MPL are still available under the MPL's terms as "
-#| "well. In other words, when you make a combination this way, the files "
-#| "that were originally under the MPL will be dual licensed under the MPL "
-#| "and the GNU license(s). The end result is that the Larger Work, as a "
-#| "whole, will be covered under the GNU license(s). People who receive that "
-#| "combination from you will have the option to use any files that were "
-#| "originally covered by the MPL under that license's terms, or distribute "
-#| "the Larger Work in whole or in part under the GNU licenses' terms with no "
-#| "further restrictions."
msgid ""
"This is a free software license. Section 3.3 provides indirect "
"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
@@ -1235,8 +1199,8 @@
msgstr ""
"ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Ð
аздел 3.3 коÑвенно обеÑпеÑÐ¸Ð²Ð°ÐµÑ "
"ÑовмеÑÑимоÑÑÑ ÑÑой лиÑензии Ñ GNU GPL
веÑÑии 2.0, GNU LGPL "
-"веÑÑии 2.1, GNU AGPL веÑÑии 3 и вÑеми более
поздними веÑÑиÑми "
-"ÑÑиÑ
лиÑензий. Ðогда Ð²Ñ Ð¿Ð¾Ð»ÑÑаеÑе
пÑоизведение под MPL 2.0, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе "
+"веÑÑии 2.1, GNU AGPL веÑÑии 3 и вÑеми более
поздними веÑÑиÑми ÑÑиÑ
"
+"лиÑензий. Ðогда Ð²Ñ Ð¿Ð¾Ð»ÑÑаеÑе пÑоизведение
под MPL 2.0, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе "
"ÑделаÑÑ “более кÑÑпное
пÑоизведение”, в коÑоÑом ÑÑо
пÑоизведение "
"ÑоÑеÑаеÑÑÑ Ñ Ð¿Ñоизведением под ÑÑими
лиÑензиÑми GNU. Ðогда Ð²Ñ ÑÑо делаеÑе, "
"Ñаздел 3.3 Ð´Ð°ÐµÑ Ð²Ð°Ð¼ ÑазÑеÑение
ÑаÑпÑоÑÑÑанÑÑÑ Ð¿Ñоизведение под MPL на "
@@ -4722,17 +4686,6 @@
"a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This is a non-copyleft free license that is good for art and entertainment
-# | works, and educational works. It is compatible with all versions of the
-# | GNU GPL; however, [-it is-] {+like all CC licenses, <a
-# |
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
-# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
-# | {+software</em></a>.+}
-#| msgid ""
-#| "This is a non-copyleft free license that is good for art and "
-#| "entertainment works, and educational works. It is compatible with all "
-#| "versions of the GNU GPL; however, it is not recommended for use on "
-#| "software."
msgid ""
"This is a non-copyleft free license that is good for art and entertainment "
"works, and educational works. It is compatible with all versions of the GNU "
@@ -4742,10 +4695,9 @@
msgstr ""
"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð±ÐµÐ· авÑоÑÑкого
лева, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима Ñо вÑеми "
-"веÑÑиÑми GNU GPL; однако, как и вÑе лиÑензии
Creative Commons, "
-"<a href=\"https://creativecommons.org/";
-"faq/#can-i-apply-a-creative-commons-license-to-software\">ее <em>не
ÑледÑÐµÑ "
-"пÑименÑÑÑ Ð´Ð»Ñ Ð¿ÑогÑамм</em></a>."
+"веÑÑиÑми GNU GPL; однако, как и вÑе лиÑензии
Creative Commons, <a href="
+"\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-";
+"software\">ее <em>не ÑледÑÐµÑ Ð¿ÑименÑÑÑ Ð´Ð»Ñ
пÑогÑамм</em></a>."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4784,18 +4736,6 @@
"href=\"#ccbysa\">#ccbysa</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This is a [-non-copyleft-] {+copyleft+} free license that is good for
-# | [-art-] {+artistic+} and entertainment works, and educational works. [-It
-# | is compatible with-] {+Like+} all [-versions of the GNU GPL; however, it
-# | is-] {+CC licenses, <a
-# |
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\";>it
-# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
-# | {+software</em></a>.+}
-#| msgid ""
-#| "This is a non-copyleft free license that is good for art and "
-#| "entertainment works, and educational works. It is compatible with all "
-#| "versions of the GNU GPL; however, it is not recommended for use on "
-#| "software."
msgid ""
"This is a copyleft free license that is good for artistic and entertainment "
"works, and educational works. Like all CC licenses, <a href=\"https://";
@@ -4803,73 +4743,25 @@
"\">it <em>should not be used on software</em></a>."
msgstr ""
"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким левом,
она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
-"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. "
-"Ðак и вÑе лиÑензии Creative Commons, "
-"<a href=\"https://creativecommons.org/";
-"faq/#can-i-apply-a-creative-commons-license-to-software\">ее <em>не
ÑледÑÐµÑ "
-"пÑименÑÑÑ Ð´Ð»Ñ Ð¿ÑогÑамм</em></a>."
-
-#. type: Content of: <dl><dd><p>
-# | [-This is a copyleft free license that is good for artistic and
-# | entertainment works, and educational works.-]CC BY-SA 4.0 is one-way
-# | compatible with the GNU GPL version [-3.0:-] {+3:+} this means you may
-# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
-# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
-# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
-#| msgid ""
-#| "This is a copyleft free license that is good for artistic and "
-#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
-#| "compatible with the GNU GPL version 3.0: this means you may license your "
-#| "modified versions of CC BY-SA 4.0 materials under GNU GPL version 3.0, "
-#| "but you may not relicense GNU GPL version 3.0 licensed works under CC BY-"
-#| "SA 4.0."
+"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðак и вÑе лиÑензии Creative "
+"Commons, <a href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-";
+"commons-license-to-software\">ее <em>не ÑледÑÐµÑ Ð¿ÑименÑÑÑ
Ð´Ð»Ñ Ð¿ÑогÑамм</em></"
+"a>."
+
+#. type: Content of: <dl><dd><p>
msgid ""
"CC BY-SA 4.0 is one-way compatible with the GNU GPL version 3: this means "
"you may license your modified versions of CC BY-SA 4.0 materials under GNU "
"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
"4.0."
msgstr ""
-"CC BY-SA 4.0 "
-"ÑовмеÑÑима в Ð¾Ð´Ð½Ñ ÑÑоÑÐ¾Ð½Ñ Ñ GNU GPL
веÑÑии 3: ÑÑо ознаÑаеÑ, ÑÑо Ð²Ñ "
-"можеÑе вÑпÑÑкаÑÑ Ñвои измененнÑе веÑÑии
маÑеÑиалов под CC BY-"
-"SA 4.0 на ÑÑловиÑÑ
GNU GPL веÑÑии 3, но Ð²Ñ Ð½Ðµ
можеÑе "
-"пеÑелиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL
веÑÑии 3 на ÑÑловиÑÑ
"
-"CC BY-SA 4.0."
-
-#. type: Content of: <dl><dd><p>
-# | Because Creative Commons lists only version [-3.0-] {+3+} 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-] {+3+} 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-] {+3+}
-# | 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.
-#| msgid ""
-#| "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."
+"CC BY-SA 4.0 ÑовмеÑÑима в Ð¾Ð´Ð½Ñ ÑÑоÑÐ¾Ð½Ñ Ñ GNU
GPL веÑÑии 3: "
+"ÑÑо ознаÑаеÑ, ÑÑо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе вÑпÑÑкаÑÑ Ñвои
измененнÑе веÑÑии маÑеÑиалов под "
+"CC BY-SA 4.0 на ÑÑловиÑÑ
GNU GPL веÑÑии 3,
но Ð²Ñ Ð½Ðµ можеÑе "
+"пеÑелиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL
веÑÑии 3 на ÑÑловиÑÑ
CC "
+"BY-SA 4.0."
+
+#. type: Content of: <dl><dd><p>
msgid ""
"Because Creative Commons lists only version 3 of the GNU GPL on its <a href="
"\"http://creativecommons.org/compatiblelicenses\";>compatible licenses</a> "
@@ -4887,8 +4779,8 @@
"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 GNU GPL в Ñвоем "
-"<a href=\"http://creativecommons.org/compatiblelicenses\";>ÑпиÑке
ÑовмеÑÑимÑÑ
"
+"ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3 GNU GPL в Ñвоем <a "
+"href=\"http://creativecommons.org/compatiblelicenses\";>ÑпиÑке
ÑовмеÑÑимÑÑ
"
"лиÑензий</a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои доÑабоÑки пÑоизведений под "
"CC BY-SA на ÑÑловиÑÑ
“GNU GPL веÑÑии 3 или
(по ваÑÐµÐ¼Ñ "
"вÑбоÑÑ) более поздней веÑÑии”. Ðднако
Ñаздел 14 GNU GPL "
Index: server/po/sitemap.ru-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru-en.html,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/po/sitemap.ru-en.html 12 Jan 2016 07:43:54 -0000 1.137
+++ server/po/sitemap.ru-en.html 17 Jan 2016 15:28:21 -0000 1.138
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
<title>Site map of www.gnu.org - GNU Project - Free Software Foundation</title>
@@ -1887,7 +1887,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright © 2016 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
@@ -1897,7 +1897,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/01/12 07:43:54 $
+$Date: 2016/01/17 15:28:21 $
<!-- timestamp end -->
</p>
</div>
Index: server/po/sitemap.ru.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru.po,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- server/po/sitemap.ru.po 17 Jan 2016 14:25:46 -0000 1.258
+++ server/po/sitemap.ru.po 17 Jan 2016 15:28:21 -0000 1.259
@@ -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-01-16 17:55+0000\n"
#. type: Content of: <title>
msgid "Site map of www.gnu.org - GNU Project - Free Software Foundation"
@@ -6258,8 +6257,6 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 201[-4-]{+6+} Free Software Foundation, Inc.
-#| msgid "Copyright © 2014 Free Software Foundation, Inc."
msgid "Copyright © 2016 Free Software Foundation, Inc."
msgstr "Copyright © 2016 Free Software Foundation, Inc."