[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: |
Sat, 19 Sep 2015 10:58:32 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/09/19 10:58:32
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.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.202&r2=1.203
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- license-list.ru.html 13 Jun 2015 14:28:25 -0000 1.86
+++ license-list.ru.html 19 Sep 2015 10:58:31 -0000 1.87
@@ -849,6 +849,19 @@
обеÑпеÑениÑ.</p></dd>
+<dt><a id="UPL"
+href="http://directory.fsf.org/wiki/License:Universal_Permissive_License">
+УнивеÑÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑензиÑ
(Universal Permissive License,
+UPL)</a> <span class="anchor-reference-id"> (<a
href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм без авÑоÑÑкого
+лева, ÑовмеÑÑÐ¸Ð¼Ð°Ñ Ñ GNU GPL. ХоÑÑ Ð»Ð¸ÑензиÑ
пÑедоÑÑавлÑÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ
+лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð°ÑенÑов вмеÑÑе Ñ
пÑогÑаммнÑм пÑоизведением, однако мÑ
+вÑе-Ñаки ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0 длÑ
пÑедоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¾Ñ
+паÑенÑного пÑедаÑелÑÑÑва, еÑли вÑ
ÑобиÑаеÑеÑÑ Ð²ÑпÑÑкаÑÑ ÑÐ²Ð¾Ñ ÑабоÑÑ Ð¿Ð¾Ð´
+либеÑалÑной лиÑензией.
+</p></dd>
+
<dt><a id="Unlicense"
href="http://directory.fsf.org/wiki/License:TheUnlicense">
РазлиÑензиÑ</a> <span class="anchor-reference-id"> (<a
href="#Unlicense">#Unlicense</a>)</span></dt>
@@ -2606,7 +2619,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/06/13 14:28:25 $
+$Date: 2015/09/19 10:58:31 $
<!-- 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.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- po/license-list.ru-en.html 13 Jun 2015 14:28:25 -0000 1.78
+++ po/license-list.ru-en.html 19 Sep 2015 10:58:32 -0000 1.79
@@ -861,6 +861,18 @@
common, and widely recognized in the free software community.</p></dd>
+<dt><a id="UPL"
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License">
+ Universal Permissive License (UPL)</a>
+ <span class="anchor-reference-id">
+ (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive non-copyleft free software license, compatible
+with the GNU GPL. The license does provide the ability to license
+patents along with the software work, however, we still recommend the
+Apache 2.0 license for avoiding patent treachery when choosing to put
+your work under a lax license.
+</p></dd>
+
<dt><a id="Unlicense"
href="http://directory.fsf.org/wiki/License:TheUnlicense">
The Unlicense</a>
<span class="anchor-reference-id">
@@ -2587,7 +2599,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/13 14:28:25 $
+$Date: 2015/09/19 10:58:32 $
<!-- 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.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- po/license-list.ru.po 19 Sep 2015 10:40:42 -0000 1.202
+++ po/license-list.ru.po 19 Sep 2015 10:58:32 -0000 1.203
@@ -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-09-18 17:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1603,26 +1602,15 @@
"обеÑпеÑениÑ."
#. type: Content of: <dl><dt>
-# | <a [-id=\"Unlicense\"
-# | href=\"http://directory.fsf.org/wiki/License:TheUnlicense\"> The
-# | Unlicense</a>-] {+id=\"UPL\"
-# |
href=\"http://directory.fsf.org/wiki/License:Universal_Permissive_License\">
-# | Universal Permissive License (UPL)</a>+} <span
-# | class=\"anchor-reference-id\"> (<a
-# | [-href=\"#Unlicense\">#Unlicense</a>)</span>-]
-# | {+href=\"#UPL\">#UPL</a>)</span>+}
-#| msgid ""
-#| "<a id=\"Unlicense\" href=\"http://directory.fsf.org/wiki/License:"
-#| "TheUnlicense\"> The Unlicense</a> <span class=\"anchor-reference-id\"> "
-#| "(<a href=\"#Unlicense\">#Unlicense</a>)</span>"
msgid ""
"<a id=\"UPL\" href=\"http://directory.fsf.org/wiki/License:"
"Universal_Permissive_License\"> Universal Permissive License (UPL)</a> <span "
"class=\"anchor-reference-id\"> (<a href=\"#UPL\">#UPL</a>)</span>"
msgstr ""
"<a id=\"UPL\" href=\"http://directory.fsf.org/wiki/License:"
-"Universal_Permissive_License\"> УнивеÑÑалÑнаÑ
неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ (Universal Permissive
License, UPL)</a> <span "
-"class=\"anchor-reference-id\"> (<a href=\"#UPL\">#UPL</a>)</span>"
+"Universal_Permissive_License\"> УнивеÑÑалÑнаÑ
неогÑаниÑиÑелÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ "
+"(Universal Permissive License, UPL)</a> <span class=\"anchor-reference-id\"> "
+"(<a href=\"#UPL\">#UPL</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1634,8 +1622,8 @@
msgstr ""
"ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм без
авÑоÑÑкого "
"лева, ÑовмеÑÑÐ¸Ð¼Ð°Ñ Ñ GNU GPL. ХоÑÑ Ð»Ð¸ÑензиÑ
пÑедоÑÑавлÑÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ "
-"лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð°ÑенÑов вмеÑÑе Ñ
пÑогÑаммнÑм пÑоизведением, однако Ð¼Ñ "
-"вÑе-Ñаки ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0
Ð´Ð»Ñ Ð¿ÑедоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¾Ñ Ð¿Ð°ÑенÑного "
+"лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð°ÑенÑов вмеÑÑе Ñ
пÑогÑаммнÑм пÑоизведением, однако Ð¼Ñ Ð²Ñе-"
+"Ñаки ÑекомендÑем лиÑÐµÐ½Ð·Ð¸Ñ Apache 2.0 длÑ
пÑедоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¾Ñ Ð¿Ð°ÑенÑного "
"пÑедаÑелÑÑÑва, еÑли Ð²Ñ ÑобиÑаеÑеÑÑ
вÑпÑÑкаÑÑ ÑÐ²Ð¾Ñ ÑабоÑÑ Ð¿Ð¾Ð´ либеÑалÑной "
"лиÑензией."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=