[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, 09 Mar 2014 11:30:41 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/03/09 11:30:40
Modified files:
licenses : license-list.ru.html
licenses/po : license-list.ru-en.html license-list.ru.po
philosophy : free-sw.ru.html
philosophy/po : free-sw.ru-en.html free-sw.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.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.108&r2=1.109
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.ru.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ru-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ru.po?cvsroot=www&r1=1.58&r2=1.59
Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- licenses/license-list.ru.html 28 Jan 2014 18:01:25 -0000 1.53
+++ licenses/license-list.ru.html 9 Mar 2014 11:30:38 -0000 1.54
@@ -1524,12 +1524,14 @@
<p>ÐÑли иÑÑ
однÑй ÑекÑÑ Ð½Ðµ неÑÐµÑ Ð»Ð¸ÑензиÑ,
даÑÑÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм ÑÑи ÑеÑÑÑе
ÑÑÑеÑÑвеннÑÑ
ÑвободÑ, Ñо ÑÑо не ÑвободнаÑ
пÑогÑамма.</p>
-<p>ÐекоÑоÑÑе ÑазÑабоÑÑики дÑмаÑÑ, ÑÑо
пÑогÑамма без лиÑензии Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ Ð²
-обÑеÑÑвенное доÑÑоÑние. ÐÑи нÑнеÑнем
авÑоÑÑком пÑаве ÑÑо не Ñак; наобоÑоÑ,
-вÑе пÑоизведениÑ, на коÑоÑÑе оно
ÑаÑпÑоÑÑÑанÑеÑÑÑ, по ÑмолÑаниÑ
-неÑвободнÑ. Ð Ñом ÑиÑле пÑогÑаммÑ. Ð
некоÑоÑÑÑ
ÑÑÑанаÑ
полÑзоваÑели, коÑоÑÑе
-беÑÑÑ Ð¸Ð· ÑеÑи пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· лиÑензии,
могÑÑ Ð½Ð°ÑÑÑаÑÑ Ð°Ð²ÑоÑÑкое пÑаво Ñже
-Ñем, ÑÑо компилиÑÑÑÑ Ð¸Ð»Ð¸ вÑполнÑÑÑ ÐµÐµ.</p>
+<p>ÐекоÑоÑÑе ÑазÑабоÑÑики дÑмаÑÑ, ÑÑо
пÑогÑамма без лиÑензии Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ Ð² <a
+href="#PublicDomain">обÑеÑÑвенное доÑÑоÑние</a>. ÐÑи
нÑнеÑнем авÑоÑÑком
+пÑаве ÑÑо не Ñак; наобоÑоÑ, оно по
ÑмолÑÐ°Ð½Ð¸Ñ ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° вÑе
+пÑоизведениÑ, на какие ÑолÑко можеÑ. Ð Ñом
ÑиÑле на пÑогÑаммÑ. ÐÑи
+оÑÑÑÑÑÑвии лиÑензии, коÑоÑÐ°Ñ Ð´Ð°ÐµÑ
полÑзоваÑелÑм ÑвободÑ, Ñ Ð½Ð¸Ñ
Ð½ÐµÑ Ð½Ð¸ÐºÐ°ÐºÐ¾Ð¹
+ÑвободÑ. РнекоÑоÑÑÑ
ÑÑÑанаÑ
полÑзоваÑели,
коÑоÑÑе беÑÑÑ Ð¸Ð· ÑеÑи пÑогÑаммÑ
+без лиÑензии, могÑÑ Ð½Ð°ÑÑÑаÑÑ Ð°Ð²ÑоÑÑкое
пÑаво Ñже Ñем, ÑÑо компилиÑÑÑÑ Ð¸Ð»Ð¸
+вÑполнÑÑÑ ÐµÐµ.</p>
<p>ЧÑÐ¾Ð±Ñ Ð¿ÑогÑамма бÑла Ñвободной, ее
пÑавообладаÑели Ð´Ð¾Ð»Ð¶Ð½Ñ Ñвно пÑедоÑÑавиÑÑ
полÑзоваÑелÑм <a href="/philosophy/free-sw.html"> ÑеÑÑÑе
ÑÑÑеÑÑвеннÑÑ
@@ -1537,6 +1539,13 @@
<em>лиÑензией ÑвободнÑÑ
пÑогÑамм</em>. ÐлÑ
ÑÑого-Ñо и ÑлÑÐ¶Ð°Ñ Ð»Ð¸Ñензии
ÑвободнÑÑ
пÑогÑамм.</p>
+<p>ÐÑогÑаммÑ, напиÑаннÑе ÑоÑÑÑдниками
гоÑÑдаÑÑÑвеннÑÑ
оÑганов СШÐ, пÑедÑÑавлÑÑÑ
+оÑобое иÑклÑÑение, поÑколÑÐºÑ Ð·Ð°ÐºÐ¾Ð½Ñ Ð¾Ð±
авÑоÑÑком пÑаве СШРÑвно помеÑаÑÑ Ð¸Ñ
+в обÑеÑÑвенное доÑÑоÑние; но ÑÑо не
оÑноÑиÑÑÑ Ðº пÑоизведениÑм, напиÑаннÑм
+компанией за плаÑÑ Ð¾Ñ Ð³Ð¾ÑÑдаÑÑÑва. ÐÑо не
оÑноÑиÑÑÑ Ñакже к дÑÑгим ÑÑÑанам,
+во многиÑ
из коÑоÑÑÑ
гоÑÑдаÑÑÑвÑ
позволено обладаÑÑ Ð°Ð²ÑоÑÑкими пÑавами на
+гоÑÑдаÑÑÑвеннÑе пÑоизведениÑ.</p>
+
<p>РнекоÑоÑÑÑ
ÑÑÑанаÑ
авÑоÑам позволено
помеÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð² обÑеÑÑвенное
доÑÑоÑние, но ÑÑо ÑÑебÑÐµÑ ÑвнÑÑ
дейÑÑвий.
ÐÑли Ð²Ñ Ñ
оÑиÑе ÑделаÑÑ ÑÑо, мÑ
ÑекомендÑем воÑполÑзоваÑÑÑÑ <a href="#CC0">CC0</a>,
ÑÑо ÑабоÑÐ°ÐµÑ Ñакже в
@@ -1642,6 +1651,15 @@
дополниÑелÑнÑм ÑазÑеÑением компоноваÑÑ Ñ
неÑвободнÑми пÑогÑаммами.</p></dd>
+<dt><a id="DOR" href="http://dorepository.org/download.html">
ÐиÑензионное
+ÑоглаÑение РепозиÑоÑÐ¸Ñ ÑиÑÑовÑÑ
обÑекÑов
CNRI</a> <span
+class="anchor-reference-id"> (<a href="#DOR">#DOR</a>)</span></dt>
+<dd>
+<p>ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ ÑвлÑеÑÑÑ Ð»Ð¸Ñензией
неÑвободнÑÑ
пÑогÑамм из-за ÑÑаÑÑи 3, в
+коÑоÑой, по-видимомÑ, пÑиÑÑÑÑÑвÑеÑ
ÑÑебование не наÑÑÑаÑÑ Ð»Ð¸ÑензиÑ
+<em>лÑбой</em> пÑогÑаммÑ, Ñ ÐºÐ¾ÑоÑой ÑабоÑаеÑ
полÑзоваÑÐµÐ»Ñ — даже
+еÑли пÑогÑамма неÑвободна.</p></dd>
+
<dt><a id="GPL-PA" href="http://directory.fsf.org/wiki/License:GPL-PA">
СÑандаÑÑÐ½Ð°Ñ Ð¾Ð±ÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð´Ð»Ñ
компÑÑÑеÑнÑÑ
пÑогÑамм обÑеÑÑвенной
админиÑÑÑаÑии</a> <span class="anchor-reference-id"> (<a
@@ -2315,7 +2333,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/01/28 18:01:25 $
+$Date: 2014/03/09 11:30:38 $
<!-- 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.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- licenses/po/license-list.ru-en.html 28 Jan 2014 18:01:25 -0000 1.46
+++ licenses/po/license-list.ru-en.html 9 Mar 2014 11:30:39 -0000 1.47
@@ -1555,11 +1555,13 @@
<p>If source code does not carry a license to give users the
four essential freedoms, it is not free software.</p>
-<p>Some developers think that code with no license is in the public
-domain. That is not true under today's copyright law; rather, all
-copyrightable works are nonfree by default. This includes programs.
-In some countries, users that download code with no license may
-infringe copyright merely by compiling it or running it.</p>
+<p>Some developers think that code with no license
+is <a href="#PublicDomain">in the public domain</a>. That is not true
+under today's copyright law; rather, all copyrightable works are
+copyrighted by default. This includes programs. Absent a license to
+grant users freedom, they don't have any. In some countries, users
+that download code with no license may infringe copyright merely by
+compiling it or running it.</p>
<p>In order for a program to be free, its copyright holders must
explicitly grant users the <a href="/philosophy/free-sw.html"> four
@@ -1567,6 +1569,12 @@
a <em>free software license</em>. This is what free software
licenses are for.</p>
+<p>Code written by employees of the US government is a special
+exception, since US copyright law explicitly puts that in the public
+domain; but this does not apply to works that the US pays a company to
+write. It also does not apply to other countries, many of which do
+allow the state to have a copyright on government writings.</p>
+
<p>Some countries allow authors to put code in the public domain, but
that requires explicit action. If you wish to do that, the method we
recommend is to use <a href="#CC0">CC0</a>, which also works in other
@@ -1668,6 +1676,16 @@
additional permission for linking with nonfree programs.</p></dd>
+<dt><a id="DOR"
+ href="http://dorepository.org/download.html">
+ CNRI Digital Object Repository License Agreement</a>
+ <span class="anchor-reference-id">
+ (<a href="#DOR">#DOR</a>)</span></dt>
+<dd>
+<p>This license is non-free because of Article 3, which arguably
+includes a requirement not to violate the license of <em>any</em>
+program that the user runs—even proprietary programs.</p></dd>
+
<dt><a id="GPL-PA"
href="http://directory.fsf.org/wiki/License:GPL-PA">
GPL for Computer Programs of the Public Administration</a>
@@ -2314,7 +2332,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/01/28 18:01:25 $
+$Date: 2014/03/09 11:30:39 $
<!-- 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.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- licenses/po/license-list.ru.po 9 Mar 2014 11:17:18 -0000 1.108
+++ licenses/po/license-list.ru.po 9 Mar 2014 11:30:40 -0000 1.109
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-08 20:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -3183,19 +3182,6 @@
"ÑÑÑеÑÑвеннÑÑ
ÑвободÑ, Ñо ÑÑо не ÑвободнаÑ
пÑогÑамма."
#. type: Content of: <dl><dd><p>
-# | Some developers think that code with no license is [-in-] {+<a
-# | href=\"#PublicDomain\">in+} the public [-domain.-] {+domain</a>.+} That
-# | is not true under today's copyright law; rather, all copyrightable works
-# | are [-nonfree-] {+copyrighted+} by default. This includes programs.
-# | {+Absent a license to grant users freedom, they don't have any.+} In some
-# | countries, users that download code with no license may infringe copyright
-# | merely by compiling it or running it.
-#| msgid ""
-#| "Some developers think that code with no license is in the public domain. "
-#| "That is not true under today's copyright law; rather, all copyrightable "
-#| "works are nonfree by default. This includes programs. In some "
-#| "countries, users that download code with no license may infringe "
-#| "copyright merely by compiling it or running it."
msgid ""
"Some developers think that code with no license is <a href=\"#PublicDomain"
"\">in the public domain</a>. That is not true under today's copyright law; "
@@ -3204,14 +3190,13 @@
"some countries, users that download code with no license may infringe "
"copyright merely by compiling it or running it."
msgstr ""
-"ÐекоÑоÑÑе ÑазÑабоÑÑики дÑмаÑÑ, ÑÑо
пÑогÑамма без лиÑензии Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ Ð² "
-"<a href=\"#PublicDomain"
-"\">обÑеÑÑвенное доÑÑоÑние</a>. ÐÑи нÑнеÑнем
авÑоÑÑком пÑаве ÑÑо не Ñак; наобоÑоÑ, "
-"оно по ÑмолÑÐ°Ð½Ð¸Ñ ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° вÑе
пÑоизведениÑ, на какие ÑолÑко можеÑ. "
-"Ð Ñом ÑиÑле на пÑогÑаммÑ. ÐÑи оÑÑÑÑÑÑвии
лиÑензии, коÑоÑÐ°Ñ Ð´Ð°ÐµÑ Ð¿Ð¾Ð»ÑзоваÑелÑм "
-"ÑвободÑ, Ñ Ð½Ð¸Ñ
Ð½ÐµÑ Ð½Ð¸ÐºÐ°ÐºÐ¾Ð¹ ÑвободÑ. Ð
некоÑоÑÑÑ
ÑÑÑанаÑ
полÑзоваÑели, коÑоÑÑе
беÑÑÑ Ð¸Ð· "
-"ÑеÑи пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· лиÑензии, могÑÑ
наÑÑÑаÑÑ Ð°Ð²ÑоÑÑкое пÑаво Ñже Ñем, ÑÑо "
-"компилиÑÑÑÑ Ð¸Ð»Ð¸ вÑполнÑÑÑ ÐµÐµ."
+"ÐекоÑоÑÑе ÑазÑабоÑÑики дÑмаÑÑ, ÑÑо
пÑогÑамма без лиÑензии Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ Ð² <a href="
+"\"#PublicDomain\">обÑеÑÑвенное доÑÑоÑние</a>. ÐÑи
нÑнеÑнем авÑоÑÑком пÑаве "
+"ÑÑо не Ñак; наобоÑоÑ, оно по ÑмолÑаниÑ
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° вÑе пÑоизведениÑ, "
+"на какие ÑолÑко можеÑ. Ð Ñом ÑиÑле на
пÑогÑаммÑ. ÐÑи оÑÑÑÑÑÑвии лиÑензии, "
+"коÑоÑÐ°Ñ Ð´Ð°ÐµÑ Ð¿Ð¾Ð»ÑзоваÑелÑм ÑвободÑ, Ñ Ð½Ð¸Ñ
Ð½ÐµÑ Ð½Ð¸ÐºÐ°ÐºÐ¾Ð¹ ÑвободÑ. РнекоÑоÑÑÑ
"
+"ÑÑÑанаÑ
полÑзоваÑели, коÑоÑÑе беÑÑÑ Ð¸Ð·
ÑеÑи пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· лиÑензии, могÑÑ "
+"наÑÑÑаÑÑ Ð°Ð²ÑоÑÑкое пÑаво Ñже Ñем, ÑÑо
компилиÑÑÑÑ Ð¸Ð»Ð¸ вÑполнÑÑÑ ÐµÐµ."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3235,8 +3220,8 @@
"copyright on government writings."
msgstr ""
"ÐÑогÑаммÑ, напиÑаннÑе ÑоÑÑÑдниками
гоÑÑдаÑÑÑвеннÑÑ
оÑганов СШÐ, пÑедÑÑавлÑÑÑ "
-"оÑобое иÑклÑÑение, поÑколÑÐºÑ Ð·Ð°ÐºÐ¾Ð½Ñ Ð¾Ð±
авÑоÑÑком пÑаве СШРÑвно помеÑаÑÑ Ð¸Ñ
в "
-"обÑеÑÑвенное доÑÑоÑние; но ÑÑо не
оÑноÑиÑÑÑ Ðº пÑоизведениÑм, напиÑаннÑм "
+"оÑобое иÑклÑÑение, поÑколÑÐºÑ Ð·Ð°ÐºÐ¾Ð½Ñ Ð¾Ð±
авÑоÑÑком пÑаве СШРÑвно помеÑаÑÑ Ð¸Ñ
"
+"в обÑеÑÑвенное доÑÑоÑние; но ÑÑо не
оÑноÑиÑÑÑ Ðº пÑоизведениÑм, напиÑаннÑм "
"компанией за плаÑÑ Ð¾Ñ Ð³Ð¾ÑÑдаÑÑÑва. ÐÑо не
оÑноÑиÑÑÑ Ñакже к дÑÑгим ÑÑÑанам, "
"во многиÑ
из коÑоÑÑÑ
гоÑÑдаÑÑÑвÑ
позволено обладаÑÑ Ð°Ð²ÑоÑÑкими пÑавами на "
"гоÑÑдаÑÑÑвеннÑе пÑоизведениÑ."
@@ -3474,24 +3459,14 @@
"дополниÑелÑнÑм ÑазÑеÑением компоноваÑÑ Ñ
неÑвободнÑми пÑогÑаммами."
#. type: Content of: <dl><dt>
-# | <a [-id=\"ODbl\" href=\"http://directory.fsf.org/wiki/License:ODbl\"> Open
-# | Database license</a>-] {+id=\"DOR\"
-# | href=\"http://dorepository.org/download.html\"> CNRI Digital Object
-# | Repository License Agreement</a>+} <span class=\"anchor-reference-id\">
-# | (<a [-href=\"#ODbl\">#ODbl</a>)</span>-] {+href=\"#DOR\">#DOR</a>)</span>+}
-#| msgid ""
-#| "<a id=\"ODbl\" href=\"http://directory.fsf.org/wiki/License:ODbl\"> Open "
-#| "Database license</a> <span class=\"anchor-reference-id\"> (<a href=\"#ODbl"
-#| "\">#ODbl</a>)</span>"
msgid ""
"<a id=\"DOR\" href=\"http://dorepository.org/download.html\"> CNRI Digital "
"Object Repository License Agreement</a> <span class=\"anchor-reference-id\"> "
"(<a href=\"#DOR\">#DOR</a>)</span>"
msgstr ""
"<a id=\"DOR\" href=\"http://dorepository.org/download.html\">
ÐиÑензионное "
-"ÑоглаÑение РепозиÑоÑÐ¸Ñ ÑиÑÑовÑÑ
обÑекÑов
CNRI"
-"</a> <span class=\"anchor-reference-id\"> "
-"(<a href=\"#DOR\">#DOR</a>)</span>"
+"ÑоглаÑение РепозиÑоÑÐ¸Ñ ÑиÑÑовÑÑ
обÑекÑов
CNRI</a> <span class=\"anchor-"
+"reference-id\"> (<a href=\"#DOR\">#DOR</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
Index: philosophy/free-sw.ru.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.ru.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/free-sw.ru.html 23 Feb 2014 13:29:15 -0000 1.41
+++ philosophy/free-sw.ru.html 9 Mar 2014 11:30:40 -0000 1.42
@@ -262,6 +262,15 @@
</p>
<p>
+ÐиÑÐµÐ½Ð·Ð¸Ñ Ñвободной пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ðµ можеÑ
ÑÑебоваÑÑ ÑоблÑÐ´ÐµÐ½Ð¸Ñ Ð»Ð¸Ñензии
+неÑвободной пÑогÑаммÑ. Таким обÑазом,
напÑимеÑ, еÑли лиÑÐµÐ½Ð·Ð¸Ñ ÑÑебÑеÑ, ÑÑобÑ
+Ð²Ñ ÑоблÑдали лиÑензии “вÑеÑ
пÑогÑамм,
коÑоÑÑми Ð²Ñ Ð¿Ð¾Ð»ÑзÑеÑеÑÑ”,
+в ÑÑÑÑае полÑзоваÑелÑ, коÑоÑÑй ÑабоÑÐ°ÐµÑ Ñ
неÑвободнÑми пÑогÑаммами, ÑÑо
+поÑÑебовало Ð±Ñ ÑоблÑÐ´ÐµÐ½Ð¸Ñ Ð»Ð¸Ñензий ÑÑиÑ
неÑвободнÑÑ
пÑогÑамм; Ñем ÑамÑм
+лиÑÐµÐ½Ð·Ð¸Ñ ÑÑала Ð±Ñ Ð»Ð¸Ñензией неÑвободнÑÑ
пÑогÑамм.
+</p>
+
+<p>
ÐÐ»Ñ Ð»Ð¸Ñензии ÑвободнÑÑ
пÑогÑамм допÑÑÑимо
ÑказÑваÑÑ, закон какой ÑÑиÑдикÑии
пÑименим, где Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÑоÑ
одиÑÑ
ÑазбиÑаÑелÑÑÑва или и Ñо, и дÑÑгое.
</p>
@@ -383,6 +392,11 @@
<ul>
<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.130&r2=1.131">Version
+1.131</a>: ÐиÑÐµÐ½Ð·Ð¸Ñ Ñвободной пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ðµ
Ð¼Ð¾Ð¶ÐµÑ ÑÑебоваÑÑ ÑоблÑдениÑ
+лиÑензии дÑÑгой, неÑвободной пÑогÑаммÑ.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.128&r2=1.129">ÐеÑÑиÑ
1.129</a>: Явно Ñказано, ÑÑо вÑÐ±Ð¾Ñ ÑоÑÑма и
ÑÑиÑдикÑии допÑÑÑÐ¸Ð¼Ñ (ÑÑо вÑегда
бÑло наÑим пÑавилом). </li>
@@ -583,7 +597,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/02/23 13:29:15 $
+$Date: 2014/03/09 11:30:40 $
<!-- timestamp end -->
</p>
Index: philosophy/po/free-sw.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ru-en.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/free-sw.ru-en.html 23 Feb 2014 13:29:15 -0000 1.30
+++ philosophy/po/free-sw.ru-en.html 9 Mar 2014 11:30:40 -0000 1.31
@@ -254,6 +254,15 @@
</p>
<p>
+A free license may not require compliance with the license of a
+nonfree program. Thus, for instance, if a license requires you to
+comply with the licenses of “all the programs you use”, in
+the case of a user that runs nonfree programs this would require
+compliance with the licenses of those nonfree programs; that makes the
+license nonfree.
+</p>
+
+<p>
It is acceptable for a free license to specify which jurisdiction's
law applies, or where litigation must be done, or both.
</p>
@@ -365,6 +374,10 @@
<ul>
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.130&r2=1.131">Version
+1.131</a>: A free license may not require compliance with a nonfree license
+of another program.</li>
+
<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.128&r2=1.129">Version
1.129</a>: State explicitly that choice of law and choice of forum
specifications are allowed. (This was always our policy.)</li>
@@ -526,7 +539,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2014/02/23 13:29:15 $
+$Date: 2014/03/09 11:30:40 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/free-sw.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ru.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/po/free-sw.ru.po 9 Mar 2014 11:17:18 -0000 1.58
+++ philosophy/po/free-sw.ru.po 9 Mar 2014 11:30:40 -0000 1.59
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-08 20:25+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -728,18 +727,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a
-# |
[-href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.10&r2=1.11\">Version
-# | 1.11</a>: Note that a-]
-# |
{+href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.130&r2=1.131\">Version
-# | 1.131</a>: A+} free license may {+not+} require [-you to send-]
-# | {+compliance with+} a [-copy-] {+nonfree license+} of [-versions you
-# | distribute to the author.-] {+another program.+}
-#| msgid ""
-#| "<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw."
-#| "html?root=www&r1=1.10&r2=1.11\">Version 1.11</a>: Note that a "
-#| "free license may require you to send a copy of versions you distribute to "
-#| "the author."
msgid ""
"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?"
"root=www&r1=1.130&r2=1.131\">Version 1.131</a>: A free license may "
@@ -747,7 +734,8 @@
msgstr ""
"<a href=\"http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?"
"root=www&r1=1.130&r2=1.131\">Version 1.131</a>: ÐиÑензиÑ
Ñвободной "
-"пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÑÑебоваÑÑ ÑоблÑдениÑ
лиÑензии дÑÑгой, неÑвободной пÑогÑаммÑ."
+"пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÑÑебоваÑÑ ÑоблÑдениÑ
лиÑензии дÑÑгой, неÑвободной "
+"пÑогÑаммÑ."
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/license-list.ru.html licenses/po/l...,
GNUN <=