www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www gnu/gnu-linux-faq.ru.html gnu/po/gnu-linux-...

From: GNUN
Subject: www gnu/gnu-linux-faq.ru.html gnu/po/gnu-linux-...
Date: Mon, 14 Dec 2015 11:00:49 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/12/14 11:00:49

Modified files:
        gnu            : gnu-linux-faq.ru.html 
        gnu/po         : gnu-linux-faq.ru-en.html gnu-linux-faq.ru.po 
        licenses       : bsd.ru.html license-list.ru.html 
                         licenses.ru.html 
        licenses/po    : bsd.ru-en.html bsd.ru.po 
                         license-list.ru-en.html license-list.ru.po 
                         licenses.ru-en.html licenses.ru.po 
        philosophy     : essays-and-articles.ru.html 
                         netscape-npl-old.ru.html netscape-npl.ru.html 
                         words-to-avoid.ru.html x.ru.html 
        philosophy/po  : essays-and-articles.ru-en.html 
                         essays-and-articles.ru.po 
                         netscape-npl-old.ru-en.html 
                         netscape-npl-old.ru.po netscape-npl.ru-en.html 
                         netscape-npl.ru.po words-to-avoid.ru-en.html 
                         words-to-avoid.ru.po x.ru-en.html x.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru-en.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.80&r2=1.81
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/bsd.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.90&r2=1.91
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ru.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.220&r2=1.221
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ru-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ru.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ru.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl-old.ru.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/netscape-npl.ru.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ru.html?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ru.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ru-en.html?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ru.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl-old.ru-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl-old.ru.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.ru-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.ru.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.144&r2=1.145
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ru-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ru.po?cvsroot=www&r1=1.16&r2=1.17

Patches:
Index: gnu/gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- gnu/gnu-linux-faq.ru.html   15 Sep 2015 11:58:10 -0000      1.55
+++ gnu/gnu-linux-faq.ru.html   14 Dec 2015 11:00:44 -0000      1.56
@@ -1482,7 +1482,7 @@
 заслуживаем.
 
 <p>
-Обратите внимание, что есть по меньшей 
мере <a href="/philosophy/bsd.html">
+Обратите внимание, что есть по меньшей 
мере <a href="/licenses/bsd.html">
 две различных лицензии BSD</a>. Для ясности не 
пользуйтесь, пожалуйста,
 выражением &ldquo;лицензия BSD&rdquo;, не упоминая 
о том, какая именно это
 лицензия.</p>
@@ -1631,7 +1631,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/09/15 11:58:10 $
+$Date: 2015/12/14 11:00:44 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu-linux-faq.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru-en.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gnu/po/gnu-linux-faq.ru-en.html     8 Jun 2015 08:51:41 -0000       1.42
+++ gnu/po/gnu-linux-faq.ru-en.html     14 Dec 2015 11:00:44 -0000      1.43
@@ -1404,7 +1404,7 @@
 credit we deserve.
 
 <p>
-Please note that there are at least <a href="/philosophy/bsd.html">
+Please note that there are at least <a href="/licenses/bsd.html">
 two different BSD licenses</a>.  For clarity's sake, please don't use
 the term &ldquo;BSD license&rdquo; without specifying which one.</p>
 </dd>
@@ -1527,7 +1527,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/06/08 08:51:41 $
+$Date: 2015/12/14 11:00:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- gnu/po/gnu-linux-faq.ru.po  14 Dec 2015 10:35:38 -0000      1.80
+++ gnu/po/gnu-linux-faq.ru.po  14 Dec 2015 11:00:44 -0000      1.81
@@ -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-12-14 09:56+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -3371,21 +3370,13 @@
 "заслуживаем."
 
 #. type: Content of: <dl><dd><p>
-# | Please note that there are at least <a [-href=\"/philosophy/bsd.html\">-]
-# | {+href=\"/licenses/bsd.html\">+} two different BSD licenses</a>.  For
-# | clarity's sake, please don't use the term &ldquo;BSD license&rdquo;
-# | without specifying which one.
-#| msgid ""
-#| "Please note that there are at least <a href=\"/philosophy/bsd.html\"> two "
-#| "different BSD licenses</a>.  For clarity's sake, please don't use the "
-#| "term &ldquo;BSD license&rdquo; without specifying which one."
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
 "&ldquo;BSD license&rdquo; without specifying which one."
 msgstr ""
-"Обратите внимание, что есть по меньшей 
мере <a href=\"/licenses/bsd.html"
-"\"> две различных лицензии BSD</a>. Для ясности 
не пользуйтесь, пожалуйста, "
+"Обратите внимание, что есть по меньшей 
мере <a href=\"/licenses/bsd.html\"> "
+"две различных лицензии BSD</a>. Для ясности 
не пользуйтесь, пожалуйста, "
 "выражением &ldquo;лицензия BSD&rdquo;, не 
упоминая о том, какая именно это "
 "лицензия."
 

Index: licenses/bsd.ru.html
===================================================================
RCS file: /web/www/www/licenses/bsd.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/bsd.ru.html        14 Dec 2015 08:48:28 -0000      1.1
+++ licenses/bsd.ru.html        14 Dec 2015 11:00:45 -0000      1.2
@@ -15,7 +15,7 @@
     Лицензии свободных программ делятся на 
две большие категории: лицензии <a
 href="/copyleft/copyleft.html"> с авторским левом </a> и <a
 href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"> без
