[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: |
Tue, 12 Apr 2016 08:59:12 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/04/12 08:59:12
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.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.89&r2=1.90
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.238&r2=1.239
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- license-list.ru.html 5 Mar 2016 10:58:37 -0000 1.96
+++ license-list.ru.html 12 Apr 2016 08:59:12 -0000 1.97
@@ -1114,6 +1114,11 @@
Ð·Ð°ÐºÐ¾Ð½Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´ GPL и модÑÐ»Ñ Ð¿Ð¾Ð´ CDDL нелÑзÑ
компоноваÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом. Ðо
ÑÑой пÑиÑине Ð¼Ñ Ð½Ð°ÑÑоÑÑелÑно ÑекомендÑем
вам не пÑименÑÑÑ CDDL.</p>
+<p>РкаÑеÑÑве пÑимеÑа, показÑваÑÑего,
поÑÐµÐ¼Ñ Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑоÑеÑаÑÑ ÑабоÑÑ,
+лиÑензиÑованÑе по CDDL, Ñ ÑабоÑами,
лиÑензиÑованнÑми по GPL, Ñм. заÑвление
+ФСÐÐ <a href="https://www.fsf.org/licensing/zfs-and-linux">
ÐнÑеÑпÑеÑаÑиÑ,
+оÑ
Ñана и модиÑикаÑÐ¸Ñ GPL в пÑиложении к
ÑоÑеÑÐ°Ð½Ð¸Ñ Linux Ñ ZFS</a>.</p>
+
<p>Также в CDDL неÑдаÑно Ñо, ÑÑо она
полÑзÑеÑÑÑ ÑеÑмином “<a
href="/philosophy/not-ipr.html"> инÑеллекÑÑалÑнаÑ
ÑобÑÑвенноÑÑÑ</a>”.</p></dd>
@@ -2655,7 +2660,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2016/03/05 10:58:37 $
+$Date: 2016/04/12 08:59:12 $
<!-- 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.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- po/license-list.ru-en.html 5 Mar 2016 10:58:38 -0000 1.89
+++ po/license-list.ru-en.html 12 Apr 2016 08:59:12 -0000 1.90
@@ -1132,9 +1132,14 @@
cannot legally be linked together. We urge you not to use the CDDL
for this reason.</p>
+<p>For an illustrative example of why you should not combine
+CDDL-licensed works with the GPL-licensed works, see the FSF's
+statement, <a href="https://www.fsf.org/licensing/zfs-and-linux">
+<em>Interpreting, enforcing and changing the GNU GPL, as applied to
+combining Linux and ZFS</em></a>.</p>
+
<p>Also unfortunate in the CDDL is its use of the term “<a
-href="/philosophy/not-ipr.html">intellectual
-property</a>”.</p></dd>
+href="/philosophy/not-ipr.html">intellectual property</a>”.</p></dd>
<dt><a id="CPAL"
href="https://www.socialtext.net/open/cpal_license_in_wikitext">
@@ -2644,7 +2649,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/03/05 10:58:38 $
+$Date: 2016/04/12 08:59:12 $
<!-- 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.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- po/license-list.ru.po 12 Apr 2016 08:35:10 -0000 1.238
+++ po/license-list.ru.po 12 Apr 2016 08:59:12 -0000 1.239
@@ -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-04-11 22:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -2155,10 +2154,9 @@
"and changing the GNU GPL, as applied to combining Linux and ZFS</em></a>."
msgstr ""
"РкаÑеÑÑве пÑимеÑа, показÑваÑÑего, поÑемÑ
Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑоÑеÑаÑÑ ÑабоÑÑ, "
-"лиÑензиÑованÑе по CDDL, Ñ ÑабоÑами,
лиÑензиÑованнÑми по "
-"GPL, Ñм. заÑвление ФСÐÐ <a href="
-"\"https://www.fsf.org/licensing/zfs-and-linux\"> ÐнÑеÑпÑеÑаÑиÑ,
оÑ
Ñана "
-"и модиÑикаÑÐ¸Ñ GPL в пÑиложении к ÑоÑеÑаниÑ
Linux Ñ ZFS</a>."
+"лиÑензиÑованÑе по CDDL, Ñ ÑабоÑами,
лиÑензиÑованнÑми по GPL, Ñм. заÑвление "
+"ФСÐÐ <a href=\"https://www.fsf.org/licensing/zfs-and-linux\">
ÐнÑеÑпÑеÑаÑиÑ, "
+"оÑ
Ñана и модиÑикаÑÐ¸Ñ GPL в пÑиложении к
ÑоÑеÑÐ°Ð½Ð¸Ñ Linux Ñ ZFS</a>."
#. type: Content of: <dl><dd><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=