[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/license-list.ru.html licenses/lice...
From: |
GNUN |
Subject: |
www licenses/license-list.ru.html licenses/lice... |
Date: |
Sat, 13 Jun 2015 14:28:27 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/06/13 14:28:27
Modified files:
licenses : license-list.ru.html licenses.ru.html
licenses/po : license-list.ru-en.html license-list.ru.po
licenses.ru-en.html licenses.ru.po
software : recent-releases-include.ru.html
software/po : recent-releases-include.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.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ru.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.198&r2=1.199
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ru-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ru.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.645&r2=1.646
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.859&r2=1.860
Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- licenses/license-list.ru.html 10 Jun 2015 13:27:44 -0000 1.85
+++ licenses/license-list.ru.html 13 Jun 2015 14:28:25 -0000 1.86
@@ -1095,12 +1095,11 @@
License, CDDL), веÑÑÐ¸Ñ 1.0</a> <span class="anchor-reference-id"> (<a
href="#CDDL">#CDDL</a>)</span></dt>
<dd>
-<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Рней
еÑÑÑ Ð°Ð²ÑоÑÑкое лево Ñ Ð¾Ð±Ð»Ð°ÑÑÑÑ
-дейÑÑвиÑ, подобной облаÑÑи дейÑÑвиÑ
авÑоÑÑкого лева в ÐбÑеÑÑвенной лиÑензии
-Mozilla, ÑÑо Ð´ÐµÐ»Ð°ÐµÑ ÐµÐµ неÑовмеÑÑимой Ñ <a
href="/licenses/gpl.html">GNU
-GPL</a>. ÐÑо знаÑиÑ, ÑÑо по Ð·Ð°ÐºÐ¾Ð½Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´ GPL
и модÑÐ»Ñ Ð¿Ð¾Ð´ CDDL нелÑзÑ
-компоноваÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом. Ðо ÑÑой пÑиÑине
Ð¼Ñ Ð½Ð°ÑÑоÑÑелÑно ÑекомендÑем вам
-не пÑименÑÑÑ CDDL.</p>
+<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Рней
еÑÑÑ Ñлабое поÑайловое авÑоÑÑкое лево
+(как в веÑÑии 1 ÐбÑеÑÑвенной лиÑензии
Mozilla), ÑÑо Ð´ÐµÐ»Ð°ÐµÑ ÐµÐµ
+неÑовмеÑÑимой Ñ <a href="/licenses/gpl.html">GNU GPL</a>. ÐÑо
знаÑиÑ, ÑÑо по
+Ð·Ð°ÐºÐ¾Ð½Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´ GPL и модÑÐ»Ñ Ð¿Ð¾Ð´ CDDL нелÑзÑ
компоноваÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом. Ðо
+ÑÑой пÑиÑине Ð¼Ñ Ð½Ð°ÑÑоÑÑелÑно ÑекомендÑем
вам не пÑименÑÑÑ CDDL.</p>
<p>Также в CDDL неÑдаÑно Ñо, ÑÑо она
полÑзÑеÑÑÑ ÑеÑмином “<a
href="/philosophy/not-ipr.html"> инÑеллекÑÑалÑнаÑ
ÑобÑÑвенноÑÑÑ</a>”.</p></dd>
@@ -2248,6 +2247,22 @@
Ð´Ð»Ñ Ñой, ни Ð´Ð»Ñ Ð´ÑÑгой. ЧÑобÑ
гаÑанÑиÑоваÑÑ, ÑÑо лÑди понимаÑÑ, ÑÑо вÑ
говоÑиÑе, иÑ
Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑÑÐ¾Ð¸Ñ Ð¿Ð¸ÑаÑÑ
полноÑÑÑÑ.</p></dd>
+<dt><a id="CC-BY-NC" href="?">ÐекоммеÑÑеÑÐºÐ°Ñ Ð»Ð¸ÑензиÑ
Creative Commons, вÑе
+веÑÑии</a> <span class="anchor-reference-id"> (<a
+href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
+<dd>
+<p>ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð½Ðµ ÑдовлеÑвоÑÑÐµÑ ÐºÑиÑеÑиÑм
Ñвободной, поÑÐ¾Ð¼Ñ ÑÑо в ней еÑÑÑ
+огÑаниÑÐµÐ½Ð¸Ñ Ð½Ð° взимание денег за копии. ÐÑ
ÑекомендÑем вам не пÑименÑÑÑ ÑÑÑ
+лиÑензиÑ.</p></dd>
+
+<dt><a id="CC-BY-ND" href="?">ÐиÑÐµÐ½Ð·Ð¸Ñ Creative Commons без
пÑоизводнÑÑ
, вÑе
+веÑÑии</a> <span class="anchor-reference-id"> (<a
+href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
+<dd>
+<p>ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð½Ðµ ÑдовлеÑвоÑÑÐµÑ ÐºÑиÑеÑиÑм
Ñвободной, поÑÐ¾Ð¼Ñ ÑÑо в ней еÑÑÑ
+огÑаниÑÐµÐ½Ð¸Ñ Ð½Ð° ÑаÑпÑоÑÑÑанение измененнÑÑ
веÑÑий. ÐÑ ÑекомендÑем вам не
+пÑименÑÑÑ ÑÑÑ Ð»Ð¸ÑензиÑ.</p></dd>
+
</dl>
<!-- end class="red" -->
@@ -2591,7 +2606,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/06/10 13:27:44 $
+$Date: 2015/06/13 14:28:25 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.ru.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ru.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/licenses.ru.html 25 Feb 2015 17:57:07 -0000 1.28
+++ licenses/licenses.ru.html 13 Jun 2015 14:28:25 -0000 1.29
@@ -44,6 +44,18 @@
<p>У Ð½Ð°Ñ ÐµÑÑÑ Ñакже ÑÑÑаниÑа, на коÑоÑой
обÑÑждаеÑÑÑ <a
href="/philosophy/bsd.html"> пÑоблема лиÑензии BSD</a>.</p>
+<h3>ÐÑенка лиÑензий</h3>
+
+<p>ÐÑли Ð²Ñ Ð²ÑÑÑеÑили лиÑензиÑ, не
ÑпомÑнÑÑÑÑ Ð² наÑем <a
+href="/licenses/license-list.html"> ÑпиÑке лиÑензий</a>, вÑ
можеÑе попÑоÑиÑÑ
+Ð½Ð°Ñ Ð¾Ð¿ÑеделиÑÑ, ÑвлÑеÑÑÑ Ð»Ð¸ она лиÑензией
ÑвободнÑÑ
пÑогÑамм. ÐÑиÑлиÑе,
+пожалÑйÑÑа, нам по ÑлекÑÑонной поÑÑе копиÑ
лиÑензии (вмеÑÑе Ñ URL, по
+коÑоÑÐ¾Ð¼Ñ Ð²Ñ ÐµÐµ наÑли) на адÑÐµÑ <a
+href="mailto:address@hidden">address@hidden</a>. ÐаÑи ÑкÑпеÑÑÑ
+лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð² ÑÑаÑе ÑоÑÑÑдников и
ÑовеÑе диÑекÑоÑов ÑаÑÑмоÑÑÑÑ ÐµÐµ. ÐÑли в
+лиÑензии еÑÑÑ ÐºÐ°ÐºÐ¸Ðµ-Ñо необÑÑнÑе ÑÑловиÑ,
они могÑÑ Ð¿ÑивеÑÑи к ÑложнÑм
+ÑилоÑоÑÑким пÑоблемам, Ñак ÑÑо Ð¼Ñ Ð½Ðµ
обеÑаем пÑинÑÑÑ ÑеÑение бÑÑÑÑо.</p>
+
<h3>ÐбÑие маÑеÑÐ¸Ð°Ð»Ñ Ð¿Ð¾ наÑим лиÑензиÑм длÑ
пÑогÑамм</h3>
<p>У Ð½Ð°Ñ ÐµÑÑÑ Ð½ÐµÐºÐ¾ÑоÑое колиÑеÑÑво
маÑеÑиалов в помоÑÑ Ð»ÑдÑм, желаÑÑим понÑÑÑ
@@ -451,7 +463,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -468,9 +480,9 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru">лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -485,7 +497,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/02/25 17:57:07 $
+$Date: 2015/06/13 14:28:25 $
<!-- 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.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- licenses/po/license-list.ru-en.html 10 Jun 2015 13:27:45 -0000 1.77
+++ licenses/po/license-list.ru-en.html 13 Jun 2015 14:28:25 -0000 1.78
@@ -1111,11 +1111,12 @@
Common Development and Distribution License (CDDL), version 1.0</a>
<span class="anchor-reference-id"> (<a href="#CDDL">#CDDL</a>)</span></dt>
<dd>
-<p>This is a free software license. It has a copyleft with a scope that's
-similar to the one in the Mozilla Public License, which makes it
-incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>. This means
-a module covered by the GPL and a module covered by the CDDL cannot legally
-be linked together. We urge you not to use the CDDL for this reason.</p>
+<p>This is a free software license. It has a weak per-file copyleft
+(like version 1 of the Mozilla Public License) which makes it
+incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>. This
+means a module covered by the GPL and a module covered by the CDDL
+cannot legally be linked together. We urge you not to use the CDDL
+for this reason.</p>
<p>Also unfortunate in the CDDL is its use of the term “<a
href="/philosophy/not-ipr.html">intellectual
@@ -2254,6 +2255,21 @@
spelling their names in full to make sure people understand what you
say.</p></dd>
+<dt><a id="CC-BY-NC" href="?">Creative Commons Nocommercial, any version</a>
+ <span class="anchor-reference-id">
+ (<a href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
+<dd>
+<p>This license does not qualify as free, because there are restrictions on
+charging money for copies. We recommend you do not use this license.</p></dd>
+
+<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives, any version</a>
+ <span class="anchor-reference-id">
+ (<a href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
+<dd>
+<p>This license does not qualify as free, because there are
+restrictions on distributing modified versions. We recommend you do
+not use this license.</p></dd>
+
</dl> <!-- end class="red" -->
<div class="big-section">
@@ -2571,7 +2587,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/10 13:27:45 $
+$Date: 2015/06/13 14:28:25 $
<!-- 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.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- licenses/po/license-list.ru.po 13 Jun 2015 14:15:57 -0000 1.198
+++ licenses/po/license-list.ru.po 13 Jun 2015 14:28:26 -0000 1.199
@@ -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-06-12 21:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -2108,19 +2107,6 @@
"\"> (<a href=\"#CDDL\">#CDDL</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This is a free software license. It has a {+weak per-file+} copyleft
-# | [-with a scope that's similar to the one in-] {+(like version 1 of+} the
-# | Mozilla Public License[-,-]{+)+} which makes it incompatible with the <a
-# | href=\"/licenses/gpl.html\">GNU GPL</a>. This means a module covered by
-# | the GPL and a module covered by the CDDL cannot legally be linked
-# | together. We urge you not to use the CDDL for this reason.
-#| msgid ""
-#| "This is a free software license. It has a copyleft with a scope that's "
-#| "similar to the one in the Mozilla Public License, which makes it "
-#| "incompatible with the <a href=\"/licenses/gpl.html\">GNU GPL</a>. This "
-#| "means a module covered by the GPL and a module covered by the CDDL cannot "
-#| "legally be linked together. We urge you not to use the CDDL for this "
-#| "reason."
msgid ""
"This is a free software license. It has a weak per-file copyleft (like "
"version 1 of the Mozilla Public License) which makes it incompatible with "
@@ -2129,11 +2115,10 @@
"together. We urge you not to use the CDDL for this reason."
msgstr ""
"ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Рней
еÑÑÑ Ñлабое поÑайловое авÑоÑÑкое лево "
-"(как в веÑÑии 1 ÐбÑеÑÑвенной лиÑензии "
-"Mozilla), ÑÑо Ð´ÐµÐ»Ð°ÐµÑ ÐµÐµ неÑовмеÑÑимой Ñ <a
href=\"/licenses/gpl.html\">GNU "
-"GPL</a>. ÐÑо знаÑиÑ, ÑÑо по Ð·Ð°ÐºÐ¾Ð½Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´
GPL и модÑÐ»Ñ Ð¿Ð¾Ð´ CDDL нелÑÐ·Ñ "
-"компоноваÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом. Ðо ÑÑой пÑиÑине
Ð¼Ñ Ð½Ð°ÑÑоÑÑелÑно ÑекомендÑем вам "
-"не пÑименÑÑÑ CDDL."
+"(как в веÑÑии 1 ÐбÑеÑÑвенной лиÑензии
Mozilla), ÑÑо Ð´ÐµÐ»Ð°ÐµÑ ÐµÐµ "
+"неÑовмеÑÑимой Ñ <a href=\"/licenses/gpl.html\">GNU GPL</a>.
ÐÑо знаÑиÑ, ÑÑо "
+"по Ð·Ð°ÐºÐ¾Ð½Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´ GPL и модÑÐ»Ñ Ð¿Ð¾Ð´ CDDL
нелÑÐ·Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²Ð°ÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом. "
+"Ðо ÑÑой пÑиÑине Ð¼Ñ Ð½Ð°ÑÑоÑÑелÑно
ÑекомендÑем вам не пÑименÑÑÑ CDDL."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4542,55 +4527,33 @@
"понимаÑÑ, ÑÑо Ð²Ñ Ð³Ð¾Ð²Ð¾ÑиÑе, иÑ
названиÑ
ÑÑÐ¾Ð¸Ñ Ð¿Ð¸ÑаÑÑ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ."
#. type: Content of: <dl><dt>
-# | <a [-id=\"cpol\">Code Project Open License, version 1.02</a>-]
-# | {+id=\"CC-BY-NC\" href=\"?\">Creative Commons Nocommercial, any
-# | version</a>+} <span class=\"anchor-reference-id\"> (<a
-# | [-href=\"#cpol\">#cpol</a>)</span>-]
-# | {+href=\"#CC-BY-NC\">#CC-BY-NC</a>)</span>+}
-#| msgid ""
-#| "<a id=\"cpol\">Code Project Open License, version 1.02</a> <span class="
-#| "\"anchor-reference-id\"> (<a href=\"#cpol\">#cpol</a>)</span>"
msgid ""
"<a id=\"CC-BY-NC\" href=\"?\">Creative Commons Nocommercial, any version</a> "
"<span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-NC\">#CC-BY-NC</a>)</"
"span>"
msgstr ""
-"<a id=\"CC-BY-NC\" href=\"?\">ÐекоммеÑÑеÑÐºÐ°Ñ Ð»Ð¸ÑензиÑ
Creative Commons, вÑе веÑÑии</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-NC\">#CC-BY-NC</a>)</"
-"span>"
+"<a id=\"CC-BY-NC\" href=\"?\">ÐекоммеÑÑеÑÐºÐ°Ñ Ð»Ð¸ÑензиÑ
Creative Commons, вÑе "
+"веÑÑии</a> <span class=\"anchor-reference-id\"> (<a
href=\"#CC-BY-NC\">#CC-"
+"BY-NC</a>)</span>"
#. type: Content of: <dl><dt>
-# | <a [-id=\"CC0\" href=\"http://directory.fsf.org/wiki/License:CC0\">
-# | CC0</a>-] {+id=\"CC-BY-ND\" href=\"?\">Creative Commons Noderivatives, any
-# | version</a>+} <span [-class=\"anchor-reference-id\">(<a
-# | href=\"#CC0\">#CC0</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
-# | href=\"#CC-BY-ND\">#CC-BY-ND</a>)</span>+}
-#| msgid ""
-#| "<a id=\"CC0\" href=\"http://directory.fsf.org/wiki/License:CC0\"> CC0</a> "
-#| "<span class=\"anchor-reference-id\">(<a href=\"#CC0\">#CC0</a>)</span>"
msgid ""
"<a id=\"CC-BY-ND\" href=\"?\">Creative Commons Noderivatives, any version</"
"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</a>)"
"</span>"
msgstr ""
-"<a id=\"CC-BY-ND\" href=\"?\">ÐиÑÐµÐ½Ð·Ð¸Ñ Creative Commons без
пÑоизводнÑÑ
, вÑе веÑÑии</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</a>)</"
-"span>"
+"<a id=\"CC-BY-ND\" href=\"?\">ÐиÑÐµÐ½Ð·Ð¸Ñ Creative Commons без
пÑоизводнÑÑ
, вÑе "
+"веÑÑии</a> <span class=\"anchor-reference-id\"> (<a
href=\"#CC-BY-ND\">#CC-"
+"BY-ND</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | This license does not qualify as free, because there are restrictions on
-# | [-charging money for copies.-] {+distributing modified versions.+} We
-# | recommend you do not use this license.
-#| msgid ""
-#| "This license does not qualify as free, because there are restrictions on "
-#| "charging money for copies. We recommend you do not use this license."
msgid ""
"This license does not qualify as free, because there are restrictions on "
"distributing modified versions. We recommend you do not use this license."
msgstr ""
"ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð½Ðµ ÑдовлеÑвоÑÑÐµÑ ÐºÑиÑеÑиÑм
Ñвободной, поÑÐ¾Ð¼Ñ ÑÑо в ней еÑÑÑ "
-"огÑаниÑÐµÐ½Ð¸Ñ Ð½Ð° ÑаÑпÑоÑÑÑанение
измененнÑÑ
веÑÑий. ÐÑ ÑекомендÑем вам не
пÑименÑÑÑ ÑÑÑ "
-"лиÑензиÑ."
+"огÑаниÑÐµÐ½Ð¸Ñ Ð½Ð° ÑаÑпÑоÑÑÑанение
измененнÑÑ
веÑÑий. ÐÑ ÑекомендÑем вам не "
+"пÑименÑÑÑ ÑÑÑ Ð»Ð¸ÑензиÑ."
#. type: Content of: <div><h3>
msgid "Licenses for Other Works"
Index: licenses/po/licenses.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ru-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- licenses/po/licenses.ru-en.html 8 Mar 2015 10:27:15 -0000 1.26
+++ licenses/po/licenses.ru-en.html 13 Jun 2015 14:28:26 -0000 1.27
@@ -38,6 +38,18 @@
<p>We also have a page that discusses <a href="/philosophy/bsd.html">the BSD
License Problem</a>.</p>
+<h3>Evaluating Licenses</h3>
+
+<p>If you come across a license not mentioned in our
+<a href="/licenses/license-list.html">license list</a>, you can ask us
+to evaluate whether it is a free license. Please email a copy of the
+license (and the URL where you found it)
+to <a href="mailto:address@hidden">address@hidden</a>. Our
+licensing experts in the staff and the board of directors will review
+it. If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.</p>
+
<h3>Common Resources for our Software Licenses</h3>
<p>We have a number of resources to help people understand and use our
@@ -432,7 +444,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -450,14 +462,14 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/03/08 10:27:15 $
+$Date: 2015/06/13 14:28:26 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ru.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- licenses/po/licenses.ru.po 13 Jun 2015 14:15:57 -0000 1.35
+++ licenses/po/licenses.ru.po 13 Jun 2015 14:28:26 -0000 1.36
@@ -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-06-12 21:55+0000\n"
#. type: Content of: <title>
msgid "Licenses - GNU Project - Free Software Foundation"
@@ -100,15 +99,15 @@
"review it. If the license has some unusual conditions, they may pose "
"difficult philosophical problems, so we can't promise to decide quickly."
msgstr ""
-"ÐÑли Ð²Ñ Ð²ÑÑÑеÑили лиÑензиÑ, не ÑпомÑнÑÑÑÑ
в наÑем <a "
-"href=\"/licenses/license-list.html\"> ÑпиÑке лиÑензий</a>, вÑ
можеÑе "
-"попÑоÑиÑÑ Ð½Ð°Ñ Ð¾Ð¿ÑеделиÑÑ, ÑвлÑеÑÑÑ Ð»Ð¸ она
лиÑензией ÑвободнÑÑ
пÑогÑамм. "
-"ÐÑиÑлиÑе, пожалÑйÑÑа, нам по ÑлекÑÑонной
поÑÑе ÐºÐ¾Ð¿Ð¸Ñ Ð»Ð¸Ñензии (вмеÑÑе Ñ URL, "
-"по коÑоÑÐ¾Ð¼Ñ Ð²Ñ ÐµÐµ наÑли) на адÑÐµÑ <a "
-"href=\"mailto:address@hidden">address@hidden</a>. ÐаÑи ÑкÑпеÑÑÑ "
-"лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð² ÑÑаÑе ÑоÑÑÑдников и
ÑовеÑе диÑекÑоÑов ÑаÑÑмоÑÑÑÑ ÐµÐµ. ÐÑли в "
-"лиÑензии еÑÑÑ ÐºÐ°ÐºÐ¸Ðµ-Ñо необÑÑнÑе ÑÑловиÑ,
они могÑÑ Ð¿ÑивеÑÑи к ÑложнÑм "
-"ÑилоÑоÑÑким пÑоблемам, Ñак ÑÑо Ð¼Ñ Ð½Ðµ
обеÑаем пÑинÑÑÑ ÑеÑение бÑÑÑÑо."
+"ÐÑли Ð²Ñ Ð²ÑÑÑеÑили лиÑензиÑ, не ÑпомÑнÑÑÑÑ
в наÑем <a href=\"/licenses/"
+"license-list.html\"> ÑпиÑке лиÑензий</a>, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
попÑоÑиÑÑ Ð½Ð°Ñ "
+"опÑеделиÑÑ, ÑвлÑеÑÑÑ Ð»Ð¸ она лиÑензией
ÑвободнÑÑ
пÑогÑамм. ÐÑиÑлиÑе, "
+"пожалÑйÑÑа, нам по ÑлекÑÑонной поÑÑе
ÐºÐ¾Ð¿Ð¸Ñ Ð»Ð¸Ñензии (вмеÑÑе Ñ URL, по "
+"коÑоÑÐ¾Ð¼Ñ Ð²Ñ ÐµÐµ наÑли) на адÑÐµÑ <a
href=\"mailto:address@hidden"
+"\">address@hidden</a>. ÐаÑи ÑкÑпеÑÑÑ Ð»Ð¸ÑензиÑованиÑ
в ÑÑаÑе ÑоÑÑÑдников и "
+"ÑовеÑе диÑекÑоÑов ÑаÑÑмоÑÑÑÑ ÐµÐµ. ÐÑли в
лиÑензии еÑÑÑ ÐºÐ°ÐºÐ¸Ðµ-Ñо необÑÑнÑе "
+"ÑÑловиÑ, они могÑÑ Ð¿ÑивеÑÑи к ÑложнÑм
ÑилоÑоÑÑким пÑоблемам, Ñак ÑÑо Ð¼Ñ Ð½Ðµ "
+"обеÑаем пÑинÑÑÑ ÑеÑение бÑÑÑÑо."
#. type: Content of: <h3>
msgid "Common Resources for our Software Licenses"
@@ -866,11 +865,6 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://"
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://"
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -b -r1.645 -r1.646
--- software/recent-releases-include.ru.html 11 Jun 2015 15:31:39 -0000
1.645
+++ software/recent-releases-include.ru.html 13 Jun 2015 14:28:26 -0000
1.646
@@ -1,9 +1,9 @@
<ul>
-<li><strong>June 11, 2015</strong>
+<li><strong>11 иÑÐ½Ñ 2015</strong>
<ul>
<li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00005.html">GnuPG
-2.1.5 released</a>, <i>Werner Koch</i>, <tt>10:54</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2015-05/msg00005.html">ÐÑпÑÑен
+GnuPG 2.1.5</a>, <i>ÐеÑÐ½ÐµÑ ÐоÑ
</i>, <tt>10:54</tt></li>
</ul></li>
<li><strong>10 иÑÐ½Ñ 2015</strong>
<ul>
Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -b -r1.859 -r1.860
--- software/po/recent-releases-include.ru.po 13 Jun 2015 14:15:58 -0000
1.859
+++ software/po/recent-releases-include.ru.po 13 Jun 2015 14:28:26 -0000
1.860
@@ -14,24 +14,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-11 15:29+0000\n"
#. type: Content of: <ul><li>
-# | <strong>June 1[-0-]{+1+}, 2015</strong>
-#| msgid "<strong>June 10, 2015</strong>"
msgid "<strong>June 11, 2015</strong>"
msgstr "<strong>11 иÑÐ½Ñ 2015</strong>"
#. type: Content of: <ul><li><ul><li>
-# | <a
-# |
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2015-05/msg00006.html\">GnuPG
-# | 2.1.4-]
-# |
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00005.html\">GnuPG
-# | 2.1.5+} released</a>, <i>Werner Koch</i>, [-<tt>14:16</tt>-]
-# | {+<tt>10:54</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-05/msg00006.html"
-#| "\">GnuPG 2.1.4 released</a>, <i>Werner Koch</i>, <tt>14:16</tt>"
msgid ""
"<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00005.html"
"\">GnuPG 2.1.5 released</a>, <i>Werner Koch</i>, <tt>10:54</tt>"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/license-list.ru.html licenses/lice...,
GNUN <=