-авторского лева </a>.  <a
+авторского лева</a>.  <a
 href="/licenses/license-list.html#GPLCompatibleLicenses">Лицензии с
 авторским левом</a>, такие, как <a 
href="/licenses/gpl.html">GNU GPL</a>,
 требуют, чтобы модифицированные версии 
программы тоже оставались
@@ -202,9 +202,9 @@
 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -215,7 +215,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/12/14 08:48:28 $
+$Date: 2015/12/14 11:00:45 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- licenses/license-list.ru.html       9 Oct 2015 05:28:24 -0000       1.90
+++ licenses/license-list.ru.html       14 Dec 2015 11:00:45 -0000      1.91
@@ -1052,7 +1052,7 @@
 <dd>
 <p>Это либеральная неограничительная 
лицензия свободных программ без авторского
 лева с пунктом о рекламе. Это создает <a
-href="/philosophy/bsd.html">практические проблемы</a>, 
подобные проблемам
+href="/licenses/bsd.html">практические проблемы</a>, 
подобные проблемам
 первоначальной лицензии BSD, в том числе 
несовместимость с GNU GPL.</p></dd>
 
 
@@ -1088,8 +1088,8 @@
 <p>Это либеральная неограничительная 
лицензия свободных программ без авторского
 лева с серьезным недостатком&nbsp;&mdash; 
&ldquo;злостным пунктом BSD о
 рекламе&rdquo;. Недостаток не критичен; то 
есть, он не делает программу
-несвободной. Но к <a href="/philosophy/bsd.html"> 
практическим
-проблемам</a>, включая несовместимость с GNU 
GPL, он приводит.</p>
+несвободной. Но к <a href="/licenses/bsd.html"> 
практическим проблемам</a>,
+включая несовместимость с GNU GPL, он 
приводит.</p>
 
 <p>Мы настоятельно рекомендуем вам не 
применять первоначальную лицензию BSD для
 программ, которые вы пишете. Если вы хотите 
воспользоваться либеральной
@@ -1555,7 +1555,7 @@
 <dd>
 <p>Эта лицензия используется для части PHP4. 
Это лицензия свободных программ
 без авторского лева, несовместимая с GNU GPL, 
у нее есть <a
-href="/philosophy/bsd.html">практические проблемы</a>, 
подобные проблемам
+href="/licenses/bsd.html">практические проблемы</a>, 
подобные проблемам
 первоначальной лицензии BSD.</p>
 
 <p>Мы рекомендуем вам не применять эту 
