www/philosophy bsd.ru.html po/bsd.ru-en.html po...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/01/28 13:28:41

Modified files:
        philosophy     : bsd.ru.html 
        philosophy/po  : bsd.ru-en.html bsd.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.ru.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ru.po?cvsroot=www&r1=1.30&r2=1.31

Patches:
Index: bsd.ru.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.ru.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- bsd.ru.html 12 Apr 2014 13:55:02 -0000      1.34
+++ bsd.ru.html 28 Jan 2015 13:28:39 -0000      1.35
@@ -1,11 +1,9 @@
-
+<!--#set var="ENGLISH_PAGE" value="/philosophy/bsd.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.77 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
- <!--#set var="ENGLISH_PAGE" value="/philosophy/bsd.en.html" -->
-
 <title>Проблема лицензии BSD - Проект GNU - Фонд 
свободного программного
 обеспечения</title>
 
@@ -148,6 +146,17 @@
 лицензии BSD&rdquo; или о &ldquo;пересмотренной 
лицензии BSD&rdquo;.
 </p>
 
+<hr/>
+
+<p>
+    Впоследствии был введен другой вариант 
лицензии BSD, в котором были только
+первые два из четырех параграфов 
первоначальной лицензии BSD. Мы называем ее
+&ldquo;лицензией FreeBSD&rdquo;. Это либеральная 
лицензия свободных программ
+без авторского лева, совместимая с GNU GPL, 
практически как модифицированная
+лицензия BSD.
+</p>
+
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -189,8 +198,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2010, 2012, 2013, 2014 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2010, 2012, 2013, 2014, 2015
+Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
@@ -206,7 +215,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/04/12 13:55:02 $
+$Date: 2015/01/28 13:28:39 $
 
 <!-- timestamp end -->
 </p>

Index: po/bsd.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/bsd.ru-en.html   12 Apr 2014 13:58:28 -0000      1.23
+++ po/bsd.ru-en.html   28 Jan 2015 13:28:40 -0000      1.24
@@ -140,6 +140,17 @@
     &ldquo;revised BSD license&rdquo;.
 </p>
 
+<hr/>
+
+<p>
+    Later a third BSD license variant was introduced, with only the
+    first two of the original BSD license's four clauses.  We call it
+    the &ldquo;FreeBSD license.&rdquo; It is a lax, noncopyleft free
+    license, compatible with the GNU GPL, much like the modified BSD
+    license.
+</p>
+
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -170,7 +181,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014
+<p>Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014, 2015
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -181,7 +192,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:58:28 $
+$Date: 2015/01/28 13:28:40 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/bsd.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ru.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/bsd.ru.po        28 Jan 2015 13:07:39 -0000      1.30
+++ po/bsd.ru.po        28 Jan 2015 13:28:40 -0000      1.31
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-01-28 12:57+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -361,17 +360,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, [-2014-] {+2014,
-# | 2015+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2013, 2014, 2015 Free "
 "Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2010, 2012, 2013, 2014, 2015 
Free "
-"Software Foundation, Inc."
+"Copyright &copy; 1998, 1999, 2001, 2003, 2007, 2010, 2012, 2013, 2014, 2015 "
+"Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""