[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: |
Wed, 10 Sep 2014 11:56:46 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/09/10 11:56:46
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.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.148&r2=1.149
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- license-list.ru.html 28 Jul 2014 10:27:12 -0000 1.69
+++ license-list.ru.html 10 Sep 2014 11:56:45 -0000 1.70
@@ -2386,6 +2386,19 @@
GPL. ÐбÑÑно ее пÑименÑÑÑ Ð´Ð»Ñ ÑÑиÑÑов, и в
ÑÑом ÑлÑÑае неÑовмеÑÑимоÑÑÑ Ð½Ðµ
вÑзÑÐ²Ð°ÐµÑ Ð¿Ñоблем.</p></dd>
+<dt><a id="IPAFONT"
+href="http://directory.fsf.org/wiki/License:IPA_Font_License"> ÐиÑензиÑ
+ÑÑиÑÑов IPA</a> <span class="anchor-reference-id"> (<a
+href="#IPAFONT">#IPAFONT</a>)</span></dt>
+<dd>
+<p>ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм Ñ
авÑоÑÑким левом, неÑовмеÑÑÐ¸Ð¼Ð°Ñ Ñ GPL. Ð
+ÑожалениÑ, в ней еÑÑÑ ÑÑловие, ÑÑебÑÑÑее,
ÑÑÐ¾Ð±Ñ Ð² пÑоизводнÑÑ
пÑоизведениÑÑ
+не ÑпоÑÑеблÑлиÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¿ÐµÑвонаÑалÑной
ÑабоÑÑ Ð² каÑеÑÑве названиÑ
+пÑогÑаммÑ, Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ ÑÑиÑÑа или имени
Ñайла. ÐÑо допÑÑÑимо Ð´Ð»Ñ ÑÑиÑÑов,
+поÑколÑÐºÑ ÑÑиÑÑÑ Ð¼Ð¾Ð¶Ð½Ð¾ пеÑеименовÑваÑÑ Ñ
помоÑÑÑ ÑвободнÑÑ
пÑогÑаммнÑÑ
+ÑÑедÑÑв, но ÑÑо оÑÐµÐ½Ñ Ð½ÐµÐ¿ÑиÑÑно и могло бÑ
бÑÑÑ ÑеÑеÑÑÑÑ Ð¾Ð±ÑемениÑелÑно в
+дÑÑгиÑ
ÑиÑÑаÑиÑÑ
.</p></dd>
+
<dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web"> ÐиÑензиÑ
оÑкÑÑÑÑÑ
ÑÑиÑÑов SIL 1.1 (SIL Open Font License 1.1)</a> <span
@@ -2517,7 +2530,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/07/28 10:27:12 $
+$Date: 2014/09/10 11:56:45 $
<!-- 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.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- po/license-list.ru-en.html 28 Jul 2014 10:27:13 -0000 1.61
+++ po/license-list.ru-en.html 10 Sep 2014 11:56:46 -0000 1.62
@@ -2393,6 +2393,19 @@
GPL. Its normal use is for fonts, and in that use, the
incompatibility does not cause a problem.</p></dd>
+<dt><a id="IPAFONT"
+ href="http://directory.fsf.org/wiki/License:IPA_Font_License"> IPA
+ Font License</a>
+ <span class="anchor-reference-id">
+ (<a href="#IPAFONT">#IPAFONT</a>)</span></dt>
+<dd>
+<p>This is a copyleft free software license, incompatible with the
+GPL. It has an unfortunate condition requiring that derivative works
+not use or include the name of the original work as a program name,
+font name or file name. This is acceptable for fonts as fonts can be
+aliased or renamed using free software tools, but it's very annoying
+and could be overly burdensome in other contexts.</p></dd>
+
<dt><a id="SILOFL" href="http://scripts.sil.org/OFL_web">
SIL Open Font License 1.1</a>
@@ -2501,7 +2514,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/07/28 10:27:13 $
+$Date: 2014/09/10 11:56:46 $
<!-- 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.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- po/license-list.ru.po 10 Sep 2014 11:38:13 -0000 1.148
+++ po/license-list.ru.po 10 Sep 2014 11:56:46 -0000 1.149
@@ -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: 2014-09-09 18:59+0000\n"
#. type: Content of: <title>
msgid ""
@@ -4772,24 +4771,14 @@
"пÑоблем."
#. type: Content of: <dl><dt>
-# | <a [-id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\"> ISC-]
-# | {+id=\"IPAFONT\"
-# | href=\"http://directory.fsf.org/wiki/License:IPA_Font_License\"> IPA
-# | Font+} License</a> <span [-class=\"anchor-reference-id\">(<a
-# | href=\"#ISC\">#ISC</a>)</span>-] {+class=\"anchor-reference-id\"> (<a
-# | href=\"#IPAFONT\">#IPAFONT</a>)</span>+}
-#| msgid ""
-#| "<a id=\"ISC\" href=\"http://directory.fsf.org/wiki/License:ISC\"> ISC "
-#| "License</a> <span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</"
-#| "a>)</span>"
msgid ""
"<a id=\"IPAFONT\" href=\"http://directory.fsf.org/wiki/License:"
"IPA_Font_License\"> IPA Font License</a> <span class=\"anchor-reference-id"
"\"> (<a href=\"#IPAFONT\">#IPAFONT</a>)</span>"
msgstr ""
"<a id=\"IPAFONT\" href=\"http://directory.fsf.org/wiki/License:"
-"IPA_Font_License\"> ÐиÑÐµÐ½Ð·Ð¸Ñ ÑÑиÑÑов IPA</a> <span
class=\"anchor-reference-id"
-"\"> (<a href=\"#IPAFONT\">#IPAFONT</a>)</span>"
+"IPA_Font_License\"> ÐиÑÐµÐ½Ð·Ð¸Ñ ÑÑиÑÑов IPA</a> <span
class=\"anchor-reference-"
+"id\"> (<a href=\"#IPAFONT\">#IPAFONT</a>)</span>"
#. 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 <=