лицензию ни для чего из того, что вы
@@ -1580,9 +1580,9 @@
 <span class="anchor-reference-id"> (<a href="#Zope">#Zope</a>)</span></dt>
 <dd>
 <p>Это либеральная весьма 
неограничительная лицензия свободных 
программ без
-авторского лева с <a 
href="/philosophy/bsd.html">практическими
-проблемами</a>, подобными проблемам 
первоначальной лицензии BSD, в число
-которых входит несовместимость с <a 
href="/licenses/gpl.html">GNU GPL</a>.</p>
+авторского лева с <a 
href="/licenses/bsd.html">практическими проблемами</a>,
+подобными проблемам первоначальной 
лицензии BSD, в число которых входит
+несовместимость с <a href="/licenses/gpl.html">GNU GPL</a>.</p>
 
 <p>Мы настоятельно рекомендуем вам не 
применять версию&nbsp;1 ZPL для программ,
 которые вы пишете. Однако нет причин 
избегать применения программ, которые
@@ -2642,7 +2642,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/10/09 05:28:24 $
+$Date: 2015/12/14 11:00:45 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/licenses.ru.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ru.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- licenses/licenses.ru.html   13 Jun 2015 14:28:25 -0000      1.29
+++ licenses/licenses.ru.html   14 Dec 2015 11:00:45 -0000      1.30
@@ -42,7 +42,7 @@
 авторским левом</a>.</p>
 
 <p>У нас есть также страница, на которой 
обсуждается <a
-href="/philosophy/bsd.html"> проблема лицензии BSD</a>.</p>
+href="/licenses/bsd.html"> проблема лицензии BSD</a>.</p>
 
 <h3>Оценка лицензий</h3>
 
@@ -497,7 +497,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/06/13 14:28:25 $
+$Date: 2015/12/14 11:00:45 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/bsd.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/bsd.ru-en.html  14 Dec 2015 08:48:25 -0000      1.1
+++ licenses/po/bsd.ru-en.html  14 Dec 2015 11:00:45 -0000      1.2
@@ -10,7 +10,7 @@
     The two major categories of free software license are <a
         href="/copyleft/copyleft.html">copyleft</a> and <a
         href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">
-        non-copyleft </a>.  <a
+        non-copyleft</a>.  <a
         href="/licenses/license-list.html#GPLCompatibleLicenses">Copyleft
         licenses</a> such as the <a href="/licenses/gpl.html">GNU
         GPL</a> insist that modified versions of the program must be
@@ -185,14 +185,14 @@
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/12/14 08:48:25 $
+$Date: 2015/12/14 11:00:45 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/bsd.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/bsd.ru.po       14 Dec 2015 10:35:38 -0000      1.4
+++ licenses/po/bsd.ru.po       14 Dec 2015 11:00:46 -0000      1.5
@@ -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-12-14 08:55+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"
 
@@ -32,28 +31,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-# | The two major categories of free software license are <a
-# | href=\"/copyleft/copyleft.html\">copyleft</a> and <a
-# | href=\"/philosophy/categories.html#Non-CopyleftedFreeSoftware\">
-# | non-copyleft[- -]</a>.  <a
-# | href=\"/licenses/license-list.html#GPLCompatibleLicenses\">Copyleft
-# | licenses</a> such as the <a href=\"/licenses/gpl.html\">GNU GPL</a> insist
-# | that modified versions of the program must be free software as well. 
-# | Non-copyleft licenses do not insist on this.  <a
-# | href=\"/philosophy/why-copyleft.html\">We recommend copyleft</a>, because
-# | it protects freedom for all users, but non-copylefted software can still
-# | be free software, and useful to the free software community.
-#| msgid ""
-#| "The two major categories of free software license are <a href=\"/copyleft/"
-#| "copyleft.html\">copyleft</a> and <a href=\"/philosophy/categories."
-#| "html#Non-CopyleftedFreeSoftware\"> non-copyleft </a>.  <a href=\"/"
-#| "licenses/license-list.html#GPLCompatibleLicenses\">Copyleft licenses</a> "
-#| "such as the <a href=\"/licenses/gpl.html\">GNU GPL</a> insist that "
-#| "modified versions of the program must be free software as well.  Non-"
-#| "copyleft licenses do not insist on this.  <a href=\"/philosophy/why-"
-#| "copyleft.html\">We recommend copyleft</a>, because it protects freedom "
-#| "for all users, but non-copylefted software can still be free software, "
-#| "and useful to the free software community."
 msgid ""
 "The two major categories of free software license are <a href=\"/copyleft/"
 "copyleft.html\">copyleft</a> and <a href=\"/philosophy/categories.html#Non-"
@@ -67,8 +44,8 @@
 msgstr ""
 "Лицензии свободных программ делятся на 
две большие категории: лицензии <a "
 "href=\"/copyleft/copyleft.html\"> с авторским левом </a> и <a 
href=\"/"
-"philosophy/categories.html#Non-CopyleftedFreeSoftware\"> без 
авторского лева"
-"</a>.  <a href=\"/licenses/license-list.html#GPLCompatibleLicenses"
+"philosophy/categories.html#Non-CopyleftedFreeSoftware\"> без 
авторского "
+"лева</a>.  <a href=\"/licenses/license-list.html#GPLCompatibleLicenses"
 "\">Лицензии с авторским левом</a>, такие, как 
<a href=\"/licenses/gpl.html"
 "\">GNU GPL</a>, требуют, чтобы модифицированные 
версии программы тоже "
 "оставались свободными. Лицензии без 
авторского лева не требуют этого. <a "
@@ -391,11 +368,6 @@
 "Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- licenses/po/license-list.ru-en.html 9 Oct 2015 17:28:48 -0000       1.83
+++ licenses/po/license-list.ru-en.html 14 Dec 2015 11:00:46 -0000      1.84
@@ -1067,7 +1067,7 @@
 <dd>
 <p>This is a lax, permissive non-copyleft free software license with an
 advertising clause.  This creates <a
-href="/philosophy/bsd.html">practical problems</a> like
+href="/licenses/bsd.html">practical problems</a> like
 those of the original BSD license, including incompatibility with the GNU
 GPL.</p></dd>
 
@@ -1106,7 +1106,7 @@
 a serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
 flaw is not fatal; that is, it does not render the software nonfree.
 But it does cause <a
-href="/philosophy/bsd.html">practical problems</a>,
+href="/licenses/bsd.html">practical problems</a>,
 including incompatibility with the GNU GPL.</p>
 
 <p>We urge you not to use the original BSD license for software you
@@ -1580,7 +1580,7 @@
 <dd>
 <p>This license is used by one part of PHP4.  It is a non-copyleft free
 software license which is incompatible with the GNU GPL, and has <a
-href="/philosophy/bsd.html">practical problems</a>
+href="/licenses/bsd.html">practical problems</a>
 like those of the original BSD license.</p>
 
 <p>We recommend that you not use this license for anything you write.</p></dd>
@@ -1605,7 +1605,7 @@
        (<a href="#Zope">#Zope</a>)</span></dt>
 <dd>
 <p>This is a lax, fairly permissive non-copyleft free software
-license with <a href="/philosophy/bsd.html">practical
+license with <a href="/licenses/bsd.html">practical
 problems</a> like those of the original BSD license, including
 incompatibility with the <a
 href="/licenses/gpl.html">GNU GPL</a>.</p>
@@ -2633,7 +2633,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/09 17:28:48 $
+$Date: 2015/12/14 11:00:46 $
 <!-- 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.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- licenses/po/license-list.ru.po      14 Dec 2015 10:35:38 -0000      1.220
+++ licenses/po/license-list.ru.po      14 Dec 2015 11:00:46 -0000      1.221
@@ -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-12-14 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -2014,16 +2013,6 @@
 "\"#apache1\">#apache1</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a lax, permissive non-copyleft free software license with an
-# | advertising clause.  This creates <a
-# | [-href=\"/philosophy/bsd.html\">practical-]
-# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
-# | original BSD license, including incompatibility with the GNU GPL.
-#| msgid ""
-#| "This is a lax, permissive non-copyleft free software license with an "
-#| "advertising clause.  This creates <a href=\"/philosophy/bsd.html"
-#| "\">practical problems</a> like those of the original BSD license, "
-#| "including incompatibility with the GNU GPL."
 msgid ""
 "This is a lax, permissive non-copyleft free software license with an "
 "advertising clause.  This creates <a href=\"/licenses/bsd.html\">practical "
@@ -2094,18 +2083,6 @@
 msgstr "Эту лицензию иногда называют также 
четырехпунктной лицензией BSD."
 
 #. type: Content of: <dl><dd><p>
-# | This is a lax, permissive non-copyleft free software license with a
-# | serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
-# | flaw is not fatal; that is, it does not render the software nonfree.  But
-# | it does cause <a [-href=\"/philosophy/bsd.html\">practical-]
-# | {+href=\"/licenses/bsd.html\">practical+} problems</a>, including
-# | incompatibility with the GNU GPL.
-#| msgid ""
-#| "This is a lax, permissive non-copyleft free software license with a "
-#| "serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The "
-#| "flaw is not fatal; that is, it does not render the software nonfree.  But "
-#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-#| "including incompatibility with the GNU GPL."
 msgid ""
 "This is a lax, permissive non-copyleft free software license with a serious "
 "flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The flaw is not "
@@ -3112,16 +3089,6 @@
 "href=\"#Zend\">#Zend</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This license is used by one part of PHP4.  It is a non-copyleft free
-# | software license which is incompatible with the GNU GPL, and has <a
-# | [-href=\"/philosophy/bsd.html\">practical-]
-# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
-# | original BSD license.
-#| msgid ""
-#| "This license is used by one part of PHP4.  It is a non-copyleft free "
-#| "software license which is incompatible with the GNU GPL, and has <a href="
-#| "\"/philosophy/bsd.html\">practical problems</a> like those of the "
-#| "original BSD license."
 msgid ""
 "This license is used by one part of PHP4.  It is a non-copyleft free "
 "software license which is incompatible with the GNU GPL, and has <a href=\"/"
@@ -3129,9 +3096,9 @@
 "license."
 msgstr ""
 "Эта лицензия используется для части PHP4. 
Это лицензия свободных программ "
-"без авторского лева, несовместимая с GNU GPL, 
у нее есть <a href=\"/"
-"licenses/bsd.html\">практические проблемы</a>, 
подобные проблемам "
-"первоначальной лицензии BSD."
+"без авторского лева, несовместимая с GNU GPL, 
у нее есть <a href=\"/licenses/"
+"bsd.html\">практические проблемы</a>, подобные 
проблемам первоначальной "
+"лицензии BSD."
 
 #. type: Content of: <dl><dd><p>
 msgid "We recommend that you not use this license for anything you write."
@@ -3175,16 +3142,6 @@
 "\">#Zope</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a lax, fairly permissive non-copyleft free software license with
-# | <a [-href=\"/philosophy/bsd.html\">practical-]
-# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
-# | original BSD license, including incompatibility with the <a
-# | href=\"/licenses/gpl.html\">GNU GPL</a>.
-#| msgid ""
-#| "This is a lax, fairly permissive non-copyleft free software license with "
-#| "<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
-#| "original BSD license, including incompatibility with the <a href=\"/"
-#| "licenses/gpl.html\">GNU GPL</a>."
 msgid ""
 "This is a lax, fairly permissive non-copyleft free software license with <a "
 "href=\"/licenses/bsd.html\">practical problems</a> like those of the "

Index: licenses/po/licenses.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ru-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/licenses.ru-en.html     13 Jun 2015 14:28:26 -0000      1.27
+++ licenses/po/licenses.ru-en.html     14 Dec 2015 11:00:46 -0000      1.28
@@ -36,7 +36,7 @@
 our <a href="/licenses/recommended-copylefts.html">recommended
 copyleft licenses</a>.</p>
 
-<p>We also have a page that discusses <a href="/philosophy/bsd.html">the BSD 
License Problem</a>.</p>
+<p>We also have a page that discusses <a href="/licenses/bsd.html">the BSD 
License Problem</a>.</p>
 
 <h3>Evaluating Licenses</h3>
 
@@ -469,7 +469,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/06/13 14:28:26 $
+$Date: 2015/12/14 11:00:46 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/licenses.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ru.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- licenses/po/licenses.ru.po  14 Dec 2015 10:35:39 -0000      1.38
+++ licenses/po/licenses.ru.po  14 Dec 2015 11:00:46 -0000      1.39
@@ -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-12-14 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Licenses - GNU Project - Free Software Foundation"
@@ -79,12 +78,6 @@
 "авторским левом</a>."
 
 #. type: Content of: <p>
-# | We also have a page that discusses <a
-# | [-href=\"/philosophy/bsd.html\">the-] {+href=\"/licenses/bsd.html\">the+}
-# | BSD License Problem</a>.
-#| msgid ""
-#| "We also have a page that discusses <a href=\"/philosophy/bsd.html\">the "
-#| "BSD License Problem</a>."
 msgid ""
 "We also have a page that discusses <a href=\"/licenses/bsd.html\">the BSD "
 "License Problem</a>."

Index: philosophy/essays-and-articles.ru.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ru.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- philosophy/essays-and-articles.ru.html      10 Nov 2015 18:58:44 -0000      
1.59
+++ philosophy/essays-and-articles.ru.html      14 Dec 2015 11:00:46 -0000      
1.60
@@ -140,7 +140,7 @@
 цензуры и лицензирование</a></li>
   <li><a href="/philosophy/x.html">Западня системы X 
Window</a></li>
   <li><a href="/philosophy/apsl.html">Проблемы лицензии 
Apple</a></li>
-  <li><a href="/philosophy/bsd.html">Проблема лицензии 
BSD</a></li>
+  <li><a href="/licenses/bsd.html">Проблема лицензии 
BSD</a></li>
   <li><a href="/philosophy/netscape-npl.html">У Общественной 
лицензии Netscape
 есть серьезные проблемы</a>. Есть также <a
 href="/philosophy/netscape-npl-old.html"> более ранняя версия 
этой
@@ -630,7 +630,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/11/10 18:58:44 $
+$Date: 2015/12/14 11:00:46 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/netscape-npl-old.ru.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl-old.ru.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/netscape-npl-old.ru.html 23 May 2015 06:10:58 -0000      1.24
+++ philosophy/netscape-npl-old.ru.html 14 Dec 2015 11:00:47 -0000      1.25
@@ -89,9 +89,9 @@
 делает программу несвободной. Например, 
условия распространения XFree86 даже
 не пытаются применять авторское лево, и 
тем не менее программы XFree86
 свободны. Программы BSD тоже свободны и без 
авторского лева, (хотя у старых
-условий BSD есть <a href="/philosophy/bsd.html">важный 
недостаток</a>, и им
-не следует подражать&nbsp;&mdash; если вы хотите 
выпускать свободные
-программы без авторского лева, 
пользуйтесь, пожалуйста, вместо них 
условиями
+условий BSD есть <a href="/licenses/bsd.html">важный 
недостаток</a>, и им не
+следует подражать&nbsp;&mdash; если вы хотите 
выпускать свободные программы
+без авторского лева, пользуйтесь, 
пожалуйста, вместо них условиями
 XFree86). Программы Netscape тоже могут быть <a
 href="/philosophy/categories.html">свободными 
программами</a> без авторского
 лева.</p>
@@ -289,7 +289,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -303,12 +303,12 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2007, 2011, 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2007, 2011, 2013, 2015 Free Software Foundation, 
Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -323,7 +323,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 06:10:58 $
+$Date: 2015/12/14 11:00:47 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/netscape-npl.ru.html
===================================================================
RCS file: /web/www/www/philosophy/netscape-npl.ru.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/netscape-npl.ru.html     23 May 2015 06:10:59 -0000      1.28
+++ philosophy/netscape-npl.ru.html     14 Dec 2015 11:00:47 -0000      1.29
@@ -90,9 +90,9 @@
 делает программу несвободной. Например, 
условия распространения X.org даже
 не пытаются применять авторское лево, и 
тем не менее программы X.org
 свободны. Программы BSD тоже свободны и без 
авторского лева, (хотя у старых
-условий BSD есть <a href="/philosophy/bsd.html">важный 
недостаток</a>, и им
-не следует подражать&nbsp;&mdash; если вы хотите 
выпускать свободные
-программы без авторского лева, 
пользуйтесь, пожалуйста, вместо них 
условиями
+условий BSD есть <a href="/licenses/bsd.html">важный 
недостаток</a>, и им не
+следует подражать&nbsp;&mdash; если вы хотите 
выпускать свободные программы
+без авторского лева, пользуйтесь, 
пожалуйста, вместо них условиями
 X.org). Программы под NPL&nbsp;&mdash; это тоже <a
 href="/philosophy/categories.html">свободные программы</a> 
без авторского
 лева, и это само по себе не делает NPL хуже 
других лицензий свободных
@@ -264,7 +264,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -278,12 +278,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 2003, 2007, 2011, 2013 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 1998, 2003, 2007, 2011, 2013, 2015 Free Software
+Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -298,7 +299,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 06:10:59 $
+$Date: 2015/12/14 11:00:47 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- philosophy/words-to-avoid.ru.html   26 Nov 2015 16:27:43 -0000      1.69
+++ philosophy/words-to-avoid.ru.html   14 Dec 2015 11:00:47 -0000      1.70
@@ -135,9 +135,9 @@
 <h3 id="BSD-style">&ldquo;<span xml:lang="en" lang="en">BSD-style</span> (в 
стиле BSD)&rdquo;</h3>
 <p>
 Выражение &ldquo;лицензия в стиле BSD&rdquo; 
приводит к путанице, потому что
-она <a href="/philosophy/bsd.html"> сваливает в одну кучу 
лицензии, у
-которых есть важные различия</a>. Например, 
первоначальная лицензия BSD с
-пунктом о рекламе несовместима со 
Стандартной общественной лицензией GNU, а
+она <a href="/licenses/bsd.html"> сваливает в одну кучу 
лицензии, у которых
+есть важные различия</a>. Например, 
первоначальная лицензия BSD с пунктом о
+рекламе несовместима со Стандартной 
общественной лицензией GNU, а
 пересмотренная лицензия BSD совместима с 
GPL.</p>
 <p>
 Чтобы избежать путаницы, лучше всего 
называть <a
@@ -1163,7 +1163,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/11/26 16:27:43 $
+$Date: 2015/12/14 11:00:47 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.ru.html
===================================================================
RCS file: /web/www/www/philosophy/x.ru.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/x.ru.html        23 May 2015 05:09:26 -0000      1.28
+++ philosophy/x.ru.html        14 Dec 2015 11:00:47 -0000      1.29
@@ -32,8 +32,8 @@
 <p>
 Некоторые разработчики свободных 
программ предпочитают распространение без
 авторского лева. Такие лицензии без 
авторского лева, как лицензии XFree86 и
-<a href="/philosophy/bsd.html">BSD</a>, основаны на принципе 
незапрещения
-чего бы то ни было кому бы то ни было&nbsp;&mdash; 
даже тому, кто стремится
+<a href="/licenses/bsd.html">BSD</a>, основаны на принципе 
незапрещения чего
+бы то ни было кому бы то ни было&nbsp;&mdash; даже 
тому, кто стремится
 воспользоваться вашей работой как основой 
для ограничения других. В
 лицензировании без авторского лева нет 
ничего дурного, но оно упускает
 возможность активной защиты вашей свободы 
изменять и перераспространять
@@ -209,7 +209,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -223,12 +223,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman<br />Copyright
+&copy; 2015 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -239,7 +240,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:26 $
+$Date: 2015/12/14 11:00:47 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/essays-and-articles.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ru-en.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- philosophy/po/essays-and-articles.ru-en.html        10 Nov 2015 18:58:45 
-0000      1.55
+++ philosophy/po/essays-and-articles.ru-en.html        14 Dec 2015 11:00:47 
-0000      1.56
@@ -134,7 +134,7 @@
       Censorship envy and licensing</a></li>
   <li><a href="/philosophy/x.html">The X Window System Trap</a></li>
   <li><a href="/philosophy/apsl.html">The Problems of the Apple 
License</a></li>
-  <li><a href="/philosophy/bsd.html">The BSD License Problem</a></li>
+  <li><a href="/licenses/bsd.html">The BSD License Problem</a></li>
   <li><a href="/philosophy/netscape-npl.html">The Netscape Public License 
       Has Serious Problems</a>. An <a href="/philosophy/netscape-npl-old.html">
       earlier version of this article</a> is also available.</li>
@@ -605,7 +605,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/10 18:58:45 $
+$Date: 2015/12/14 11:00:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/essays-and-articles.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ru.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- philosophy/po/essays-and-articles.ru.po     14 Dec 2015 10:35:39 -0000      
1.127
+++ philosophy/po/essays-and-articles.ru.po     14 Dec 2015 11:00:47 -0000      
1.128
@@ -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-12-14 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Essays and Articles - GNU Project - Free Software Foundation"
@@ -378,9 +377,6 @@
 msgstr "<a href=\"/philosophy/apsl.html\">Проблемы лицензии 
Apple</a>"
 
 #. type: Content of: <ul><li>
-# | <a [-href=\"/philosophy/bsd.html\">The-]
-# | {+href=\"/licenses/bsd.html\">The+} BSD License Problem</a>
-#| msgid "<a href=\"/philosophy/bsd.html\">The BSD License Problem</a>"
 msgid "<a href=\"/licenses/bsd.html\">The BSD License Problem</a>"
 msgstr "<a href=\"/licenses/bsd.html\">Проблема лицензии 
BSD</a>"
 

Index: philosophy/po/netscape-npl-old.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl-old.ru-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/netscape-npl-old.ru-en.html   12 Apr 2014 13:59:17 -0000      
1.18
+++ philosophy/po/netscape-npl-old.ru-en.html   14 Dec 2015 11:00:47 -0000      
1.19
@@ -85,7 +85,7 @@
 software nonfree.  For example, the XFree86 distribution terms do not
 try to use copyleft at all, yet XFree86 is free software nonetheless.
 BSD is also non-copylefted free software (although the BSD terms have
-a <a href="/philosophy/bsd.html">serious drawback</a> and should not
+a <a href="/licenses/bsd.html">serious drawback</a> and should not
 be imitated&mdash;if you want to release non-copylefted free software,
 please use the XFree86 terms instead).  Netscape software can also
 be <a href="/philosophy/categories.html">free software</a> without
@@ -260,7 +260,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -275,17 +275,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 2007, 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2007, 2013, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:59:17 $
+$Date: 2015/12/14 11:00:47 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/netscape-npl-old.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl-old.ru.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/netscape-npl-old.ru.po        14 Dec 2015 10:35:39 -0000      
1.13
+++ philosophy/po/netscape-npl-old.ru.po        14 Dec 2015 11:00:48 -0000      
1.14
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-12-14 09:56+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"
 
@@ -173,26 +172,6 @@
 "себе будут не очень полезны."
 
 #. type: Content of: <p>
-# | The lack of real copyleft is not a catastrophe; it does not make the
-# | software nonfree.  For example, the XFree86 distribution terms do not try
-# | to use copyleft at all, yet XFree86 is free software nonetheless.  BSD is
-# | also non-copylefted free software (although the BSD terms have a <a
-# | [-href=\"/philosophy/bsd.html\">serious-]
-# | {+href=\"/licenses/bsd.html\">serious+} drawback</a> and should not be
-# | imitated&mdash;if you want to release non-copylefted free software, please
-# | use the XFree86 terms instead).  Netscape software can also be <a
-# | href=\"/philosophy/categories.html\">free software</a> without being
-# | copylefted.
-#| msgid ""
-#| "The lack of real copyleft is not a catastrophe; it does not make the "
-#| "software nonfree.  For example, the XFree86 distribution terms do not try "
-#| "to use copyleft at all, yet XFree86 is free software nonetheless.  BSD is "
-#| "also non-copylefted free software (although the BSD terms have a <a href="
-#| "\"/philosophy/bsd.html\">serious drawback</a> and should not be "
-#| "imitated&mdash;if you want to release non-copylefted free software, "
-#| "please use the XFree86 terms instead).  Netscape software can also be <a "
-#| "href=\"/philosophy/categories.html\">free software</a> without being "
-#| "copylefted."
 msgid ""
 "The lack of real copyleft is not a catastrophe; it does not make the "
 "software nonfree.  For example, the XFree86 distribution terms do not try to "
@@ -207,8 +186,8 @@
 "делает программу несвободной. Например, 
условия распространения XFree86 даже "
 "не пытаются применять авторское лево, и 
тем не менее программы XFree86 "
 "свободны. Программы BSD тоже свободны и без 
авторского лева, (хотя у старых "
-"условий BSD есть <a href=\"/licenses/bsd.html\">важный 
недостаток</a>, и "
-"им не следует подражать&nbsp;&mdash; если вы х
отите выпускать свободные "
+"условий BSD есть <a href=\"/licenses/bsd.html\">важный 
недостаток</a>, и им "
+"не следует подражать&nbsp;&mdash; если вы х
отите выпускать свободные "
 "программы без авторского лева, 
пользуйтесь, пожалуйста, вместо них 
условиями "
 "XFree86). Программы Netscape тоже могут быть <a 
href=\"/philosophy/"
 "categories.html\">свободными программами</a> без 
авторского лева."
@@ -539,18 +518,11 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 1998, 2007, [-2013-] {+2013, 2015+} Free Software
-# | Foundation, Inc.
-#| msgid "Copyright &copy; 1998, 2007, 2013 Free Software Foundation, Inc."
 msgid "Copyright &copy; 1998, 2007, 2013, 2015 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 1998, 2007, 2011, 2013, 2015 Free Software 
Foundation, Inc."
+msgstr ""
+"Copyright &copy; 1998, 2007, 2011, 2013, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"

Index: philosophy/po/netscape-npl.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl.ru-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/netscape-npl.ru-en.html       12 Apr 2014 13:59:18 -0000      
1.20
+++ philosophy/po/netscape-npl.ru-en.html       14 Dec 2015 11:00:48 -0000      
1.21
@@ -87,7 +87,7 @@
 software nonfree.  For example, the X.org distribution terms do not
 try to use copyleft at all, yet X.org is free software nonetheless.
 BSD is also non-copylefted free software (although the older BSD terms
-have a <a href="/philosophy/bsd.html">serious drawback</a> and should
+have a <a href="/licenses/bsd.html">serious drawback</a> and should
 not be imitated&mdash;if you want to release non-copylefted free
 software, please use the X.org terms instead).  NPL-covered software
 is also <a href="/philosophy/categories.html">free software</a>
@@ -234,7 +234,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -249,17 +249,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 2003, 2007, 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1998, 2003, 2007, 2013, 2015 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:59:18 $
+$Date: 2015/12/14 11:00:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/netscape-npl.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/netscape-npl.ru.po    14 Dec 2015 10:35:39 -0000      1.14
+++ philosophy/po/netscape-npl.ru.po    14 Dec 2015 11:00:48 -0000      1.15
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-12-14 09:56+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"
 
@@ -172,28 +171,6 @@
 "себе будут не очень полезны."
 
 #. type: Content of: <p>
-# | The lack of real copyleft is not a catastrophe; it does not make the
-# | software nonfree.  For example, the X.org distribution terms do not try to
-# | use copyleft at all, yet X.org is free software nonetheless.  BSD is also
-# | non-copylefted free software (although the older BSD terms have a <a
-# | [-href=\"/philosophy/bsd.html\">serious-]
-# | {+href=\"/licenses/bsd.html\">serious+} drawback</a> and should not be
-# | imitated&mdash;if you want to release non-copylefted free software, please
-# | use the X.org terms instead).  NPL-covered software is also <a
-# | href=\"/philosophy/categories.html\">free software</a> without being
-# | copylefted, and this by itself does not make the NPL worse than other
-# | non-copyleft free software license.
-#| msgid ""
-#| "The lack of real copyleft is not a catastrophe; it does not make the "
-#| "software nonfree.  For example, the X.org distribution terms do not try "
-#| "to use copyleft at all, yet X.org is free software nonetheless.  BSD is "
-#| "also non-copylefted free software (although the older BSD terms have a <a "
-#| "href=\"/philosophy/bsd.html\">serious drawback</a> and should not be "
-#| "imitated&mdash;if you want to release non-copylefted free software, "
-#| "please use the X.org terms instead).  NPL-covered software is also <a "
-#| "href=\"/philosophy/categories.html\">free software</a> without being "
-#| "copylefted, and this by itself does not make the NPL worse than other non-"
-#| "copyleft free software license."
 msgid ""
 "The lack of real copyleft is not a catastrophe; it does not make the "
 "software nonfree.  For example, the X.org distribution terms do not try to "
@@ -209,8 +186,8 @@
 "делает программу несвободной. Например, 
условия распространения X.org даже "
 "не пытаются применять авторское лево, и 
тем не менее программы X.org "
 "свободны. Программы BSD тоже свободны и без 
авторского лева, (хотя у старых "
-"условий BSD есть <a href=\"/licenses/bsd.html\">важный 
недостаток</a>, и "
-"им не следует подражать&nbsp;&mdash; если вы х
отите выпускать свободные "
+"условий BSD есть <a href=\"/licenses/bsd.html\">важный 
недостаток</a>, и им "
+"не следует подражать&nbsp;&mdash; если вы х
отите выпускать свободные "
 "программы без авторского лева, 
пользуйтесь, пожалуйста, вместо них 
условиями "
 "X.org). Программы под NPL&nbsp;&mdash; это тоже <a 
href=\"/philosophy/"
 "categories.html\">свободные программы</a> без 
авторского лева, и это само по "
@@ -490,21 +467,13 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 1998, 2003, 2007, [-2013-] {+2013, 2015+} Free Software
-# | Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 1998, 2003, 2007, 2013 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1998, 2003, 2007, 2013, 2015 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1998, 2003, 2007, 2011, 2013, 2015 Free Software Foundation, 
Inc."
+"Copyright &copy; 1998, 2003, 2007, 2011, 2013, 2015 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"

Index: philosophy/po/words-to-avoid.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru-en.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- philosophy/po/words-to-avoid.ru-en.html     26 Nov 2015 16:27:43 -0000      
1.60
+++ philosophy/po/words-to-avoid.ru-en.html     14 Dec 2015 11:00:48 -0000      
1.61
@@ -173,7 +173,7 @@
 <h3 id="BSD-style">&ldquo;BSD-style&rdquo;</h3>
 <p>
 The expression &ldquo;BSD-style license&rdquo; leads to confusion because it
-<a href="/philosophy/bsd.html">lumps together licenses that have
+<a href="/licenses/bsd.html">lumps together licenses that have
 important differences</a>.  For instance, the original BSD license
 with the advertising clause is incompatible with the GNU General
 Public License, but the revised BSD license is compatible with the
@@ -1109,7 +1109,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/11/26 16:27:43 $
+$Date: 2015/12/14 11:00:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- philosophy/po/words-to-avoid.ru.po  14 Dec 2015 10:35:39 -0000      1.144
+++ philosophy/po/words-to-avoid.ru.po  14 Dec 2015 11:00:48 -0000      1.145
@@ -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-12-14 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -456,18 +455,6 @@
 "&rdquo;"
 
 #. type: Content of: <p>
-# | The expression &ldquo;BSD-style license&rdquo; leads to confusion because
-# | it <a [-href=\"/philosophy/bsd.html\">lumps-]
-# | {+href=\"/licenses/bsd.html\">lumps+} together licenses that have
-# | important differences</a>.  For instance, the original BSD license with
-# | the advertising clause is incompatible with the GNU General Public
-# | License, but the revised BSD license is compatible with the GPL.
-#| msgid ""
-#| "The expression &ldquo;BSD-style license&rdquo; leads to confusion because "
-#| "it <a href=\"/philosophy/bsd.html\">lumps together licenses that have "
-#| "important differences</a>.  For instance, the original BSD license with "
-#| "the advertising clause is incompatible with the GNU General Public "
-#| "License, but the revised BSD license is compatible with the GPL."
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/licenses/bsd.html\">lumps together licenses that have important "

Index: philosophy/po/x.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.ru-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/x.ru-en.html  12 Apr 2014 14:00:13 -0000      1.19
+++ philosophy/po/x.ru-en.html  14 Dec 2015 11:00:48 -0000      1.20
@@ -26,7 +26,7 @@
 <p>
 Some free software developers prefer noncopyleft distribution.
 Noncopyleft licenses such as the XFree86 and
-<a href="/philosophy/bsd.html">BSD</a> licenses are based on the idea
+<a href="/licenses/bsd.html">BSD</a> licenses are based on the idea
 of never saying no to anyone&mdash;not even to someone who seeks to
 use your work as the basis for restricting other people.  Noncopyleft
 licensing does nothing wrong, but it misses the opportunity to
@@ -186,7 +186,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -201,17 +201,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 14:00:13 $
+$Date: 2015/12/14 11:00:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.ru.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/x.ru.po       14 Dec 2015 10:35:39 -0000      1.16
+++ philosophy/po/x.ru.po       14 Dec 2015 11:00:48 -0000      1.17
@@ -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-12-14 09:56+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"
 
@@ -73,22 +72,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-# | Some free software developers prefer noncopyleft distribution. 
-# | Noncopyleft licenses such as the XFree86 and <a
-# | [-href=\"/philosophy/bsd.html\">BSD</a>-]
-# | {+href=\"/licenses/bsd.html\">BSD</a>+} licenses are based on the idea of
-# | never saying no to anyone&mdash;not even to someone who seeks to use your
-# | work as the basis for restricting other people.  Noncopyleft licensing
-# | does nothing wrong, but it misses the opportunity to actively protect our
-# | freedom to change and redistribute software.  For that, we need copyleft.
-#| msgid ""
-#| "Some free software developers prefer noncopyleft distribution.  "
-#| "Noncopyleft licenses such as the XFree86 and <a href=\"/philosophy/bsd."
-#| "html\">BSD</a> licenses are based on the idea of never saying no to "
-#| "anyone&mdash;not even to someone who seeks to use your work as the basis "
-#| "for restricting other people.  Noncopyleft licensing does nothing wrong, "
-#| "but it misses the opportunity to actively protect our freedom to change "
-#| "and redistribute software.  For that, we need copyleft."
 msgid ""
 "Some free software developers prefer noncopyleft distribution.  Noncopyleft "
 "licenses such as the XFree86 and <a href=\"/licenses/bsd.html\">BSD</a> "
@@ -404,19 +387,12 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1998, 1999, [-2009-] {+2009, 2015+} Richard M. Stallman
-#| msgid "Copyright &copy; 1998, 1999, 2009 Richard M. Stallman"
 msgid "Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman"
 msgstr ""
-"Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman<br />"
-"Copyright &copy; 2015 Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman<br />Copyright "
+"&copy; 2015 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]