www fun/jokes/ed-msg.ru.html fun/jokes/po/ed-ms...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/18 13:32:12

Modified files:
        fun/jokes      : ed-msg.ru.html 
        fun/jokes/po   : ed-msg.ru-en.html ed-msg.ru.po 
        philosophy     : apsl.ru.html enforcing-gpl.ru.html 
                         freedom-or-power.ru.html gates.ru.html 
                         gpl-american-dream.ru.html 
                         gpl-american-way.ru.html java-trap.ru.html 
                         javascript-trap.ru.html 
                         lest-codeplex-perplex.ru.html 
                         microsoft-antitrust.ru.html 
                         microsoft-new-monopoly.ru.html 
                         microsoft-old.ru.html microsoft-verdict.ru.html 
                         microsoft.ru.html 
        philosophy/po  : apsl.ru-en.html apsl.ru.po 
                         enforcing-gpl.ru-en.html enforcing-gpl.ru.po 
                         freedom-or-power.ru-en.html 
                         freedom-or-power.ru.po gates.ru-en.html 
                         gates.ru.po gpl-american-dream.ru-en.html 
                         gpl-american-dream.ru.po 
                         gpl-american-way.ru-en.html 
                         gpl-american-way.ru.po java-trap.ru-en.html 
                         java-trap.ru.po javascript-trap.ru-en.html 
                         javascript-trap.ru.po 
                         lest-codeplex-perplex.ru-en.html 
                         lest-codeplex-perplex.ru.po 
                         microsoft-antitrust.ru-en.html 
                         microsoft-antitrust.ru.po 
                         microsoft-new-monopoly.ru-en.html 
                         microsoft-new-monopoly.ru.po 
                         microsoft-old.ru-en.html microsoft-old.ru.po 
                         microsoft-verdict.ru-en.html 
                         microsoft-verdict.ru.po microsoft.ru-en.html 
                         microsoft.ru.po 
        software       : recent-releases-include.ru.html 
        software/po    : recent-releases-include.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/ed-msg.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/ed-msg.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/ed-msg.ru.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/apsl.ru.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/enforcing-gpl.ru.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/freedom-or-power.ru.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gates.ru.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gpl-american-dream.ru.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gpl-american-way.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/java-trap.ru.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/javascript-trap.ru.html?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/lest-codeplex-perplex.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-antitrust.ru.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-new-monopoly.ru.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-old.ru.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-verdict.ru.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft.ru.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.ru-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/apsl.ru.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/enforcing-gpl.ru-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/enforcing-gpl.ru.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-power.ru-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/freedom-or-power.ru.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gates.ru-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gates.ru.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-dream.ru-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-dream.ru.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-way.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-way.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.ru-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/java-trap.ru.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.ru-en.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.ru.po?cvsroot=www&r1=1.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/lest-codeplex-perplex.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/lest-codeplex-perplex.ru.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-antitrust.ru-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-antitrust.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-new-monopoly.ru-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-new-monopoly.ru.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-old.ru-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-old.ru.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-verdict.ru-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-verdict.ru.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.ru-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.ru.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.2215&r2=1.2216
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.3135&r2=1.3136

Patches:
Index: fun/jokes/ed-msg.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/ed-msg.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/ed-msg.ru.html    7 Jul 2020 09:59:53 -0000       1.2
+++ fun/jokes/ed-msg.ru.html    18 Jul 2021 17:32:05 -0000      1.3
@@ -1,20 +1,34 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/ed-msg.en.html" -->
+
 <!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Ed, man! !man ed - Проект GNU - Фонд свободного 
программного обеспечения</title>
+<style type="text/css" media="screen, print">
+#ed-text p { display:inline-block; vertical-align: top; margin: 1em 1em 0; }
+@media (max-width: 40em) { #ed-text p { width: 11em; max-width:15em; }} 
+</style>
 
 <!--#include virtual="/fun/jokes/po/ed-msg.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="Домашняя страница GNU" title="Домашняя 
страница GNU" /></a>&nbsp;/ <a 
href="/fun/humor.html#content">Шутки&nbsp;GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Documentation">Документация</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Ed, man! !man ed</h2>
 
-<blockquote>
-<pre>
-От кого: patl@athena.mit.edu (Патрик Дж. ЛоПрести)
-Тема: Истинный путь (долгий)
-Дата: 11 Jul 91 03:17:31 GMT
-Группы новостей: alt.religion.emacs,alt.slack
-</pre>
+<p class="infobox">
+От кого: Патрик Дж. ЛоПрести<br />
+Тема: Истинный путь (долгий)<br />
+Дата: 11 июль 91 03:17:31 GMT</p>
 
 <p>Когда я вхожу в свою систему Xenix с 
110-бодового терминала, и vi, <b>и</b>
 Emacs просто дьявольски тормозят. Они 
выводят бесполезные сообщения типа
@@ -24,7 +38,7 @@
 
 <p>Ed, man!&nbsp;&nbsp;!man ed</p>
 
-<pre>
+<pre class="emph-box">
 ED(1)             Руководство программиста Unix         
    ED(1)
 
 ИМЯ
@@ -35,7 +49,7 @@
 ОПИСАНИЕ
      Ed - стандартный текстовый редактор.
 </pre>
-<p>---</p>
+<p style="visibility: hidden">---</p>
 
 <p>Ученые-компьютерщики без ума от ed, не 
только потому, что он стоит первым по
 алфавиту, но потому что он стандартный. Все 
другие без ума от него, потому
@@ -45,7 +59,7 @@
 
 <p>И ed не разбазаривает место на моем Timex 
Sinclair. Вот смотрите:</p>
 
-<pre>
+<pre class="emph-box">
 -rwxr-xr-x  1 root          24 Oct 29  1929 /bin/ed
 -rwxr-xr-t  4 root     1310720 Jan  1  1970 /usr/ucb/vi
 -rwxr-xr-x  1 root  5.89824e37 Oct 22  1990 /usr/bin/emacs
@@ -59,7 +73,7 @@
 <p>&ldquo;Ed - стандартный текстовый 
редактор.&rdquo;</p>
 
 <p>Взглянем на типичный сеанс работы 
новичка с могучим ed:</p>
-<pre>
+<pre class="emph-box">
 golem$ ed
 
 ?
@@ -84,7 +98,7 @@
 ^D
 ?
 </pre>
-<p>---</p>
+<p style="visibility: hidden">---</p>
 
 <p>Обратите внимание на единообразие 
пользовательского интерфейса и сообщений
 об ошибках. Ed достаточно великодушен, 
чтобы отмечать ошибки, и вместе с тем
@@ -118,19 +132,20 @@
 ГОВОРИТ НАМ МОГУЧИЙ ED!!!</p>
 
 <p>?</p>
-</blockquote>
 
-<p>Оригинал этой шутки есть в виде <a 
href="/fun/jokes/ed-msg.txt">простого
-текста</a>, а еще есть <a 
href="/fun/jokes/ed.hup">Коммюнике Intel</a>,
-отредактированное с помощью <code>ed</code>.</p>
-
-<p><a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
-
-<h4 id="Disclaimer">Предупреждение</h4>
-<p>Эта шутка извлечена из <a 
href="http://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<div id="ed-text" class="c">
+<p class="button"><a href="/fun/jokes/ed-msg.txt">Это же в 
формате простого текста</a></p>
+<p class="button"><a href="/fun/jokes/ed.hup">Коммюнике Intel</a>, 
отредактированное с помощью
+<code>ed</code>.</p>
+</div>
+
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Предупреждение</h3>
+<p>Эта шутка извлечена из архивов почты 
проекта GNU ФСПО. Фонд свободного
+программного обеспечения не заявляет 
авторских прав на нее.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -138,16 +153,32 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
-<p>Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a
+<div id="footer" role="contentinfo">
+<div class="unprintable">
+
+<p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
 href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&gt;</a>. Есть также <a
-href="/contact/">другие способы связаться</a> с 
фондом.<br />
-Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или
-предложения по адресу <a
-href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
+href="/contact/">другие способы связаться</a> с 
фондом. Отчеты о
+неработающих ссылках и другие поправки 
или предложения можно присылать по
+адресу <a 
href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:web-translators@gnu.org";>
+
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Мы старались сделать этот перевод точным и 
качественным, но исключить
 возможность ошибки мы не можем. 
Присылайте, пожалуйста, свои замечания и
 предложения по переводу по адресу <a
@@ -156,6 +187,7 @@
 <a href="/server/standards/README.translations.html">&ldquo;Ð 
уководстве по
 переводам&rdquo;</a>.
 </p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -167,15 +199,15 @@
 href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
 gnu.org</a>.</em></div>
 
-<p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/07/07 09:59:53 $
+$Date: 2021/07/18 17:32:05 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/ed-msg.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/ed-msg.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/ed-msg.ru-en.html      7 Jul 2020 09:59:53 -0000       1.2
+++ fun/jokes/po/ed-msg.ru-en.html      18 Jul 2021 17:32:05 -0000      1.3
@@ -1,17 +1,29 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Ed, man! !man ed- GNU Project - Free Software Foundation (FSF)</title>
+<style type="text/css" media="screen, print">
+#ed-text p { display:inline-block; vertical-align: top; margin: 1em 1em 0; }
+@media (max-width: 40em) { #ed-text p { width: 11em; max-width:15em; }} 
+</style>
 <!--#include virtual="/fun/jokes/po/ed-msg.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/fun/humor.html#Documentation">Documentation</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Ed, man!  !man ed</h2>
 
-<blockquote>
-<pre>
-From: patl@athena.mit.edu (Patrick J. LoPresti)
-Subject: The True Path (long)
-Date: 11 Jul 91 03:17:31 GMT
-Newsgroups: alt.religion.emacs,alt.slack
-</pre>
+<p class="infobox">
+From: Patrick J. LoPresti<br />
+Subject: The True Path (long)<br />
+Date: 11 Jul 91 03:17:31 GMT</p>
 
 <p>When I log into my Xenix system with my 110 baud teletype, both vi
 <b>and</b> Emacs are just too damn slow.  They print useless messages
@@ -21,7 +33,7 @@
 
 <p>Ed, man!&nbsp;&nbsp;!man ed</p>
 
-<pre>
+<pre class="emph-box">
 ED(1)               Unix Programmer's Manual                ED(1)
 
 NAME
@@ -32,7 +44,7 @@
 DESCRIPTION
      Ed is the standard text editor.
 </pre>
-<p>---</p>
+<p style="visibility: hidden">---</p>
 
 <p>Computer Scientists love ed, not just because it comes first
 alphabetically, but because it's the standard.  Everyone else loves ed
@@ -42,7 +54,7 @@
 
 <p>And ed doesn't waste space on my Timex Sinclair.  Just look:</p>
 
-<pre>
+<pre class="emph-box">
 -rwxr-xr-x  1 root          24 Oct 29  1929 /bin/ed
 -rwxr-xr-t  4 root     1310720 Jan  1  1970 /usr/ucb/vi
 -rwxr-xr-x  1 root  5.89824e37 Oct 22  1990 /usr/bin/emacs
@@ -56,7 +68,7 @@
 <p>&ldquo;Ed is the standard text editor.&rdquo;</p>
 
 <p>Let's look at a typical novice's session with the mighty ed:</p>
-<pre>
+<pre class="emph-box">
 golem$ ed
 
 ?
@@ -81,7 +93,7 @@
 ^D
 ?
 </pre>
-<p>---</p>
+<p style="visibility: hidden">---</p>
 
 <p>Note the consistent user interface and error reportage.  Ed is
 generous enough to flag errors, yet prudent enough not to overwhelm
@@ -116,48 +128,62 @@
 SPOKEN!!!</p>
 
 <p>?</p>
-</blockquote>
 
-<p>This joke is also available in <a href="/fun/jokes/ed-msg.txt">plain
-text</a>, plus an <a href="/fun/jokes/ed.hup">Intel &ldquo;press
-release&rdquo;</a> edited with <code>ed</code>.</p>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The joke on this page was obtained from the
-FSF's <a href="http://lists.gnu.org/";>email archives</a> of the GNU
-Project.</p>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
+<div id="ed-text" class="c">
+<p class="button"><a
+   href="/fun/jokes/ed-msg.txt">Plain text version</a></p>
+<p class="button"><a
+   href="/fun/jokes/ed.hup">Intel &ldquo;press release&rdquo;</a>
+edited&nbsp;with&nbsp;<code>ed</code></p>
+</div>
 
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The joke on this page was obtained from the FSF's email archives of the
+GNU Project. The Free Software Foundation claims no copyright on it.</p>
+</div>
 </div>
+
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>Please send FSF &amp; GNU inquiries to
+<p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Please see the 
 <a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
+README</a> for information on coordinating and contributing
 translations of this article.
 </p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/07 09:59:53 $
+$Date: 2021/07/18 17:32:05 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/ed-msg.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/ed-msg.ru.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/ed-msg.ru.po   18 Jul 2021 17:00:39 -0000      1.10
+++ fun/jokes/po/ed-msg.ru.po   18 Jul 2021 17:32:05 -0000      1.11
@@ -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: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Ed, man! !man ed- GNU Project - Free Software Foundation (FSF)"

Index: philosophy/apsl.ru.html
===================================================================
RCS file: /web/www/www/philosophy/apsl.ru.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- philosophy/apsl.ru.html     15 Dec 2018 14:46:24 -0000      1.35
+++ philosophy/apsl.ru.html     18 Jul 2021 17:32:05 -0000      1.36
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/apsl.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Мнение ФСПО об Общественной лицензии 
исходных текстов Apple - Проект GNU -
@@ -9,8 +12,14 @@
 
 <!--#include virtual="/philosophy/po/apsl.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Мнение ФСПО об Общественной лицензии исх
одных текстов Apple (APSL) 2.0</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>Общественная лицензия исходных текстов 
Apple (APSL) версии 2.0 является
 лицензией свободных программ. Чтобы 
выпустить такую лицензию, юристы Apple
 работали с ФСПО. <a 
href="/philosophy/historical-apsl.html">Проблемы,
@@ -55,6 +64,8 @@
 href="http://gnu-darwin.sourceforge.net/index.php";>GNU-Darwin</a>&nbsp;&mdash;
 комбинация GNU и Darwin, в которую 
предполагается включать только свободные
 программы.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -64,7 +75,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -84,7 +95,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -113,9 +124,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2011, 2014, 2017, 2018 Free
-Software Foundation, Inc.</p>
-
+<p>Copyright &copy; 2003, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -135,7 +144,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/12/15 14:46:24 $
+$Date: 2021/07/18 17:32:05 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/enforcing-gpl.ru.html
===================================================================
RCS file: /web/www/www/philosophy/enforcing-gpl.ru.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/enforcing-gpl.ru.html    23 May 2015 06:10:51 -0000      1.30
+++ philosophy/enforcing-gpl.ru.html    18 Jul 2021 17:32:05 -0000      1.31
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/enforcing-gpl.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Юридическая сила GNU GPL - Проект GNU - Фонд 
свободного программного
@@ -9,11 +12,17 @@
 
 <!--#include virtual="/philosophy/po/enforcing-gpl.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Юридическая сила GNU GPL</h2>
 
-<p><a href="http://moglen.law.columbia.edu/";><strong>Эбен 
Моглен</strong></a></p>
+<address class="byline"><a 
href="http://moglen.law.columbia.edu/";><strong>Эбен 
Моглен</strong></a></address>
+
 <p><em>10 сентября 2001&nbsp;года</em></p>
 
+<div class="article">
 <p>Предпринятое этим летом компанией Microsoft 
наступление на GPL в очередной
 раз разожгло дискуссию о том, имеет ли <a 
href="/licenses/gpl.html">GPL</a>
 &ldquo;юридическую силу&rdquo;. Этот 
замечательный пример демагогической
@@ -196,11 +205,19 @@
 добровольцем, непременно пожалеет об этом. 
Наш метод правовой охраны так же
 необычен, как и наш метод создания 
программ. Значение свободных программ
 состоит в том, что этот другой метод 
оказывается в конечном счете верным.</p>
+</div>
 
-<p><cite>Эбен Моглен&nbsp;&mdash; профессор права и 
истории права юридического
+<div class="infobox" role="complementary">
+<hr />
+<p>
+Эбен Моглен&nbsp;&mdash; профессор права и 
истории права юридического
 факультета Колумбийского университета 
(США). Он безвозмездно исполняет
 обязанности главного консультанта в Фонде 
свободного программного
-обеспечения.</cite></p>
+обеспечения.
+</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -209,7 +226,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -229,7 +246,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -242,7 +259,9 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001 Eben Moglen</p>
+<p>Copyright &copy; 2001 Eben Moglen<br />Copyright &copy; 2002 Елена 
Тяпкина
+(translation)<br />Copyright &copy; 2011, 2013 Free Software Foundation,
+Inc. (translation)</p>
 
 <p>Verbatim copying and distribution of this entire article are permitted in
 any medium, provided this notice is preserved. <br /> (Буквальное
@@ -258,11 +277,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 06:10:51 $
+$Date: 2021/07/18 17:32:05 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/freedom-or-power.ru.html
===================================================================
RCS file: /web/www/www/philosophy/freedom-or-power.ru.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- philosophy/freedom-or-power.ru.html 31 May 2021 09:30:59 -0000      1.36
+++ philosophy/freedom-or-power.ru.html 18 Jul 2021 17:32:06 -0000      1.37
@@ -1,10 +1,18 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/freedom-or-power.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Свобода или власть? - Проект GNU - Фонд 
свободного программного обеспечения </title>
+<style type="text/css" media="print,screen"><!--
+.epigraph { text-align: right; color: #404040; }
+.epigraph p { display: inline-block; text-align: left; width: 80%; }
+-->
+</style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, general, public, license, gpl,
 general public license, freedom, software, power, rights, свобода,
 программы, программное обеспечение, права, 
власть" />
@@ -15,17 +23,20 @@
 
 <!--#include virtual="/philosophy/po/freedom-or-power.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Свобода или власть?</h2>
 
-<p>
-<strong>Брэдли М. Кун</strong> и <strong>Ричард М. 
Столмен</strong></p>
+<address class="byline">Брэдли М. Кун и Ричард М. 
Столмен</address>
 
-<blockquote>
+<blockquote class="epigraph">
 <p>Свободолюбие&nbsp;&mdash; это любовь к другим; 
властолюбие&nbsp;&mdash;
-это любовь к себе.<br />
--- Уильям Хэзлитт</p>
+это любовь к себе.  &mdash; <i>Уильям 
Хэзлитт</i></p>
 </blockquote>
 
+<div class="article">
 <p>
 Мы, участники движения за свободное 
программное обеспечение, стоим
 за свободу пользователей программ. Мы 
сформировали свои взгляды,
@@ -121,7 +132,7 @@
 точно так же, как &ldquo;Билль о правах&rdquo; был 
предложен, чтобы
 употребить власть государства на 
обеспечение свободы каждого
 гражданина. Именно для этого 
предназначена <a
-href="/copyleft/copyleft.html">Стандартная общественная 
лицензия GNU</a>:
+href="/licenses/copyleft.html">Стандартная общественная 
лицензия GNU</a>:
 она передает вам контроль над тем, как вы 
применяете программу, в то же
 время <a href="/philosophy/why-copyleft.html">защищая вас от 
тех</a>,
 кому хотелось бы получить контроль над 
вашими решениями.</p>
@@ -134,19 +145,24 @@
 же, как все больше и больше пользователей 
начинает ценить практические
 достоинства свободных программ, которые 
мы разработали.</p>
 
-<h4>Примечания</h4>
+<h3 class="footnote">Примечание</h3>
+<ol>
+<li id="f1">Уильям Дж. Митчел, <cite>Город бит: 
Пространство, место, информационное
+шоссе</cite> (Кембридж, штат Массачусетс: МИТ 
Пресс, 1995), cтр.&nbsp;111,
+цитируется Лоренсом Лессигом в книге 
<cite>Программы и другие законы
+киберпространства, версия 2.0</cite> (Нью-Йорк, 
штат Нью-Йорк NY: Бейсик
+Букс, 2006), стр.&nbsp;5.</li>
+</ol>
+</div>
 
-<a id="f1"></a> Уильям Дж. Митчел, &ldquo;Город бит: 
Пространство, место,
-информационное шоссе&rdquo; (Кембридж, штат 
Массачусетс: МИТ Пресс, 1995),
-cтр.&nbsp;111, цитируется Лоренсом Лессигом в 
книге &ldquo;Программы и
-другие законы киберпространства, версия 
2.0&rdquo; (Нью-Йорк, штат Нью-Йорк
-NY: Бейсик Букс, 2006), стр.&nbsp;5.
-
-<hr />
-<blockquote id="fsfs"><p>Этот очерк опубликован в 
книге <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>Этот очерк опубликован в книге <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
 программы, свободное общество: Избранные 
очерки
-Ричарда&nbsp;М.&nbsp;Столмена</cite></a>.</p></blockquote>
+Ричарда&nbsp;М.&nbsp;Столмена</cite></a>.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -156,7 +172,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -176,7 +192,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -189,14 +205,12 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2009, 2020, 2021 Bradley M. Kuhn and Richard
-M. Stallman</p>
+<p>Copyright &copy; 2001, 2009, 2021 Bradley M. Kuhn and Richard M. 
Stallman</p>
 
 <p>Verbatim copying and distribution of this entire article is permitted
 without royalty in any medium, provided this notice is preserved. <br
 />(Буквальное копирование и 
распространение всей этой статьи разрешено
-безвозмездно на любом носителе при 
условии, что это
-примечание сохраняется)</p>
+безвозмездно на любом носителе при 
условии, что это примечание сохраняется)</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -207,11 +221,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/05/31 09:30:59 $
+$Date: 2021/07/18 17:32:06 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/gates.ru.html
===================================================================
RCS file: /web/www/www/philosophy/gates.ru.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/gates.ru.html    23 May 2015 05:09:13 -0000      1.24
+++ philosophy/gates.ru.html    18 Jul 2021 17:32:06 -0000      1.25
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/gates.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Дело было не в Гейтсе - Проект GNU - Фонд 
свободного программного
@@ -9,18 +12,15 @@
 
 <!--#include virtual="/philosophy/po/gates.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2> Дело было не в Гейтсе</h2>
 
-<p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a><br />
-Фонд свободного программного обеспечения, 
основатель
-</p>
-
-<blockquote>
-<p><em>(Эта статья была <a
-href="http://news.bbc.co.uk/1/hi/technology/7487060.stm";>опубликована
-&ldquo;Би-Би-Си Ньюс&rdquo; в 2008&nbsp;году</a>.)</em></p>
-</blockquote>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
+<div class="article">
   <p>Уделять так много внимания увольнению 
Билла Гейтса значит обходить стороной
 суть вопроса. В действительности значение 
имеет не Гейтс или Microsoft, а
 безнравственная система ограничений, 
которую Microsoft&nbsp;&mdash; как и
@@ -130,6 +130,15 @@
   <p>Гейтс, может, и ушел, но стены и преграды 
несвободного программного
 обеспечения, которые он помог создать, 
остаются&nbsp;&mdash; пока. Разрушить
 их должны мы.</p>
+</div>
+
+<div class="infobox" role="contentinfo">
+<hr />
+<p>(Эта статья была <a
+href="http://news.bbc.co.uk/1/hi/technology/7487060.stm";>опубликована
+<cite>Би-Би-Си Ньюс</cite> в 2008&nbsp;году</a>.)</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -139,7 +148,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -159,7 +168,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -174,7 +183,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
@@ -188,13 +197,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2008 Ричард Столмен<br />Copyright &copy; 
2011 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2008, 2021 Richard Stallman<br />Copyright &copy; 2011,
+2021 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">
@@ -209,11 +218,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:13 $
+$Date: 2021/07/18 17:32:06 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/gpl-american-dream.ru.html
===================================================================
RCS file: /web/www/www/philosophy/gpl-american-dream.ru.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- philosophy/gpl-american-dream.ru.html       23 May 2015 06:10:54 -0000      
1.32
+++ philosophy/gpl-american-dream.ru.html       18 Jul 2021 17:32:06 -0000      
1.33
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/gpl-american-dream.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GNU GPL и американская мечта - Проект GNU - 
Фонд свободного программного
@@ -9,10 +12,15 @@
 
 <!--#include virtual="/philosophy/po/gpl-american-dream.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>GNU GPL и американская мечта</h2>
 
-<p><strong>Брэдли М. Кун</strong></p>
+<address class="byline">Брэдли М. Кун</address>
 
+<div class="article">
 <p>
 Когда я был в начальной школе&nbsp;&mdash; здесь 
же, в Соединенных Штатах
 Америки,&mdash; меня учили, что наша 
родина&nbsp;&mdash; &ldquo;страна
@@ -78,6 +86,9 @@
 Это как раз то, что представляет собой 
&ldquo;американский путь&rdquo;; по
 крайней мере, тот, которому меня учили в 
школе. Я надеюсь, что мы не
 позволим Microsoft и прочим определить его 
по-другому.</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -86,7 +97,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -106,7 +117,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -119,8 +130,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001 Bradley M. Kuhn<br />Copyright &copy; 2013 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2001 Bradley M. Kuhn<br />Copyright &copy; 2010, 2011,
+2013, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Verbatim copying and distribution of this entire article is permitted in any
 medium without royalty provided this notice is preserved. </p><p>
@@ -136,11 +147,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 06:10:54 $
+$Date: 2021/07/18 17:32:06 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/gpl-american-way.ru.html
===================================================================
RCS file: /web/www/www/philosophy/gpl-american-way.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/gpl-american-way.ru.html 26 Mar 2015 16:28:11 -0000      1.1
+++ philosophy/gpl-american-way.ru.html 18 Jul 2021 17:32:07 -0000      1.2
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/gpl-american-way.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>GNU GPL и американский путь - Проект GNU - 
Фонд свободного программного
@@ -9,10 +12,15 @@
 
 <!--#include virtual="/philosophy/po/gpl-american-way.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2>GNU GPL и <em>американский путь</em></h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
+<h2>GNU GPL и американский путь</h2>
 
-<p><strong>Ричард М. Столмен</strong></p>
+<address class="byline">Ричард Столмен</address>
 
+<div class="article">
 <p>
 Microsoft описывает Стандартную общественную 
лицензию GNU (GNU GPL) как
 лицензию &ldquo;открытого текста&rdquo; и 
говорит, что она идет вразрез с
@@ -120,7 +128,7 @@
 Но беззащитность&nbsp;&mdash; не <em>американский 
путь</em>. В стране смелых
 и свободных мы защищаем свою свободу с 
помощью GNU GPL.</p>
 
-<h4>Дополнение:</h4>
+<h3 class="footnote">Дополнение:</h3>
 
 <p>
 Microsoft говорит, что GPL против &ldquo;прав 
интеллектуальной
@@ -141,6 +149,9 @@
 превалировать&rdquo;. Права собственности 
предназначены для того, чтобы
 повышать благосостояние людей, а не для 
того, чтобы оправдывать
 пренебрежение им.</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -149,7 +160,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -169,7 +180,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -182,13 +193,13 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001 Richard Stallman<br />Copyright &copy; 2015 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2001, 2021 Richard Stallman<br />Copyright &copy; 2015,
+2021 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">
@@ -203,11 +214,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/03/26 16:28:11 $
+$Date: 2021/07/18 17:32:07 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/java-trap.ru.html
===================================================================
RCS file: /web/www/www/philosophy/java-trap.ru.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/java-trap.ru.html        3 Oct 2015 17:28:16 -0000       1.25
+++ philosophy/java-trap.ru.html        18 Jul 2021 17:32:08 -0000      1.26
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/java-trap.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Свободны, но в кандалах — Западня Java - 
Проект GNU - Фонд свободного
@@ -9,15 +12,19 @@
 
 <!--#include virtual="/philosophy/po/java-trap.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2>Свободны, но в кандалах — Западня Java</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 
-<p><a href="http://www.stallman.org/";>Ричард Столмен</a></p>
+<h2>Свободны, но в кандалах — Западня Java</h2>
 
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="announcement"><blockquote><h3>Вводное 
замечание</h3>
+<h3 class="footnote">Вводное замечание</h3>
 <p>С тех пор, как была написана эта статья, 
компания Sun (ныне филиал Oracle)
 <a
-href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>перевыпустила</a>
+href="https://www.fsf.org/news/fsf-welcomes-gpl-java.html";>перевыпустила</a>
 почти всю свою эталонную реализацию 
платформы Java под Стандартной
 общественной лицензией GNU, и свободная 
среда разработки для Java теперь
 есть. Таким образом, язык Java как таковой 
больше не западня.</p>
@@ -54,10 +61,10 @@
 
 <p>См. также <a href="/philosophy/javascript-trap.html"> Западня
 JavaScript</a>.</p>
-</blockquote>
-</div>
+<hr class="column-limit" />
 
-<p>12 апреля 2004&nbsp;года</p>
+<div class="article">
+<p><em>12 апреля 2004&nbsp;года</em></p>
 
 <p>
   Если ваша программа свободна, она в 
основном этична&nbsp;&mdash; но есть
@@ -72,10 +79,9 @@
 важные свободы. Грубо говоря, это свобода 
выполнять программу, свобода
 изучать и править исходный текст, свобода 
перераспространять исходный текст
 и двоичные файлы, а также свобода 
публиковать улучшенные версии.  (См. <a
-href="/philosophy/free-sw.html">
-http://www.gnu.org/philosophy/free-sw.html</a>.) Является ли 
данная
-программа в виде исходного текста 
свободной, полностью определяется смыслом
-ее лицензии.
+href="/philosophy/free-sw.html">определение свободной 
программы</a>.)
+Является ли данная программа в виде исх
одного текста свободной, полностью
+определяется смыслом ее лицензии.
 </p>
 
 <p>
@@ -122,9 +128,10 @@
 <p>
   Реализация Java компании Sun несвободна. 
Стандартные библиотеки Java тоже
 несвободны. Свободные реализации Java у нас 
есть&nbsp;&mdash; такие, как <a
-href="http://gcc.gnu.org/java/";>компилятор GNU языка Java</a> 
(GCJ) и <a
-href="/software/classpath">GNU Classpath</a>,&mdash; но они 
поддерживают еще
-не все возможности. Мы пока только 
догоняем.
+href="https://objectcomputing.com/resources/publications/sett/january-2003-gcj-the-gnu-compiler-for-java";>компилятор
+GNU языка Java</a> (GCJ) и <a href="/software/classpath">GNU
+Classpath</a>,&mdash; но они поддерживают еще не все 
возможности. Мы пока
+только догоняем.
 </p>
 
 <p>
@@ -151,10 +158,10 @@
 спецификации библиотеки являются 
коммерческой тайной, и последняя лицензия
 Sun на эти спецификации запрещает выпуск 
чего бы то ни было, кроме полной
 реализации спецификаций. (См., например, <a
-href="http://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>
-http://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a> и <a
+href="https://jcp.org/aboutJava/communityprocess/JSPA2.pdf";> 
Соглашение об
+участии в спецификации Java</a> и <a
 
href="http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>
-http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>.)
+Спецификацию профиля персонального 
базиса J2ME&trade; </a>.)
 </p>
 
 <p>
@@ -200,12 +207,11 @@
 свободную среду разработки Java и 
пользуйтесь ею. Вообще, каким бы языком вы
 ни пользовались, смотрите в оба и 
проверяйте, свободны ли пакеты, от которых
 зависят ваши программы. Самый простой 
способ проверить, является ли
-программа свободной&nbsp;&mdash; поискать ее в 
Каталоге свободных программ
-(<a
-href="http://www.fsf.org/directory";>http://www.fsf.org/directory</a>). Если
+программа свободной&nbsp;&mdash; поискать ее в (<a
+href="http://www.fsf.org/directory";>Каталоге свободных 
программ</a>). Если
 программы в каталоге нет, можно проверить, 
перечислены ли ее лицензии в
 списке лицензий свободных программ (<a 
href="/licenses/license-list.html">
-http://www.gnu.org/licenses/license-list.html</a>).
+списке лицензий свободных программ</a>).
 </p>
 
 <p>
@@ -220,10 +226,12 @@
 будете писать прикладную программу, 
пишите ее так, чтобы она с самого начала
 выполнялась на свободных средствах.
 </p>
+</div>
 
-<h3>См. также:</h3>
+<h3 class="footnote">См. также:</h3>
 <p><a href="/philosophy/sun-in-night-time.html">Забавный 
инцидент с солнцем в
 ночную пору</a></p>
+</div>
 
 <div class="translators-notes">
 
@@ -233,7 +241,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -253,7 +261,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -266,8 +274,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2004, 2010, 2015 Richard Stallman</p><p>Copyright &copy;
-2012, 2013, 2015 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2004, 2010, 2015, 2021 Richard Stallman</p><p>Copyright
+&copy; 2012, 2013, 2015, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -287,11 +295,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/10/03 17:28:16 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/javascript-trap.ru.html
===================================================================
RCS file: /web/www/www/philosophy/javascript-trap.ru.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- philosophy/javascript-trap.ru.html  31 May 2021 09:31:00 -0000      1.57
+++ philosophy/javascript-trap.ru.html  18 Jul 2021 17:32:08 -0000      1.58
@@ -1,16 +1,23 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/javascript-trap.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Западня JavaScript</title>
 
 <!--#include virtual="/philosophy/po/javascript-trap.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Западня JavaScript</h2>
 
-<p><a href="http://www.stallman.org/";>Ричард Столмен</a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
 <p><strong>Не исключено, что вы запускаете 
несвободные программы на своем
 компьютере каждый день, даже не осознавая 
этого&nbsp;&mdash;
@@ -18,11 +25,13 @@
 
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Вебмастеры: есть <a
 href="/software/librejs/free-your-javascript.html">несколько 
способов
 указать лицензию программ на JavaScript</a> на 
сайте.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p>Сообщество свободного программного 
обеспечения хорошо знакомо с идеей, что
 <a href="/philosophy/free-software-even-more-important.html">любая
@@ -69,7 +78,7 @@
 
 <p>Кроме того, что они несвободны, многие из 
этих программ <em>вредоносны</em>,
 потому что они <a
-href="http://github.com/w3c/fingerprinting-guidance/issues/8";>шпионят 
за
+href="https://github.com/w3c/fingerprinting-guidance/issues/8";>шпионят 
за
 пользователем</a>.  Что еще более гадко, 
некоторые сайты пользуются
 службами, которые <a
 
href="https://freedom-to-tinker.com/2017/11/15/no-boundaries-exfiltration-of-personal-data-by-session-replay-scripts/";>записывают
@@ -247,17 +256,20 @@
 
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Вебмастеры: есть <a
 href="/software/librejs/free-your-javascript.html">несколько 
способов
 указать лицензию программ на JavaScript</a> на 
сайте.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p><strong>Благодарности:</strong> Я благодарю <a
 href="/people/people.html#mattlee">Мэтта Ли</a> и <a
-href="http://ejohn.org";>Джона Резига</a> за их помощь в 
определении
+href="https://ejohn.org";>Джона Резига</a> за их помощь в 
определении
 предлагаемого нами критерия, и Давида 
Парунакяна за то, что он обратил мое
 внимание на эту проблему.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -267,7 +279,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -287,7 +299,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -316,9 +328,9 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019, 2021 Richard
-Stallman</p><p>Copyright &copy; 2009, 2010, 2011, 2012, 2016, 2017, 2018,
-2019, 2021 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman<br />Copyright
+&copy; 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018, 2019, 2021 Free
+Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -334,7 +346,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/05/31 09:31:00 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/lest-codeplex-perplex.ru.html
===================================================================
RCS file: /web/www/www/philosophy/lest-codeplex-perplex.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/lest-codeplex-perplex.ru.html    30 Nov 2017 07:29:23 -0000      
1.1
+++ philosophy/lest-codeplex-perplex.ru.html    18 Jul 2021 17:32:08 -0000      
1.2
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/lest-codeplex-perplex.en.html" 
-->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Чтоб не запутал CodePlex - Проект GNU - Фонд 
свободного программного
@@ -10,9 +13,15 @@
 
 <!--#include virtual="/philosophy/po/lest-codeplex-perplex.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Чтоб не запутал CodePlex</h2>
 
-<p><strong>Ричард Столмен</strong></p>
+<address class="byline">Ричард Столмен</address>
+
+<div class="article">
 <p>Многие в нашем сообществе глядят на Фонд 
CodePlex с опаской. С его составом
 совета директоров, в котором верховодят 
сотрудники и бывшие сотрудники
 Microsoft да еще апологет Мигель де Иказа, есть 
все причины не доверять этой
@@ -30,8 +39,9 @@
 ценности свободных программ&nbsp;&mdash; 
свобода и общественная
 солидарность, а открытый исходный текст 
указывает только на такие ценности
 практического удобства, как эффективные, 
надежные программы. Более подробно
-см. на <a href="/philosophy/open-source-misses-the-point.html">
-http://www.gnu.org/philosophy/open-source-misses-the-point.html</a>.</p>
+см. на <a href="/philosophy/open-source-misses-the-point.html">Почему
+&ldquo;открытый исходный текст&rdquo; не 
передает понятия &ldquo;свободная
+программа&rdquo;</a>.</p>
 
 <p>Очевидно, Microsoft предпочла бы 
противостоять практической конкуренции
 открытого исходного текста, а не этической 
критике движения за свободные
@@ -66,8 +76,8 @@
 автоматически представляют собой 
коммерческие программы. Но в массах бытует
 широко распространенное заблуждение: 
&ldquo;коммерческие программы&rdquo;
 часто путают с &ldquo;несвободными 
программами&rdquo; (см. <a
-href="/philosophy/words-to-avoid.html">
-http://www.gnu.org/philosophy/words-to-avoid.html</a>.)</p>
+href="/philosophy/words-to-avoid.html">Слова, которых нужно 
избегать или
+употреблять аккуратно</a>.)</p>
 
 <p>Это заблуждение представляет серьезную 
проблему, потому что из этого
 вытекает, что предприятий по разработке 
свободных программ быть не
@@ -88,16 +98,15 @@
 тому, к чему, по ее собственным заявлениям, 
стремится Microsoft.</p>
 
 <p>Сэм Рамджи, нынешний председатель CodePlex, 
несколько месяцев назад говорил,
-что Microsoft (где он в то время работал) хочет 
содействовать развитию
-свободных приложений, которые станут 
поощрять применение Microsoft Windows
-(<a href="http://www.internetnews.com/dev-news/article.php/3811941";>
-http://www.internetnews.com/dev-news/article.php/3811941</a>). 
Возможно,
-цель CodePlex&nbsp;&mdash; подстрекать 
разработчиков свободных прикладных
-программ делать Windows своей главной 
платформой. Многие из проектов,
-размещенных на codeplex.com, суть не что иное, 
как дополнения к несвободным
-программам. Эти программы попались в 
западню, сходную с былой
-&ldquo;западней Java&rdquo; (см. <a 
href="/philosophy/java-trap.html">
-http://www.gnu.org/philosophy/java-trap.html</a>).</p>
+что Microsoft (где он в то время работал) хочет 
содействовать развитию (<a
+href="http://www.internetnews.com/dev-news/article.php/3811941";> 
свободных
+приложений, которые станут поощрять 
применение Microsoft
+Windows</a>). Возможно, цель CodePlex&nbsp;&mdash; 
подстрекать разработчиков
+свободных прикладных программ делать Windows 
своей главной
+платформой. Многие из проектов, 
размещенных на codeplex.com, суть не что
+иное, как дополнения к несвободным 
программам. Эти программы попались в
+западню, сходную с былой <a 
href="/philosophy/java-trap.html">западней
+Java</a>.</p>
 
 <p>Это было бы вредно, если бы замысел 
удался, потому что программа, которая не
 работает (или толком не работает) в мире 
свободы, не вносит вклад в нашу
@@ -131,6 +140,8 @@
 заканчивая долгосрочным проталкиванием 
цифрового управления ограничениями,
 Microsoft продолжает действовать нам во вред. 
Мы были бы круглыми дураками,
 если бы позволили чем-то отвлечь нас от 
этого.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -140,7 +151,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -160,7 +171,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -175,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
@@ -189,13 +200,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009 Richard Stallman <br />Copyright &copy; 2017 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2009, 2021 Richard Stallman <br />Copyright &copy; 2017,
+2021 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">
@@ -210,11 +221,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/11/30 07:29:23 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/microsoft-antitrust.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-antitrust.ru.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/microsoft-antitrust.ru.html      23 May 2015 05:09:15 -0000      
1.28
+++ philosophy/microsoft-antitrust.ru.html      18 Jul 2021 17:32:08 -0000      
1.29
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/microsoft-antitrust.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Антимонопольный процесс против Microsoft и 
свободные программы - Проект GNU
@@ -9,8 +12,14 @@
 
 <!--#include virtual="/philosophy/po/microsoft-antitrust.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Антимонопольный процесс против Microsoft и 
свободные программы</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
 Поскольку антимонопольный процесс против 
Microsoft подходит к завершению,
 вопрос о том, что потребовать от Microsoft, если 
компания проиграет, выходит
@@ -61,8 +70,7 @@
 <p>
    Подобные условия были включены в 
соглашение между IBM и ЕЭС в 1984&nbsp;году
 в результате урегулирования другого 
антимонопольного разбирательства. См. <a
-href="http://www.cptech.org/at/ibm/ibm1984ec.html";>
-http://www.cptech.org/at/ibm/ibm1984ec.html</a>.</p>
+href="http://www.cptech.org/at/ibm/ibm1984ec.html";> www.cptech.org</a>.</p>
 </li>
 <li>Потребовать, чтобы Microsoft применяла свои 
патенты в области программ
 только для защиты. (Если окажется, что у них 
есть патенты,
@@ -114,6 +122,8 @@
 нужно. Они откроют нам путь к разработке 
действительно превосходной
 альтернативы системе Microsoft Windows, в какой бы 
области Microsoft ни
 оставила Windows несвободной.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -123,7 +133,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -143,7 +153,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -158,7 +168,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
@@ -172,13 +182,12 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2007, 2008, 2010, 2011, 2014 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2010, 2021 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">
@@ -189,11 +198,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:15 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/microsoft-new-monopoly.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-new-monopoly.ru.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/microsoft-new-monopoly.ru.html   18 Jul 2020 04:01:03 -0000      
1.22
+++ philosophy/microsoft-new-monopoly.ru.html   18 Jul 2021 17:32:08 -0000      
1.23
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/microsoft-new-monopoly.en.html" 
-->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Новая монополия Microsoft - Проект GNU - Фонд 
свободного программного
@@ -9,11 +12,15 @@
 
 <!--#include virtual="/philosophy/po/microsoft-new-monopoly.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Новая монополия Microsoft</h2>
 
-<p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<blockquote>
+<div class="comment">
 <p>Эта статья написана в&nbsp;июле 2005&nbsp;года. 
В&nbsp;2006&nbsp;году
 компания Microsoft приняла новые правила, так 
что конкретные правила,
 описанные ниже, и&nbsp;конкретная их критика 
имеет только историческое
@@ -22,8 +29,10 @@
 Хитроумно сформулированные новые правила 
Microsoft никому не&nbsp;дают
 ясного разрешения реализовывать OOXML</a>.
 </p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
+<div class="article">
 <p>Европейские законодатели, которые 
одобряют патенты на&nbsp;программы, часто
 заявляют, что они не&nbsp;сказались&nbsp;бы 
на&nbsp;свободных программах
 (или &ldquo;открытом исходном тексте&rdquo;). 
Юристы Microsoft полны
@@ -101,8 +110,9 @@
 нейтрализовать дезинформирующее 
действие, например, таким предупреждением:
 &ldquo;Следующее дезинформирующее заявление 
было навязано нам компанией
 Microsoft; пожалуйста, имейте в&nbsp;виду, что это 
пропаганда. Более
-подробное объяснение см.&nbsp;на&nbsp;<a
-href="/philosophy/not-ipr.html">http://www.gnu.org/philosophy/not-ipr.html</a>&rdquo;.</p>
+подробное объяснение см.&nbsp;в&nbsp;<a
+href="/philosophy/not-ipr.html">нашей статье об 
&lsquo;интеллектуальной
+собственности&rsquo;</a>&rdquo;.</p>
 
 <p>Однако требование размещать 
фиксированный отрывок текста на&nbsp;самом 
деле
 не&nbsp;так-то просто, потому что каждый, кто 
делает это, явным образом
@@ -152,8 +162,10 @@
 продолжило выдавать их, и&nbsp;некоторые 
страны считают их
 действительными. Более подробные сведения 
и&nbsp;то, как принять участие
 в&nbsp;кампании против патентов 
на&nbsp;программы в&nbsp;Европе,
-см.&nbsp;на&nbsp;<a href="http://ffii.org";>ffii.org</a>.
+см.&nbsp;на&nbsp;<a href="https://ffii.org";>ffii.org</a>.
 </p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -163,7 +175,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -183,7 +195,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -212,9 +224,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2005, 2009, 2015, 2016, 2020 Richard Stallman<br
-/>Copyright &copy; 2015, 2016, 2020 Free Software Foundation,
-Inc. (translation)</p>
+<p>Copyright &copy; 2005, 2007, 2009, 2010, 2021 Richard Stallman<br
+/>Copyright &copy; 2015, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -234,11 +245,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/07/18 04:01:03 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/microsoft-old.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-old.ru.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/microsoft-old.ru.html    23 May 2015 05:09:15 -0000      1.33
+++ philosophy/microsoft-old.ru.html    18 Jul 2021 17:32:08 -0000      1.34
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/microsoft-old.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Microsoft: враг рода человеческого? (старая 
версия) - Проект GNU - Фонд
@@ -9,13 +12,19 @@
 
 <!--#include virtual="/philosophy/po/microsoft-old.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Microsoft: враг рода человеческого? (старая 
версия)</h2>
 
 <div class="announcement">
-<blockquote><p>Есть <a 
href="/philosophy/microsoft.html">обновленная версия</a> 
этой
-статьи.</p></blockquote>
+<p>Есть <a href="/philosophy/microsoft.html">обновленная 
версия</a> этой
+статьи.</p>
 </div>
+<hr class="thin" />
 
+<div class="article">
 <p>Многие думают о Microsoft как об ужасном 
страшилище в отрасли
 программирования. Есть даже кампания по 
бойкоту Microsoft. Это чувство
 усилилось, когда Microsoft выразила активную 
враждебность к свободному
@@ -62,6 +71,9 @@
 href="/gnu/linux-and-gnu.html">GNU/Linux</a> может достичь 
большого успеха.</p>
 
 <p>Спасибо вам, Microsoft; будьте любезны, не 
стойте на пути!</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -70,7 +82,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -90,7 +102,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -105,7 +117,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
@@ -119,13 +131,12 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1997-2000, 2010, 2021 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">
@@ -136,11 +147,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:15 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/microsoft-verdict.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-verdict.ru.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/microsoft-verdict.ru.html        23 May 2015 05:09:16 -0000      
1.31
+++ philosophy/microsoft-verdict.ru.html        18 Jul 2021 17:32:08 -0000      
1.32
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/microsoft-verdict.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Приговор по делу Microsoft - Проект GNU - Фонд 
свободного программного
@@ -9,8 +12,14 @@
 
 <!--#include virtual="/philosophy/po/microsoft-verdict.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Приговор по делу Microsoft</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
 Многие пользователи <a 
href="/gnu/linux-and-gnu.html">GNU/Linux</a> думают
 об этой системе как о конкуренте Microsoft. Но 
движение за свободное
@@ -57,6 +66,8 @@
 <p>
 Когда мы узнаем, какие меры выберет суд, мы 
поймем, пошел ли процесс на
 пользу или во вред движению за свободное 
программное обеспечение.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -66,7 +77,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -86,7 +97,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -99,12 +110,12 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2000, 2007, 2008, 2010, 2013 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2000, 2010, 2021 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">
@@ -115,11 +126,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/05/23 05:09:16 $
+$Date: 2021/07/18 17:32:08 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/microsoft.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft.ru.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/microsoft.ru.html        15 Dec 2018 14:46:28 -0000      1.41
+++ philosophy/microsoft.ru.html        18 Jul 2021 17:32:09 -0000      1.42
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/microsoft.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Microsoft: враг рода человеческого? - Проект 
GNU - Фонд свободного
@@ -9,13 +12,17 @@
 
 <!--#include virtual="/philosophy/po/microsoft.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Microsoft: враг рода человеческого?</h2>
 
-<div class="announcement">
-<blockquote><p>Эта статья была серьезно 
переработана в 2009&nbsp;году. <a
-href="/philosophy/microsoft-old.html">Старая версия</a> тоже 
доступна.</p></blockquote>
-</div>
+<p><em>Эта статья была серьезно переработана 
в 2009&nbsp;году. <a
+href="/philosophy/microsoft-old.html">Старая версия</a> тоже 
доступна.</em></p>
+<hr class="thin" />
 
+<div class="article">
 <p>Многие думают о Microsoft как об ужасном 
страшилище в отрасли
 программирования. Есть даже особая 
кампания по бойкоту Microsoft. Это
 чувство усилилось, когда Microsoft выразила 
активную враждебность к
@@ -70,7 +77,7 @@
 будущем. По большей части главным мотивом 
при совершении компаниями этих
 действий является нападение друг на друга; 
теперь, кажется, это направлено
 именно против нас. Microsoft пользуется своими 
патентами для прямого <a
-href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>нападения
+href="https://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>нападения
 на сообщество свободного программного 
обеспечения</a>, и наше сообщество
 обороняется.</p>
 
@@ -87,23 +94,26 @@
 дар&rdquo; школам копии Windows, она превращает 
эти школы в инструмент для
 вживления зависимости от Windows. По 
некоторым признакам, Microsoft
 систематически планирует такого рода 
деятельность <a
-href="http://boycottnovell.com/wiki/index.php/EDGI";>как кампанию 
против
+href="http://techrights.org/wiki/index.php/EDGI";>как кампанию 
против
 освоения GNU/Linux</a>.</p>
 
 <p>Каждое &ldquo;обновление&rdquo; Windows 
увеличивает власть Microsoft над
 пользователями; это входит в планы Microsoft. 
Каждый раз это шаг к
 вредоносным особенностям, в том числе <a
-href="http://DefectiveByDesign.org";>цифровым оковам</a> и 
лазейкам. Поэтому
+href="https://DefectiveByDesign.org";>цифровым оковам</a> и 
лазейкам. Поэтому
 ФСПО проводит кампании для предупреждения 
пользователей об опасностях,
 связанных с &ldquo;обновлением&rdquo; до <a
-href="http://BadVista.org/";>Windows Vista</a> и <a
-href="http://Windows7Sins.org";>Windows 7</a>. Мы стремимся 
снизить величину
+href="http://badvista.fsf.org/";>Windows Vista</a> и <a
+href="http://windows7sins.org";>Windows 7</a>. Мы стремимся 
снизить величину
 инерции, которую они создадут.</p>
 
 <p>У нас нет ненависти к Microsoft, и мы не 
считаем эту компанию врагом рода
 человеческого. Но мы всерьез считаем, что 
эта компания разлучила со свободой
 больше пользователей, чем любая другая, и 
что это могущественный и заклятый
 враг свободы пользователей. Мы действуем 
исходя из этого.</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -112,7 +122,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
@@ -132,7 +142,7 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -161,8 +171,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2017, 2018
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1997-2000, 2009, 2010, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -178,7 +187,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/12/15 14:46:28 $
+$Date: 2021/07/18 17:32:09 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/apsl.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.ru-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/apsl.ru-en.html       15 Dec 2018 14:46:34 -0000      1.24
+++ philosophy/po/apsl.ru-en.html       18 Jul 2021 17:32:09 -0000      1.25
@@ -1,11 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>FSF's Opinion on the Apple Public Source License (APSL)
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/apsl.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>FSF's Opinion of the Apple Public Source License (APSL) 2.0</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>The Apple Public Source License (APSL) version 2.0 qualifies as a free
 software license.  Apple's lawyers worked with the FSF to produce a
 license that would qualify.
@@ -50,10 +59,12 @@
 
 <p><a href="http://gnu-darwin.sourceforge.net/index.php";>GNU-Darwin</a> is a 
combination
 of GNU and Darwin that is supposed to include only free software.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -71,13 +82,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -98,9 +109,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2014, 2017, 2018 Free Software 
Foundation, Inc.</p>
-
+<p>Copyright &copy; 2003, 2021 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -110,7 +119,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:34 $
+$Date: 2021/07/18 17:32:09 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/apsl.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/apsl.ru.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/po/apsl.ru.po    18 Jul 2021 17:00:36 -0000      1.25
+++ philosophy/po/apsl.ru.po    18 Jul 2021 17:32:09 -0000      1.26
@@ -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: 2021-07-18 09: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"
 
@@ -168,11 +167,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -187,9 +181,6 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014, 2015-] {+2003, 2021+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2003, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2003, 2021 Free Software Foundation, Inc."
 

Index: philosophy/po/enforcing-gpl.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/enforcing-gpl.ru-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/enforcing-gpl.ru-en.html      12 Apr 2014 13:58:36 -0000      
1.19
+++ philosophy/po/enforcing-gpl.ru-en.html      18 Jul 2021 17:32:09 -0000      
1.20
@@ -1,14 +1,24 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Enforcing the GNU GPL
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/enforcing-gpl.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Enforcing the GNU GPL</h2>
 
-<p>by <a href="http://moglen.law.columbia.edu/";><strong>Eben 
Moglen</strong></a></p>
+<address class="byline">by <a href="http://moglen.law.columbia.edu/";>Eben
+Moglen</a></address>
+
 <p><em>10 September 2001</em></p>
 
+<div class="article">
 <p>Microsoft's anti-GPL offensive this summer has sparked renewed
 speculation about whether the GPL is &ldquo;enforceable.&rdquo; This
 particular example of &ldquo;FUD&rdquo; (fear, uncertainty and doubt)
@@ -179,15 +189,21 @@
 has been as unusual as our way of doing software, but that's just the
 point.  Free software matters because it turns out that the different way
 is the right way after all.</p>
+</div>
 
-<p><cite>
+<div class="infobox" role="complementary">
+<hr />
+<p>
 Eben Moglen is professor of law and legal history at Columbia University
 Law School.  He serves without fee as General Counsel of the Free Software
 Foundation.
-</cite></p>
+</p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -205,13 +221,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
 <p>Copyright &copy; 2001 Eben Moglen</p>
@@ -223,10 +239,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:58:36 $
+$Date: 2021/07/18 17:32:09 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/enforcing-gpl.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/enforcing-gpl.ru.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/enforcing-gpl.ru.po   18 Jul 2021 17:00:36 -0000      1.17
+++ philosophy/po/enforcing-gpl.ru.po   18 Jul 2021 17:32:10 -0000      1.18
@@ -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: 2021-07-18 09:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -33,12 +32,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by <a [-href=\"http://moglen.law.columbia.edu/\";><strong>Eben
-# | Moglen</strong></a>-] {+href=\"http://moglen.law.columbia.edu/\";>Eben
-# | Moglen</a>+}
-#| msgid ""
-#| "by <a href=\"http://moglen.law.columbia.edu/\";><strong>Eben Moglen</"
-#| "strong></a>"
 msgid "by <a href=\"http://moglen.law.columbia.edu/\";>Eben Moglen</a>"
 msgstr ""
 "<a href=\"http://moglen.law.columbia.edu/\";><strong>Эбен 
Моглен</strong></a>"
@@ -448,13 +441,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | [-<cite>-]Eben Moglen is professor of law and legal history at Columbia
-# | University Law School.  He serves without fee as General Counsel of the
-# | Free Software Foundation.  [-</cite>-]
-#| msgid ""
-#| "<cite> Eben Moglen is professor of law and legal history at Columbia "
-#| "University Law School.  He serves without fee as General Counsel of the "
-#| "Free Software Foundation.  </cite>"
 msgid ""
 "Eben Moglen is professor of law and legal history at Columbia University Law "
 "School.  He serves without fee as General Counsel of the Free Software "
@@ -497,11 +483,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -518,9 +499,9 @@
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2001 Eben Moglen"
 msgstr ""
-"Copyright &copy; 2001 Eben Moglen<br />"
-"Copyright &copy; 2002 Елена Тяпкина (translation)<br />"
-"Copyright &copy; 2011, 2013 Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 2001 Eben Moglen<br />Copyright &copy; 2002 Елена 
Тяпкина "
+"(translation)<br />Copyright &copy; 2011, 2013 Free Software Foundation, "
+"Inc. (translation)"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/freedom-or-power.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-power.ru-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/po/freedom-or-power.ru-en.html   31 May 2021 09:31:00 -0000      
1.26
+++ philosophy/po/freedom-or-power.ru-en.html   18 Jul 2021 17:32:10 -0000      
1.27
@@ -1,23 +1,32 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Freedom Or Power?
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.epigraph { text-align: right; color: #404040; }
+.epigraph p { display: inline-block; text-align: left; width: 80%; }
+--></style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, general, public, license, gpl, general public license, freedom, 
software, power, rights" />
 <meta http-equiv="Description" content="In this essay, Freedom or Power?, 
Bradley M. Kuhn and Richard M. Stallman discuss the reasons that the free 
software movement doesn't advocate the so-called freedom to choose any license 
you want for software you write." />
 <!--#include virtual="/philosophy/po/freedom-or-power.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Freedom or Power?</h2>
 
-<p>
-by <strong>Bradley M. Kuhn</strong> and <strong>Richard
-M. Stallman</strong></p>
+<address class="byline">by Bradley M. Kuhn and Richard M. Stallman</address>
 
-<blockquote>
+<blockquote class="epigraph">
 <p>The love of liberty is the love of others; the love of power is the
-love of ourselves.<br />
--- William Hazlitt</p>
+love of ourselves. &mdash;<i>William&nbsp;Hazlitt</i></p>
 </blockquote>
 
+<div class="article">
 <p>
 In the free software movement, we stand for freedom for the users of
 software.  We formulated our views by looking at what freedoms are
@@ -94,7 +103,7 @@
 not.  The ethical response to this situation is to proclaim freedom for
 each user, just as the Bill of Rights was supposed to exercise government
 power by guaranteeing each citizen's freedoms.  That is what the <a
-href="/copyleft/copyleft.html">GNU General Public License</a> is for:
+href="/licenses/copyleft.html">GNU General Public License</a> is for:
 it puts you in control of your usage of the software while <a
 href="/philosophy/why-copyleft.html">protecting you from others</a> who would
 like to take control of your decisions.</p>
@@ -105,23 +114,28 @@
 we stand for, just as more and more users have come to appreciate the
 practical value of the free software we have developed.</p>
 
-<h4>Footnotes</h4>
-
-<a id="f1"></a> William J. Mitchell,
-<em>City of Bits: Space, Place, and the Infobahn </em> (Cambridge,
+<h3 class="footnote">Footnote</h3>
+<ol>
+<li id="f1">William J. Mitchell,
+<cite>City of Bits: Space, Place, and the Infobahn</cite> (Cambridge,
 Mass.: MIT Press, 1995), p. 111, as quoted by Lawrence Lessig in
-<em>Code and Other Laws of Cyberspace, Version 2.0</em> (New York, NY:
-Basic Books, 2006), p. 5.
+<cite>Code and Other Laws of Cyberspace, Version 2.0</cite> (New York, NY:
+Basic Books, 2006), p. 5.</li>
+</ol>
+</div>
 
-<hr />
-<blockquote id="fsfs"><p>This essay is published
-in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
 Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p></blockquote>
+M. Stallman</cite></a>.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -139,16 +153,16 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2009, 2020, 2021 Bradley M. Kuhn and Richard M. 
Stallman</p>
+<p>Copyright &copy; 2001, 2009, 2021 Bradley M. Kuhn and Richard M. 
Stallman</p>
 
 <p>Verbatim copying and distribution of this entire article is permitted
 without royalty in any medium, provided this notice is preserved.</p>
@@ -157,10 +171,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/05/31 09:31:00 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/freedom-or-power.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/freedom-or-power.ru.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/freedom-or-power.ru.po        18 Jul 2021 17:00:36 -0000      
1.30
+++ philosophy/po/freedom-or-power.ru.po        18 Jul 2021 17:32:10 -0000      
1.31
@@ -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: 2021-07-18 09:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -54,21 +53,11 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by [-<strong>Bradley-] {+Bradley+} M. [-Kuhn</strong>-] {+Kuhn+} and
-# | [-<strong>Richard-] {+Richard+} M. [-Stallman</strong>-] {+Stallman+}
-#| msgid ""
-#| "by <strong>Bradley M. Kuhn</strong> and <strong>Richard M. Stallman</"
-#| "strong>"
 msgid "by Bradley M. Kuhn and Richard M. Stallman"
 msgstr "Брэдли М. Кун и Ричард М. Столмен"
 
 # type: Content of: <blockquote><p>
 #. type: Content of: <div><blockquote><p>
-# | The love of liberty is the love of others; the love of power is the love
-# | of ourselves. {+&mdash;<i>William&nbsp;Hazlitt</i>+}
-#| msgid ""
-#| "The love of liberty is the love of others; the love of power is the love "
-#| "of ourselves."
 msgid ""
 "The love of liberty is the love of others; the love of power is the love of "
 "ourselves. &mdash;<i>William&nbsp;Hazlitt</i>"
@@ -236,28 +225,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | We believe you should decide what to do with the software you use;
-# | however, that is not what today's law says.  Current copyright law places
-# | us in the position of power over users of our code, whether we like it or
-# | not.  The ethical response to this situation is to proclaim freedom for
-# | each user, just as the Bill of Rights was supposed to exercise government
-# | power by guaranteeing each citizen's freedoms.  That is what the <a
-# | [-href=\"/copyleft/copyleft.html\">GNU-]
-# | {+href=\"/licenses/copyleft.html\">GNU+} General Public License</a> is
-# | for: it puts you in control of your usage of the software while <a
-# | href=\"/philosophy/why-copyleft.html\">protecting you from others</a> who
-# | would like to take control of your decisions.
-#| msgid ""
-#| "We believe you should decide what to do with the software you use; "
-#| "however, that is not what today's law says.  Current copyright law places "
-#| "us in the position of power over users of our code, whether we like it or "
-#| "not.  The ethical response to this situation is to proclaim freedom for "
-#| "each user, just as the Bill of Rights was supposed to exercise government "
-#| "power by guaranteeing each citizen's freedoms.  That is what the <a href="
-#| "\"/copyleft/copyleft.html\">GNU General Public License</a> is for: it "
-#| "puts you in control of your usage of the software while <a href=\"/"
-#| "philosophy/why-copyleft.html\">protecting you from others</a> who would "
-#| "like to take control of your decisions."
 msgid ""
 "We believe you should decide what to do with the software you use; however, "
 "that is not what today's law says.  Current copyright law places us in the "
@@ -300,44 +267,24 @@
 
 # type: Content of: <h4>
 #. type: Content of: <div><div><h3>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Footnote"
 msgid "Footnote"
 msgstr "Примечание"
 
 #. type: Content of: <div><div><ol><li>
-# | [-<a id=\"f1\"></a>-]William J. Mitchell, [-<em>City-] {+<cite>City+} of
-# | Bits: Space, Place, and the [-Infobahn </em>-] {+Infobahn</cite>+}
-# | (Cambridge, Mass.: MIT Press, 1995), p. 111, as quoted by Lawrence Lessig
-# | in [-<em>Code-] {+<cite>Code+} and Other Laws of Cyberspace, Version
-# | [-2.0</em>-] {+2.0</cite>+} (New York, NY: Basic Books, 2006), p. 5.
-#| msgid ""
-#| "<a id=\"f1\"></a> William J. Mitchell, <em>City of Bits: Space, Place, "
-#| "and the Infobahn </em> (Cambridge, Mass.: MIT Press, 1995), p. 111, as "
-#| "quoted by Lawrence Lessig in <em>Code and Other Laws of Cyberspace, "
-#| "Version 2.0</em> (New York, NY: Basic Books, 2006), p. 5."
 msgid ""
 "William J. Mitchell, <cite>City of Bits: Space, Place, and the Infobahn</"
 "cite> (Cambridge, Mass.: MIT Press, 1995), p. 111, as quoted by Lawrence "
 "Lessig in <cite>Code and Other Laws of Cyberspace, Version 2.0</cite> (New "
 "York, NY: Basic Books, 2006), p. 5."
 msgstr ""
-"Уильям Дж. Митчел, <cite>Город бит: 
Пространство, место, "
-"информационное шоссе</cite> (Кембридж, штат 
Массачусетс: МИТ Пресс, 1995), "
-"cтр.&nbsp;111, цитируется Лоренсом Лессигом в 
книге <cite>Программы и "
-"другие законы киберпространства, версия 
2.0</cite> (Нью-Йорк, штат Нью-Йорк "
-"NY: Бейсик Букс, 2006), стр.&nbsp;5."
+"Уильям Дж. Митчел, <cite>Город бит: 
Пространство, место, информационное "
+"шоссе</cite> (Кембридж, штат Массачусетс: МИТ 
Пресс, 1995), cтр.&nbsp;111, "
+"цитируется Лоренсом Лессигом в книге 
<cite>Программы и другие законы "
+"киберпространства, версия 2.0</cite> (Нью-Йорк, 
штат Нью-Йорк NY: Бейсик "
+"Букс, 2006), стр.&nbsp;5."
 
 # type: Content of: <h4>
 #. type: Content of: <div><div><p>
-# | This essay is published in <a
-# | 
href=\"http{+s+}://shop.fsf.org/product/free-software-free-society/\"><cite>Free
-# | Software, Free Society: The Selected Essays of Richard M.
-# | Stallman</cite></a>.
-#| msgid ""
-#| "This essay is published in <a href=\"http://shop.fsf.org/product/free-";
-#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
-#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
 "This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
@@ -379,11 +326,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -397,16 +339,10 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, 2009, [-2020,-] 2021 Bradley M. Kuhn and Richard M.
-# | Stallman
-#| msgid ""
-#| "Copyright &copy; 2001, 2009, 2020, 2021 Bradley M. Kuhn and Richard M. "
-#| "Stallman"
 msgid ""
 "Copyright &copy; 2001, 2009, 2021 Bradley M. Kuhn and Richard M. Stallman"
 msgstr ""
-"Copyright &copy; 2001, 2009, 2021 Bradley M. Kuhn and Richard M. "
-"Stallman"
+"Copyright &copy; 2001, 2009, 2021 Bradley M. Kuhn and Richard M. Stallman"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
@@ -417,8 +353,7 @@
 "Verbatim copying and distribution of this entire article is permitted "
 "without royalty in any medium, provided this notice is preserved. <br />"
 "(Буквальное копирование и 
распространение всей этой статьи 
разрешено "
-"безвозмездно на любом носителе при 
условии, что это "
-"примечание сохраняется)"
+"безвозмездно на любом носителе при 
условии, что это примечание сохраняется)"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: philosophy/po/gates.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gates.ru-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/gates.ru-en.html      12 Apr 2014 13:58:53 -0000      1.19
+++ philosophy/po/gates.ru-en.html      18 Jul 2021 17:32:10 -0000      1.20
@@ -1,22 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>It's not the Gates, it's the bars
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/gates.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2> It's not the Gates, it's the bars</h2>
 
-<p>by <a href="http://www.stallman.org/";><strong>Richard
-Stallman</strong></a><br />
-Founder, Free Software Foundation
-</p>
-
-<blockquote>
-<p><em>(This article was <a
-href="http://news.bbc.co.uk/1/hi/technology/7487060.stm";>published by
-BBC News in 2008</a>.)</em></p>
-</blockquote>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
+<div class="article">
   <p>To pay so much attention to Bill Gates' retirement is
   missing the point. What really matters is not Gates, nor
   Microsoft, but the unethical system of restrictions that
@@ -119,10 +119,19 @@
   <p>Gates may be gone, but the walls and bars of proprietary software
   he helped create remain&mdash;for now.  Dismantling them is up to
   us.</p>
+</div>
+
+<div class="infobox" role="contentinfo">
+<hr />
+<p>This article was <a
+href="http://news.bbc.co.uk/1/hi/technology/7487060.stm";>published by
+<cite>BBC News</cite> in 2008</a>.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -140,19 +149,19 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
 <!-- 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
@@ -167,21 +176,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-
-<p>Copyright &copy; 2008 Richard Stallman</p>
+<p>Copyright &copy; 2008, 2021 Richard 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 13:58:53 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/gates.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/gates.ru.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/gates.ru.po   18 Jul 2021 17:00:38 -0000      1.13
+++ philosophy/po/gates.ru.po   18 Jul 2021 17:32:10 -0000      1.14
@@ -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: 2021-07-18 09:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -32,8 +31,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
@@ -287,18 +284,12 @@
 
 # type: Content of: <blockquote><p>
 #. type: Content of: <div><div><p>
-# | [-<em>(This-]{+This+} article was <a
-# | href=\"http://news.bbc.co.uk/1/hi/technology/7487060.stm\";>published by
-# | [-BBC News-] {+<cite>BBC News</cite>+} in [-2008</a>.)</em>-] {+2008</a>.+}
-#| msgid ""
-#| "<em>(This article was <a href=\"http://news.bbc.co.uk/1/hi/";
-#| "technology/7487060.stm\">published by BBC News in 2008</a>.)</em>"
 msgid ""
 "This article was <a href=\"http://news.bbc.co.uk/1/hi/technology/7487060.stm";
 "\">published by <cite>BBC News</cite> in 2008</a>."
 msgstr ""
-"(Эта статья была <a 
href=\"http://news.bbc.co.uk/1/hi/technology/7487060.";
-"stm\">опубликована <cite>Би-Би-Си Ньюс</cite> в 
2008&nbsp;году</a>.)"
+"(Эта статья была <a 
href=\"http://news.bbc.co.uk/1/hi/technology/7487060.stm";
+"\">опубликована <cite>Би-Би-Си Ньюс</cite> в 
2008&nbsp;году</a>.)"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -332,11 +323,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -353,15 +339,10 @@
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2008, 2021 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2008, 2021 Richard Stallman<br />Copyright &copy; 2011, 2021 
Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 2008, 2021 Richard Stallman<br />Copyright &copy; 2011, "
+"2021 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-"

Index: philosophy/po/gpl-american-dream.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-dream.ru-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/gpl-american-dream.ru-en.html 12 Apr 2014 13:58:57 -0000      
1.18
+++ philosophy/po/gpl-american-dream.ru-en.html 18 Jul 2021 17:32:10 -0000      
1.19
@@ -1,13 +1,21 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The GNU GPL and the American Dream
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/gpl-american-dream.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The GNU GPL and the American Dream</h2>
 
-<p>by <strong>Bradley M. Kuhn</strong></p>
+<address class="byline">by Bradley M. Kuhn</address>
 
+<div class="article">
 <p>
 When I was in grade school, right here in the United States of
 America, I was taught that our country was the &ldquo;land of
@@ -70,9 +78,12 @@
 That is exactly what the American Way is about, at least the way I learned
 it in grade school.  I hope that we won't let Microsoft and others change
 the definition.</p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -90,13 +101,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
 <p>Copyright &copy; 2001 Bradley M. Kuhn</p>
@@ -109,10 +120,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:58:57 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/gpl-american-dream.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-dream.ru.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/gpl-american-dream.ru.po      18 Jul 2021 17:00:38 -0000      
1.17
+++ philosophy/po/gpl-american-dream.ru.po      18 Jul 2021 17:32:10 -0000      
1.18
@@ -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: 2021-07-18 09:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -34,8 +33,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by [-<strong>Bradley-] {+Bradley+} M. [-Kuhn</strong>-] {+Kuhn+}
-#| msgid "by <strong>Bradley M. Kuhn</strong>"
 msgid "by Bradley M. Kuhn"
 msgstr "Брэдли М. Кун"
 
@@ -227,11 +224,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -247,8 +239,8 @@
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2001 Bradley M. Kuhn"
 msgstr ""
-"Copyright &copy; 2001 Bradley M. Kuhn<br />Copyright &copy; 2010, 2011, 2013, 
2021 Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 2001 Bradley M. Kuhn<br />Copyright &copy; 2010, 2011, "
+"2013, 2021 Free Software Foundation, Inc. (translation)"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/gpl-american-way.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-way.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/gpl-american-way.ru-en.html   26 Mar 2015 16:28:12 -0000      
1.1
+++ philosophy/po/gpl-american-way.ru-en.html   18 Jul 2021 17:32:10 -0000      
1.2
@@ -1,14 +1,21 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The GNU GPL and the American Way
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/gpl-american-way.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The GNU GPL and the American Way</h2>
 
-<p>by <strong>Richard M. Stallman</strong></p>
+<address class="byline">by Richard M. Stallman</address>
 
+<div class="article">
 <p>
 Microsoft describes the GNU General Public License (GNU GPL) as an
 &ldquo;open source&rdquo; license, and says it is against the American
@@ -113,7 +120,7 @@
 But defenselessness is not the American Way.  In the land of the brave
 and the free, we defend our freedom with the GNU GPL.</p>
 
-<h4>Addendum:</h4>
+<h3 class="footnote">Addendum:</h3>
 
 <p>
 Microsoft says that the GPL is against &ldquo;intellectual property
@@ -133,9 +140,12 @@
 conflict between human rights and property rights, human rights must
 prevail.&rdquo; Property rights are meant to advance human well-being,
 not as an excuse to disregard it.</p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -153,29 +163,29 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001 Richard M. Stallman</p>
+<p>Copyright &copy; 2001, 2021 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: 2015/03/26 16:28:12 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/gpl-american-way.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-way.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/gpl-american-way.ru.po        18 Jul 2021 17:00:38 -0000      
1.6
+++ philosophy/po/gpl-american-way.ru.po        18 Jul 2021 17:32:10 -0000      
1.7
@@ -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: 2021-07-18 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -31,8 +30,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by Richard {+M.+} Stallman
-#| msgid "by Richard Stallman"
 msgid "by Richard M. Stallman"
 msgstr "Ричард Столмен"
 
@@ -338,11 +335,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -363,11 +355,6 @@
 "2021 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-"

Index: philosophy/po/java-trap.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.ru-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/java-trap.ru-en.html  3 Oct 2015 17:28:16 -0000       1.21
+++ philosophy/po/java-trap.ru-en.html  18 Jul 2021 17:32:10 -0000      1.22
@@ -1,18 +1,25 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Free but Shackled - The Java Trap
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/java-trap.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 
 <h2>Free but Shackled - The Java Trap</h2>
 
-<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
-
-<div class="announcement"><blockquote><h3>Headnote</h3>
+<h3 class="footnote">Headnote</h3>
 <p>Since this article was first published, Sun (now part of Oracle)
-has <a href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
+has <a 
href="https://www.fsf.org/news/fsf-welcomes-gpl-java.html";>relicensed</a>
 most of its Java platform reference implementation under the GNU
 General Public License, and there is now a free development
 environment for Java.  Thus, the Java language as such is no longer a
@@ -47,10 +54,10 @@
 
 <p>Please also see: <a href="/philosophy/javascript-trap.html">
 The JavaScript Trap</a>.</p>
-</blockquote>
-</div>
+<hr class="column-limit" />
 
-<p>April 12, 2004</p>
+<div class="article">
+<p><em>April 12, 2004</em></p>
 
 <p>
   If your program is free software, it is basically ethical&mdash;but
@@ -65,8 +72,8 @@
   freedoms. Roughly speaking, they are: the freedom to run the
   program, the freedom to study and change the source, the freedom to
   redistribute the source and binaries, and the freedom to publish
-  improved versions. (See
-  <a 
href="/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</a>.)
+  improved versions. (See the
+  <a href="/philosophy/free-sw.html">Free Software Definition</a>.)
   Whether any given program in source form is free software depends
   solely on the meaning of its license.
 </p>
@@ -110,7 +117,8 @@
 <p>
   Sun's implementation of Java is nonfree. The standard Java libraries are
   nonfree also. We do have free implementations of Java, such as the <a
-  href="http://gcc.gnu.org/java/";>GNU Compiler for Java</a> (GCJ) and <a
+  
href="https://objectcomputing.com/resources/publications/sett/january-2003-gcj-the-gnu-compiler-for-java";>
+  GNU Compiler for Java</a> (GCJ) and <a
   href="/software/classpath">GNU Classpath</a>, but they don't support all the
   features yet. We are still catching up.
 </p>
@@ -136,9 +144,11 @@
   libraries, and nearly all of them are nonfree; in many cases, even
   a library's specification is a trade secret, and Sun's latest
   license for these specifications prohibits release of anything less
-  than a full implementation of the specification. (See
-  <a 
href="http://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>http://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a>
 and
-  <a 
href="http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>
+  than a full implementation of the specification. (See the
+  <a href="https://jcp.org/aboutJava/communityprocess/JSPA2.pdf";>
+  Java Specification Participation Agreement</a> and the
+  <a 
href="https://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html";>
+  J2ME&trade; Personal Basis Profile Specification</a>
   for examples.)
 </p>
 
@@ -181,11 +191,11 @@
   development environment and use it. More generally, whatever
   language you use, keep your eyes open, and check the free status of
   programs your code depends on. The easiest way to verify that a
-  program is free is by looking for it in the Free Software Directory
-  (<a href="http://www.fsf.org/directory";>http://www.fsf.org/directory</a>).
+  program is free is by looking for it in the <a
+  href="https://www.fsf.org/directory";>Free Software Directory</a>.
   If a program is not in the directory, you can check its license(s)
-  against the list of free software licenses
-  (<a 
href="/licenses/license-list.html">http://www.gnu.org/licenses/license-list.html</a>).
+  against the <a href="/licenses/license-list.html">list of free software
+  licenses</a>.
 </p>
 
 <p>
@@ -198,14 +208,16 @@
   put your free software in shackles. When you write an application program
   today, write it to run on free facilities from the start.
 </p>
+</div>
 
-<h3>See also:</h3>
+<h3 class="footnote">See also:</h3>
 <p><a href="/philosophy/sun-in-night-time.html">The Curious Incident
 of Sun in the Night-Time</a></p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -223,17 +235,17 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2004, 2010, 2015 Richard Stallman</p>
+<p>Copyright &copy; 2004, 2010, 2015, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -243,10 +255,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/10/03 17:28:16 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/java-trap.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/java-trap.ru.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/java-trap.ru.po       18 Jul 2021 17:00:38 -0000      1.21
+++ philosophy/po/java-trap.ru.po       18 Jul 2021 17:32:10 -0000      1.22
@@ -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: 2021-07-18 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -31,8 +30,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
@@ -41,17 +38,6 @@
 msgstr "Вводное замечание"
 
 #. type: Content of: <div><p>
-# | Since this article was first published, Sun (now part of Oracle)  has <a
-# | 
href=\"http{+s+}://www.fsf.org/news/fsf-welcomes-gpl-java.html\">relicensed</a>
-# | most of its Java platform reference implementation under the GNU General
-# | Public License, and there is now a free development environment for Java. 
-# | Thus, the Java language as such is no longer a trap.
-#| msgid ""
-#| "Since this article was first published, Sun (now part of Oracle)  has <a "
-#| "href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</"
-#| "a> most of its Java platform reference implementation under the GNU "
-#| "General Public License, and there is now a free development environment "
-#| "for Java.  Thus, the Java language as such is no longer a trap."
 msgid ""
 "Since this article was first published, Sun (now part of Oracle)  has <a "
 "href=\"https://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>relicensed</a> "
@@ -139,8 +125,6 @@
 "a>."
 
 #. type: Content of: <div><div><p>
-# | [-April-]{+<em>April+} 12, [-2004-] {+2004</em>+}
-#| msgid "April 12, 2004"
 msgid "<em>April 12, 2004</em>"
 msgstr "<em>12 апреля 2004&nbsp;года</em>"
 
@@ -158,22 +142,6 @@
 "программ на Java, мы называем это западней 
Java."
 
 #. type: Content of: <div><div><p>
-# | A program is free software if its users have certain crucial freedoms.
-# | Roughly speaking, they are: the freedom to run the program, the freedom to
-# | study and change the source, the freedom to redistribute the source and
-# | binaries, and the freedom to publish improved versions. (See {+the+} <a
-# | 
[-href=\"/philosophy/free-sw.html\">http://www.gnu.org/philosophy/free-sw.html</a>.)-]
-# | {+href=\"/philosophy/free-sw.html\">Free Software Definition</a>.)+} 
-# | Whether any given program in source form is free software depends solely
-# | on the meaning of its license.
-#| msgid ""
-#| "A program is free software if its users have certain crucial freedoms. "
-#| "Roughly speaking, they are: the freedom to run the program, the freedom "
-#| "to study and change the source, the freedom to redistribute the source "
-#| "and binaries, and the freedom to publish improved versions. (See <a href="
-#| "\"/philosophy/free-sw.html\">http://www.gnu.org/philosophy/free-sw.html</"
-#| "a>.)  Whether any given program in source form is free software depends "
-#| "solely on the meaning of its license."
 msgid ""
 "A program is free software if its users have certain crucial freedoms. "
 "Roughly speaking, they are: the freedom to run the program, the freedom to "
@@ -188,8 +156,8 @@
 "изучать и править исходный текст, свобода 
перераспространять исходный текст "
 "и двоичные файлы, а также свобода 
публиковать улучшенные версии.  (См. <a "
 "href=\"/philosophy/free-sw.html\">определение свободной 
программы</a>.) "
-"Является ли данная программа в виде исх
одного текста свободной, "
-"полностью определяется смыслом ее 
лицензии."
+"Является ли данная программа в виде исх
одного текста свободной, полностью "
+"определяется смыслом ее лицензии."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -262,19 +230,6 @@
 "проблему зависимостей и попадают в 
западню Java."
 
 #. type: Content of: <div><div><p>
-# | Sun's implementation of Java is nonfree. The standard Java libraries are
-# | nonfree also. We do have free implementations of Java, such as the <a
-# | [-href=\"http://gcc.gnu.org/java/\";>GNU-]
-# | 
{+href=\"https://objectcomputing.com/resources/publications/sett/january-2003-gcj-the-gnu-compiler-for-java\";>
-# | GNU+} Compiler for Java</a> (GCJ) and <a href=\"/software/classpath\">GNU
-# | Classpath</a>, but they don't support all the features yet. We are still
-# | catching up.
-#| msgid ""
-#| "Sun's implementation of Java is nonfree. The standard Java libraries are "
-#| "nonfree also. We do have free implementations of Java, such as the <a "
-#| "href=\"http://gcc.gnu.org/java/\";>GNU Compiler for Java</a> (GCJ) and <a "
-#| "href=\"/software/classpath\">GNU Classpath</a>, but they don't support "
-#| "all the features yet. We are still catching up."
 msgid ""
 "Sun's implementation of Java is nonfree. The standard Java libraries are "
 "nonfree also. We do have free implementations of Java, such as the <a href="
@@ -285,8 +240,8 @@
 msgstr ""
 "Реализация Java компании Sun несвободна. 
Стандартные библиотеки Java тоже "
 "несвободны. Свободные реализации Java у нас 
есть&nbsp;&mdash; такие, как <a "
-"href=\"https://objectcomputing.com/resources/publications/sett/january-2003-gcj-";
-"the-gnu-compiler-for-java\">компилятор GNU языка Java</a> 
(GCJ) и <a "
+"href=\"https://objectcomputing.com/resources/publications/sett/january-2003-";
+"gcj-the-gnu-compiler-for-java\">компилятор GNU языка Java</a> 
(GCJ) и <a "
 "href=\"/software/classpath\">GNU Classpath</a>,&mdash; но они 
поддерживают "
 "еще не все возможности. Мы пока только 
догоняем."
 
@@ -321,28 +276,6 @@
 "эту часть программы."
 
 #. type: Content of: <div><div><p>
-# | Sun continues to develop additional &ldquo;standard&rdquo; Java libraries,
-# | and nearly all of them are nonfree; in many cases, even a library's
-# | specification is a trade secret, and Sun's latest license for these
-# | specifications prohibits release of anything less than a full
-# | implementation of the specification. (See {+the+} <a
-# | 
[-href=\"http://jcp.org/aboutJava/communityprocess/JSPA2.pdf\";>http://jcp.org/aboutJava/communityprocess/JSPA2.pdf</a>-]
-# | {+href=\"https://jcp.org/aboutJava/communityprocess/JSPA2.pdf\";> Java
-# | Specification Participation Agreement</a>+} and {+the+} <a
-# | 
[-href=\"http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html\";>http://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html</a>-]
-# | 
{+href=\"https://jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html\";>
-# | J2ME&trade; Personal Basis Profile Specification</a>+} for examples.)
-#| msgid ""
-#| "Sun continues to develop additional &ldquo;standard&rdquo; Java "
-#| "libraries, and nearly all of them are nonfree; in many cases, even a "
-#| "library's specification is a trade secret, and Sun's latest license for "
-#| "these specifications prohibits release of anything less than a full "
-#| "implementation of the specification. (See <a href=\"http://jcp.org/";
-#| "aboutJava/communityprocess/JSPA2.pdf\">http://jcp.org/aboutJava/";
-#| "communityprocess/JSPA2.pdf</a> and <a href=\"http://jcp.org/aboutJava/";
-#| "communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-license.html\">http://";
-#| "jcp.org/aboutJava/communityprocess/final/jsr129/j2me_pb-1_0-fr-spec-"
-#| "license.html</a> for examples.)"
 msgid ""
 "Sun continues to develop additional &ldquo;standard&rdquo; Java libraries, "
 "and nearly all of them are nonfree; in many cases, even a library's "
@@ -359,8 +292,10 @@
 "спецификации библиотеки являются 
коммерческой тайной, и последняя лицензия "
 "Sun на эти спецификации запрещает выпуск 
чего бы то ни было, кроме полной "
 "реализации спецификаций. (См., например, <a 
href=\"https://jcp.org/aboutJava/";
-"communityprocess/JSPA2.pdf\"> Соглашение об участии в 
спецификации Java</a> и <a 
href=\"http://jcp.org/aboutJava/communityprocess/final/";
-"jsr129/j2me_pb-1_0-fr-spec-license.html\"> Спецификацию 
профиля персонального базиса J2ME&trade; </a>.)"
+"communityprocess/JSPA2.pdf\"> Соглашение об участии в 
спецификации Java</a> "
+"и <a href=\"http://jcp.org/aboutJava/communityprocess/final/jsr129/";
+"j2me_pb-1_0-fr-spec-license.html\"> Спецификацию профиля 
персонального "
+"базиса J2ME&trade; </a>.)"
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -429,29 +364,6 @@
 "распознавать и не попадать в нее."
 
 #. type: Content of: <div><div><p>
-# | To keep your Java code safe from the Java Trap, install a free Java
-# | development environment and use it. More generally, whatever language you
-# | use, keep your eyes open, and check the free status of programs your code
-# | depends on. The easiest way to verify that a program is free is by looking
-# | for it in the [-Free-] {+<a href=\"https://www.fsf.org/directory\";>Free+}
-# | Software [-Directory (<a
-# | href=\"http://www.fsf.org/directory\";>http://www.fsf.org/directory</a>).-]
-# | {+Directory</a>.+}  If a program is not in the directory, you can check
-# | its license(s)  against the [-list-] {+<a
-# | href=\"/licenses/license-list.html\">list+} of free software [-licenses
-# | (<a
-# | 
href=\"/licenses/license-list.html\">http://www.gnu.org/licenses/license-list.html</a>).-]
-# | {+licenses</a>.+}
-#| msgid ""
-#| "To keep your Java code safe from the Java Trap, install a free Java "
-#| "development environment and use it. More generally, whatever language you "
-#| "use, keep your eyes open, and check the free status of programs your code "
-#| "depends on. The easiest way to verify that a program is free is by "
-#| "looking for it in the Free Software Directory (<a href=\"http://www.fsf.";
-#| "org/directory\">http://www.fsf.org/directory</a>).  If a program is not "
-#| "in the directory, you can check its license(s)  against the list of free "
-#| "software licenses (<a href=\"/licenses/license-list.html\">http://www.gnu.";
-#| "org/licenses/license-list.html</a>)."
 msgid ""
 "To keep your Java code safe from the Java Trap, install a free Java "
 "development environment and use it. More generally, whatever language you "
@@ -466,11 +378,11 @@
 "свободную среду разработки Java и 
пользуйтесь ею. Вообще, каким бы языком вы "
 "ни пользовались, смотрите в оба и 
проверяйте, свободны ли пакеты, от которых "
 "зависят ваши программы. Самый простой 
способ проверить, является ли "
-"программа свободной&nbsp;&mdash; поискать ее в "
-"(<a href=\"http://www.fsf.org/directory\";>Каталоге свободных 
программ</a>). "
-"Если программы в каталоге нет, можно 
проверить, перечислены ли ее лицензии в "
-"списке лицензий свободных программ (<a 
href=\"/licenses/license-list.html\"> "
-"списке лицензий свободных программ</a>)."
+"программа свободной&nbsp;&mdash; поискать ее в 
(<a href=\"http://www.fsf.org/";
+"directory\">Каталоге свободных программ</a>). 
Если программы в каталоге нет, "
+"можно проверить, перечислены ли ее 
лицензии в списке лицензий свободных "
+"программ (<a href=\"/licenses/license-list.html\"> списке 
лицензий свободных "
+"программ</a>)."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -538,11 +450,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "

Index: philosophy/po/javascript-trap.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.ru-en.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/po/javascript-trap.ru-en.html    31 May 2021 09:31:00 -0000      
1.47
+++ philosophy/po/javascript-trap.ru-en.html    18 Jul 2021 17:32:10 -0000      
1.48
@@ -1,12 +1,19 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The JavaScript Trap</title>
 <!--#include virtual="/philosophy/po/javascript-trap.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The JavaScript Trap</h2>
 
-<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
 <p><strong>You may be running nonfree programs on your computer every
 day without realizing it&mdash;through your web browser.</strong></p>
@@ -14,11 +21,13 @@
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
 
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Webmasters: there are
 <a href="/software/librejs/free-your-javascript.html">several ways</a>
 to indicate the license of JavaScript programs in a web site.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p>In the free software community, the idea that
 <a href="/philosophy/free-software-even-more-important.html">
@@ -61,7 +70,7 @@
 
 <p>In addition to being nonfree, many of these programs
 are <em>malware</em> because
-they <a href="http://github.com/w3c/fingerprinting-guidance/issues/8";>snoop
+they <a href="https://github.com/w3c/fingerprinting-guidance/issues/8";>snoop
 on the user</a>.  Even nastier, some sites use services which record
 <a 
href="https://freedom-to-tinker.com/2017/11/15/no-boundaries-exfiltration-of-personal-data-by-session-replay-scripts/";>all
 the user's actions while looking at the page</a>.  The services
@@ -233,20 +242,23 @@
 <!-- any links that used to point to the appendices should point to
      free-your-javascript.html instead.  -->
 
-<blockquote>
+<hr class="no-display" />
+<div class="announcement">
 <p>Webmasters: there are
 <a href="/software/librejs/free-your-javascript.html">several ways</a>
 to indicate the license of JavaScript programs in a web site.</p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
 <p><strong>Acknowledgements:</strong> I thank <a 
href="/people/people.html#mattlee">Matt Lee</a>
-and <a href="http://ejohn.org";>John Resig</a> for their help in
+and <a href="https://johnresig.com/";>John Resig</a> for their help in
 defining our proposed criterion, and David Parunakian for
 bringing the problem to my attention.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -264,13 +276,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -291,7 +303,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -301,7 +313,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/05/31 09:31:00 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/javascript-trap.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.ru.po,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- philosophy/po/javascript-trap.ru.po 18 Jul 2021 17:00:36 -0000      1.92
+++ philosophy/po/javascript-trap.ru.po 18 Jul 2021 17:32:10 -0000      1.93
@@ -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: 2021-07-18 09:55+0000\n"
 
 # type: Content of: <h2>
 #. type: Content of: <div><h2>
@@ -26,8 +25,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
@@ -143,27 +140,6 @@
 "программы несвободны."
 
 #. type: Content of: <div><p>
-# | In addition to being nonfree, many of these programs are <em>malware</em>
-# | because they <a
-# | href=\"http{+s+}://github.com/w3c/fingerprinting-guidance/issues/8\">snoop
-# | on the user</a>.  Even nastier, some sites use services which record <a
-# | 
href=\"https://freedom-to-tinker.com/2017/11/15/no-boundaries-exfiltration-of-personal-data-by-session-replay-scripts/\";>all
-# | the user's actions while looking at the page</a>.  The services supposedly
-# | &ldquo;redact&rdquo; the recordings to exclude some sensitive data that
-# | the web site shouldn't get.  But even if that works reliably, the whole
-# | purpose of these services is to give the web site other personal data that
-# | it shouldn't get.
-#| msgid ""
-#| "In addition to being nonfree, many of these programs are <em>malware</em> "
-#| "because they <a href=\"http://github.com/w3c/fingerprinting-guidance/";
-#| "issues/8\">snoop on the user</a>.  Even nastier, some sites use services "
-#| "which record <a href=\"https://freedom-to-tinker.com/2017/11/15/no-";
-#| "boundaries-exfiltration-of-personal-data-by-session-replay-scripts/\">all "
-#| "the user's actions while looking at the page</a>.  The services "
-#| "supposedly &ldquo;redact&rdquo; the recordings to exclude some sensitive "
-#| "data that the web site shouldn't get.  But even if that works reliably, "
-#| "the whole purpose of these services is to give the web site other "
-#| "personal data that it shouldn't get."
 msgid ""
 "In addition to being nonfree, many of these programs are <em>malware</em> "
 "because they <a href=\"https://github.com/w3c/fingerprinting-guidance/";
@@ -560,17 +536,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | <strong>Acknowledgements:</strong> I thank <a
-# | href=\"/people/people.html#mattlee\">Matt Lee</a> and <a
-# | [-href=\"http://ejohn.org\";>John-]
-# | {+href=\"https://johnresig.com/\";>John+} Resig</a> for their help in
-# | defining our proposed criterion, and David Parunakian for bringing the
-# | problem to my attention.
-#| msgid ""
-#| "<strong>Acknowledgements:</strong> I thank <a href=\"/people/people."
-#| "html#mattlee\">Matt Lee</a> and <a href=\"http://ejohn.org\";>John Resig</"
-#| "a> for their help in defining our proposed criterion, and David "
-#| "Parunakian for bringing the problem to my attention."
 msgid ""
 "<strong>Acknowledgements:</strong> I thank <a href=\"/people/people."
 "html#mattlee\">Matt Lee</a> and <a href=\"https://johnresig.com/\";>John "
@@ -614,11 +579,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -633,13 +593,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 2009-2013, [-2016, 2017, 2018, 2019-] {+2016-2019, 2021+}
-# | Richard Stallman
-#| msgid "Copyright &copy; 2009-2013, 2016, 2017, 2018, 2019 Richard Stallman"
 msgid "Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman<br />"
-"Copyright &copy; 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018, 2019, 2021 
Free "
+"Copyright &copy; 2009-2013, 2016-2019, 2021 Richard Stallman<br />Copyright "
+"&copy; 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018, 2019, 2021 Free "
 "Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>

Index: philosophy/po/lest-codeplex-perplex.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/lest-codeplex-perplex.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/lest-codeplex-perplex.ru-en.html      30 Nov 2017 07:29:24 
-0000      1.1
+++ philosophy/po/lest-codeplex-perplex.ru-en.html      18 Jul 2021 17:32:10 
-0000      1.2
@@ -1,14 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Lest CodePlex perplex
 - GNU Project - Free Software Foundation</title>
 <link rel="canonical" 
href="http://www.fsf.org/blogs/rms/microsoft-codeplex-foundation"; />
 <!--#include virtual="/philosophy/po/lest-codeplex-perplex.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Lest CodePlex perplex</h2>
 
-<p>by <strong>Richard Stallman</strong></p>
+<address class="byline">by Richard Stallman</address>
+
+<div class="article">
 <p>Many in our community are suspicious of the CodePlex Foundation.  With
 its board of directors dominated by Microsoft employees and
 ex-employees, plus apologist Miguel de Icaza, there is plenty of
@@ -27,7 +35,7 @@
 source cites only practical convenience values such as powerful,
 reliable software.
 See <a href="/philosophy/open-source-misses-the-point.html">
-http://www.gnu.org/philosophy/open-source-misses-the-point.html</a>
+Why Open Source Misses the Point of Free Software</a>
 for more explanation.</p>
 
 <p>Evidently Microsoft would rather confront the practical competition
@@ -63,7 +71,7 @@
 a widespread public confusion between &ldquo;commercial
 software&rdquo; and &ldquo;proprietary software&rdquo;.  (See
 <a href="/philosophy/words-to-avoid.html">
-http://www.gnu.org/philosophy/words-to-avoid.html</a>.)</p>
+Words to Avoid or Use with Care</a>.)</p>
 
 <p>This confusion is a serious problem because it falsely claims free
 software business to be impossible.  Many software companies already
@@ -83,16 +91,14 @@
 what Microsoft has said it seeks to achieve.</p>
 
 <p>Sam Ramji, now president of CodePlex, said a few months ago that
-Microsoft (then his employer) wanted to promote development of free
-applications that encourage use of Microsoft Windows
-(<a href="http://www.internetnews.com/dev-news/article.php/3811941";>
-http://www.internetnews.com/dev-news/article.php/3811941</a>).
+Microsoft (then his employer) wanted to promote development of <a
+href="https://www.internetnews.com/dev-news/article.php/3811941";>
+free applications that encourage use of Microsoft Windows</a>.
 Perhaps the aim of CodePlex is to suborn free software application
 developers into making Windows their main platform.  Many of the
 projects hosted now on codeplex.com are add-ons for proprietary
-software.  These programs are caught in a trap similar to the former
-Java Trap (see <a href="/philosophy/java-trap.html">
-http://www.gnu.org/philosophy/java-trap.html</a>).</p>
+software.  These programs are caught in a trap similar to <a
+href="/philosophy/java-trap.html">the former Java Trap</a>.</p>
 
 <p>That would be harmful if it succeeds, because a program that
 doesn't run (or doesn't run well) in the Free World does not
@@ -125,10 +131,12 @@
 longstanding promotion of Digital Restrictions Management, Microsoft
 continues to act to harm us.  We would be fools indeed to let anything
 distract us from that.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -146,19 +154,19 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
 <!-- 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
@@ -173,20 +181,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009 Richard Stallman</p>
+<p>Copyright &copy; 2009, 2021 Richard 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: 2017/11/30 07:29:24 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/lest-codeplex-perplex.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/lest-codeplex-perplex.ru.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/lest-codeplex-perplex.ru.po   18 Jul 2021 17:00:38 -0000      
1.5
+++ philosophy/po/lest-codeplex-perplex.ru.po   18 Jul 2021 17:32:10 -0000      
1.6
@@ -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: 2021-07-18 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Lest CodePlex perplex - GNU Project - Free Software Foundation"
@@ -29,8 +28,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "Ричард Столмен"
 
@@ -58,25 +55,6 @@
 "Microsoft."
 
 #. type: Content of: <div><div><p>
-# | The first thing we see is that the organization ducks the issue of users'
-# | freedom; it uses the term &ldquo;open source&rdquo; and does not speak of
-# | &ldquo;free software&rdquo;.  These two terms stand for different
-# | philosophies which are based on different values: free software's values
-# | are freedom and social solidarity, whereas open source cites only
-# | practical convenience values such as powerful, reliable software.  See <a
-# | href=\"/philosophy/open-source-misses-the-point.html\">
-# | [-http://www.gnu.org/philosophy/open-source-misses-the-point.html</a>-]
-# | {+Why Open Source Misses the Point of Free Software</a>+} for more
-# | explanation.
-#| msgid ""
-#| "The first thing we see is that the organization ducks the issue of users' "
-#| "freedom; it uses the term &ldquo;open source&rdquo; and does not speak of "
-#| "&ldquo;free software&rdquo;.  These two terms stand for different "
-#| "philosophies which are based on different values: free software's values "
-#| "are freedom and social solidarity, whereas open source cites only "
-#| "practical convenience values such as powerful, reliable software.  See <a "
-#| "href=\"/philosophy/open-source-misses-the-point.html\"> http://www.gnu.";
-#| "org/philosophy/open-source-misses-the-point.html</a> for more explanation."
 msgid ""
 "The first thing we see is that the organization ducks the issue of users' "
 "freedom; it uses the term &ldquo;open source&rdquo; and does not speak of "
@@ -95,8 +73,8 @@
 "солидарность, а открытый исходный текст 
указывает только на такие ценности "
 "практического удобства, как эффективные, 
надежные программы. Более подробно "
 "см. на <a 
href=\"/philosophy/open-source-misses-the-point.html\">Почему "
-"&ldquo;открытый исходный текст&rdquo; не 
передает понятия &ldquo;"
-"свободная программа&rdquo;</a>."
+"&ldquo;открытый исходный текст&rdquo; не 
передает понятия &ldquo;свободная "
+"программа&rdquo;</a>."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -154,22 +132,6 @@
 "бы похоже."
 
 #. type: Content of: <div><div><p>
-# | The term &ldquo;commercial software companies&rdquo; embodies a peculiar
-# | confusion.  Every business is by definition commercial, so all software
-# | developed by a business&mdash;whether free or proprietary&mdash;is
-# | automatically commercial software.  But there is a widespread public
-# | confusion between &ldquo;commercial software&rdquo; and &ldquo;proprietary
-# | software&rdquo;.  (See <a href=\"/philosophy/words-to-avoid.html\">
-# | [-http://www.gnu.org/philosophy/words-to-avoid.html</a>.)-] {+Words to
-# | Avoid or Use with Care</a>.)+}
-#| msgid ""
-#| "The term &ldquo;commercial software companies&rdquo; embodies a peculiar "
-#| "confusion.  Every business is by definition commercial, so all software "
-#| "developed by a business&mdash;whether free or proprietary&mdash;is "
-#| "automatically commercial software.  But there is a widespread public "
-#| "confusion between &ldquo;commercial software&rdquo; and &ldquo;"
-#| "proprietary software&rdquo;.  (See <a href=\"/philosophy/words-to-avoid."
-#| "html\"> http://www.gnu.org/philosophy/words-to-avoid.html</a>.)"
 msgid ""
 "The term &ldquo;commercial software companies&rdquo; embodies a peculiar "
 "confusion.  Every business is by definition commercial, so all software "
@@ -186,8 +148,8 @@
 "автоматически представляют собой 
коммерческие программы. Но в массах бытует "
 "широко распространенное заблуждение: 
&ldquo;коммерческие программы&rdquo; "
 "часто путают с &ldquo;несвободными 
программами&rdquo; (см. <a href=\"/"
-"philosophy/words-to-avoid.html\">Слова, которых нужно 
избегать или употреблять "
-"аккуратно</a>.)"
+"philosophy/words-to-avoid.html\">Слова, которых нужно 
избегать или "
+"употреблять аккуратно</a>.)"
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -230,30 +192,6 @@
 "тому, к чему, по ее собственным заявлениям, 
стремится Microsoft."
 
 #. type: Content of: <div><div><p>
-# | Sam Ramji, now president of CodePlex, said a few months ago that Microsoft
-# | (then his employer) wanted to promote development of {+<a
-# | href=\"https://www.internetnews.com/dev-news/article.php/3811941\";>+} free
-# | applications that encourage use of Microsoft [-Windows (<a
-# | href=\"http://www.internetnews.com/dev-news/article.php/3811941\";>
-# | http://www.internetnews.com/dev-news/article.php/3811941</a>).-]
-# | {+Windows</a>.+}  Perhaps the aim of CodePlex is to suborn free software
-# | application developers into making Windows their main platform.  Many of
-# | the projects hosted now on codeplex.com are add-ons for proprietary
-# | software.  These programs are caught in a trap similar to [-the-] {+<a
-# | href=\"/philosophy/java-trap.html\">the+} former Java [-Trap (see <a
-# | href=\"/philosophy/java-trap.html\">
-# | http://www.gnu.org/philosophy/java-trap.html</a>).-] {+Trap</a>.+}
-#| msgid ""
-#| "Sam Ramji, now president of CodePlex, said a few months ago that "
-#| "Microsoft (then his employer) wanted to promote development of free "
-#| "applications that encourage use of Microsoft Windows (<a href=\"http://";
-#| "www.internetnews.com/dev-news/article.php/3811941\"> http://www.";
-#| "internetnews.com/dev-news/article.php/3811941</a>).  Perhaps the aim of "
-#| "CodePlex is to suborn free software application developers into making "
-#| "Windows their main platform.  Many of the projects hosted now on codeplex."
-#| "com are add-ons for proprietary software.  These programs are caught in a "
-#| "trap similar to the former Java Trap (see <a href=\"/philosophy/java-trap."
-#| "html\"> http://www.gnu.org/philosophy/java-trap.html</a>)."
 msgid ""
 "Sam Ramji, now president of CodePlex, said a few months ago that Microsoft "
 "(then his employer) wanted to promote development of <a href=\"https://www.";
@@ -265,15 +203,14 @@
 "href=\"/philosophy/java-trap.html\">the former Java Trap</a>."
 msgstr ""
 "Сэм Рамджи, нынешний председатель CodePlex, 
несколько месяцев назад говорил, "
-"что Microsoft (где он в то время работал) хочет 
содействовать развитию "
-"(<a href=\"http://www.internetnews.com/dev-news/article.php/3811941\";> "
-"свободных приложений, которые станут 
поощрять применение "
-"Microsoft Windows</a>). Возможно, "
-"цель CodePlex&nbsp;&mdash; подстрекать 
разработчиков свободных прикладных "
-"программ делать Windows своей главной 
платформой. Многие из проектов, "
-"размещенных на codeplex.com, суть не что иное, 
как дополнения к несвободным "
-"программам. Эти программы попались в 
западню, сходную с былой "
-"<a href=\"/philosophy/java-trap.html\">западней Java</a>."
+"что Microsoft (где он в то время работал) хочет 
содействовать развитию (<a "
+"href=\"http://www.internetnews.com/dev-news/article.php/3811941\";> 
свободных "
+"приложений, которые станут поощрять 
применение Microsoft Windows</a>). "
+"Возможно, цель CodePlex&nbsp;&mdash; подстрекать 
разработчиков свободных "
+"прикладных программ делать Windows своей 
главной платформой. Многие из "
+"проектов, размещенных на codeplex.com, суть не 
что иное, как дополнения к "
+"несвободным программам. Эти программы 
попались в западню, сходную с былой <a "
+"href=\"/philosophy/java-trap.html\">западней Java</a>."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -378,11 +315,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -403,11 +335,6 @@
 "2021 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-"

Index: philosophy/po/microsoft-antitrust.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-antitrust.ru-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/microsoft-antitrust.ru-en.html        12 Apr 2014 13:59:09 
-0000      1.19
+++ philosophy/po/microsoft-antitrust.ru-en.html        18 Jul 2021 17:32:10 
-0000      1.20
@@ -1,11 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The Microsoft Antitrust Trial and Free Software
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft-antitrust.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The Microsoft Antitrust Trial and Free Software</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
 With the Microsoft antitrust trial moving toward a conclusion, the
 question of what to demand of Microsoft if it loses is coming to the
@@ -59,7 +68,7 @@
    Similar terms were included in an agreement between IBM and the
    European Community in 1984, settling another antitrust dispute.
    See <a href="http://www.cptech.org/at/ibm/ibm1984ec.html";>
-       http://www.cptech.org/at/ibm/ibm1984ec.html</a>.</p>
+       www.cptech.org</a>.</p>
 </li>
 <li>Require Microsoft to use its patents for defense only, in the field
    of software.  (If they happen to own patents that apply to other
@@ -110,10 +119,12 @@
 proposed above are what we really need.  They will clear the way for
 us to develop a truly superior alternative to Microsoft Windows,
 in whatever area Microsoft does not make Windows free software.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -131,19 +142,19 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
 <!-- 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
@@ -158,20 +169,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2007, 2008 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2021 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:09 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/microsoft-antitrust.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-antitrust.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/microsoft-antitrust.ru.po     18 Jul 2021 17:00:38 -0000      
1.15
+++ philosophy/po/microsoft-antitrust.ru.po     18 Jul 2021 17:32:10 -0000      
1.16
@@ -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: 2021-07-18 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -144,16 +143,6 @@
 
 # type: Content of: <ol><li><p>
 #. type: Content of: <div><div><ol><li><p>
-# | Similar terms were included in an agreement between IBM and the European
-# | Community in 1984, settling another antitrust dispute.  See <a
-# | href=\"http://www.cptech.org/at/ibm/ibm1984ec.html\";>
-# | [-http://www.cptech.org/at/ibm/ibm1984ec.html</a>.-]
-# | {+www.cptech.org</a>.+}
-#| msgid ""
-#| "Similar terms were included in an agreement between IBM and the European "
-#| "Community in 1984, settling another antitrust dispute.  See <a href="
-#| "\"http://www.cptech.org/at/ibm/ibm1984ec.html\";> http://www.cptech.org/at/";
-#| "ibm/ibm1984ec.html</a>."
 msgid ""
 "Similar terms were included in an agreement between IBM and the European "
 "Community in 1984, settling another antitrust dispute.  See <a href=\"http://";
@@ -307,11 +296,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -326,19 +310,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 1999, [-2007, 2008-] {+2021+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright &copy; 1999, 2007, 2008 Free Software Foundation, Inc."
 msgid "Copyright &copy; 1999, 2021 Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 1999, 2010, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 1999, 2010, 2021 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/microsoft-new-monopoly.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-new-monopoly.ru-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/microsoft-new-monopoly.ru-en.html     18 Jul 2020 04:01:03 
-0000      1.18
+++ philosophy/po/microsoft-new-monopoly.ru-en.html     18 Jul 2021 17:32:10 
-0000      1.19
@@ -1,14 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Microsoft's New Monopoly
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft-new-monopoly.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Microsoft's New Monopoly</h2>
 
-<p>by <a href="http://www.stallman.org/";><strong>Richard 
Stallman</strong></a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
-<blockquote>
+<div class="comment">
 <p>This article was written in July 2005.  Microsoft adopted a
 different policy in 2006, so the specific policies described below and
 the specific criticisms of them are only of historical significance.
@@ -17,8 +25,10 @@
 Microsoft's cunningly worded new policy does not give anyone clear
 permission to implement OOXML.</a>
 </p>
-</blockquote>
+</div>
+<hr class="no-display" />
 
+<div class="article">
 <p>European legislators who endorse software patents frequently claim
 that those wouldn't affect free software (or &ldquo;open
 source&rdquo;).  Microsoft's lawyers are determined to prove they are
@@ -87,9 +97,8 @@
 include it. The software developer could cancel its misleading effect
 with a disclaimer like this: &ldquo;The following misleading statement
 has been imposed on us by Microsoft; please be advised that it is
-propaganda. See <a href="/philosophy/not-ipr.html">
-http://www.gnu.org/philosophy/not-ipr.html</a> for more
-explanation.&rdquo;</p>
+propaganda. See <a href="/philosophy/not-ipr.html">our article on
+&ldquo;intellectual property&rdquo;</a> for more explanation.</p>
 
 <p>However, the requirement to include a fixed piece of text is
 actually quite cunning, because anyone who does so has explicitly
@@ -131,13 +140,15 @@
 [2009 note]: the EU directive to allow software patents was
 rejected, but the European Patent Office has continued issuing them
 and some countries treat them as valid.
-See <a href="http://ffii.org";> ffii.org</a> for more information and
+See <a href="https://ffii.org";> ffii.org</a> for more information and
 to participate in the campaign against software patents in Europe.
 </p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -155,13 +166,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -182,7 +193,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2005, 2009, 2015, 2016, 2020 Richard Stallman</p>
+<p>Copyright &copy; 2005, 2007, 2009, 2010, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -192,10 +203,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/18 04:01:03 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/microsoft-new-monopoly.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-new-monopoly.ru.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/microsoft-new-monopoly.ru.po  18 Jul 2021 17:00:38 -0000      
1.19
+++ philosophy/po/microsoft-new-monopoly.ru.po  18 Jul 2021 17:32:10 -0000      
1.20
@@ -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: 2021-07-18 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Microsoft's New Monopoly - GNU Project - Free Software Foundation"
@@ -30,8 +29,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
@@ -190,33 +187,6 @@
 "исходного текста.)"
 
 #. type: Content of: <div><div><p>
-# | The Microsoft license also requires inclusion of a specific statement.
-# | That requirement would not in itself prevent the program from being free:
-# | it is normal for free software to carry license notices that cannot be
-# | changed, and this statement could be included in one of them. The
-# | statement is biased and confusing, since it uses the term
-# | &ldquo;intellectual property&rdquo;; fortunately, one is not required to
-# | endorse the statement as true or even meaningful, only to include it. The
-# | software developer could cancel its misleading effect with a disclaimer
-# | like this: &ldquo;The following misleading statement has been imposed on
-# | us by Microsoft; please be advised that it is propaganda. See <a
-# | [-href=\"/philosophy/not-ipr.html\">
-# | http://www.gnu.org/philosophy/not-ipr.html</a>-]
-# | {+href=\"/philosophy/not-ipr.html\">our article on &ldquo;intellectual
-# | property&rdquo;</a>+} for more [-explanation.&rdquo;-] {+explanation.+}
-#| msgid ""
-#| "The Microsoft license also requires inclusion of a specific statement. "
-#| "That requirement would not in itself prevent the program from being free: "
-#| "it is normal for free software to carry license notices that cannot be "
-#| "changed, and this statement could be included in one of them. The "
-#| "statement is biased and confusing, since it uses the term &ldquo;"
-#| "intellectual property&rdquo;; fortunately, one is not required to endorse "
-#| "the statement as true or even meaningful, only to include it. The "
-#| "software developer could cancel its misleading effect with a disclaimer "
-#| "like this: &ldquo;The following misleading statement has been imposed on "
-#| "us by Microsoft; please be advised that it is propaganda. See <a href=\"/"
-#| "philosophy/not-ipr.html\"> http://www.gnu.org/philosophy/not-ipr.html</a> "
-#| "for more explanation.&rdquo;"
 msgid ""
 "The Microsoft license also requires inclusion of a specific statement. That "
 "requirement would not in itself prevent the program from being free: it is "
@@ -327,17 +297,6 @@
 "недействительными, а&nbsp;европейцы 
оставались в&nbsp;безопасности."
 
 #. type: Content of: <div><div><p>
-# | [2009 note]: the EU directive to allow software patents was rejected, but
-# | the European Patent Office has continued issuing them and some countries
-# | treat them as valid.  See <a href=\"http{+s+}://ffii.org\"> ffii.org</a>
-# | for more information and to participate in the campaign against software
-# | patents in Europe.
-#| msgid ""
-#| "[2009 note]: the EU directive to allow software patents was rejected, but "
-#| "the European Patent Office has continued issuing them and some countries "
-#| "treat them as valid.  See <a href=\"http://ffii.org\";> ffii.org</a> for "
-#| "more information and to participate in the campaign against software "
-#| "patents in Europe."
 msgid ""
 "[2009 note]: the EU directive to allow software patents was rejected, but "
 "the European Patent Office has continued issuing them and some countries "
@@ -384,11 +343,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -403,14 +357,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 2005, {+2007,+} 2009, [-2015, 2016, 2020-] {+2010, 2021+}
-# | Richard Stallman
-#| msgid "Copyright &copy; 2005, 2009, 2015, 2016, 2020 Richard Stallman"
 msgid "Copyright &copy; 2005, 2007, 2009, 2010, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2005, 2007, 2009, 2010, 2021 Richard Stallman<br /"
-">Copyright &copy; 2015, 2021 Free Software Foundation, Inc. "
-"(translation)"
+">Copyright &copy; 2015, 2021 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/microsoft-old.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-old.ru-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/microsoft-old.ru-en.html      12 Apr 2014 13:59:13 -0000      
1.24
+++ philosophy/po/microsoft-old.ru-en.html      18 Jul 2021 17:32:10 -0000      
1.25
@@ -1,16 +1,25 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Is Microsoft the Great Satan? (Old Version)
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft-old.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Is Microsoft the Great Satan? (Old Version)</h2>
 
 <div class="announcement">
-<blockquote><p>There is an <a href="/philosophy/microsoft.html">
-updated version</a> of this article.</p></blockquote>
+<p>There is an <a href="/philosophy/microsoft.html">
+updated version</a> of this article.</p>
 </div>
+<hr class="thin" />
 
+<div class="article">
 <p>Many people think of Microsoft as the monster menace of the software
 industry. There is even a campaign to boycott Microsoft. This feeling
 has intensified since Microsoft expressed active hostility towards
@@ -56,9 +65,12 @@
 the potential for great success.</p>
 
 <p>Thank you, Microsoft, and please get out of the way.</p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -76,18 +88,18 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
 <!-- 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
@@ -102,21 +114,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1997-2000, 2021 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:13 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/microsoft-old.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-old.ru.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/microsoft-old.ru.po   18 Jul 2021 17:00:38 -0000      1.22
+++ philosophy/po/microsoft-old.ru.po   18 Jul 2021 17:32:10 -0000      1.23
@@ -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: 2021-07-18 09: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"
 
@@ -184,11 +183,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -203,18 +197,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014, 2015-] {+1997-2000, 2021+} Free Software
-# | Foundation, Inc.
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgid "Copyright &copy; 1997-2000, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 1997-2000, 2010, 2021 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/microsoft-verdict.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-verdict.ru-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/microsoft-verdict.ru-en.html  12 Apr 2014 13:59:14 -0000      
1.20
+++ philosophy/po/microsoft-verdict.ru-en.html  18 Jul 2021 17:32:10 -0000      
1.21
@@ -1,13 +1,19 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>On the Microsoft Verdict - GNU Project - Free Software 
Foundation</title>
-
 <!--#include virtual="/philosophy/po/microsoft-verdict.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>On the Microsoft Verdict</h2>
+<div class="thin"></div>
 
+<div class="article">
 <p>
 Many 
 <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>
@@ -55,11 +61,13 @@
 When we see what remedies the judge chooses, we will get an idea of
 whether the case has been helpful or harmful to the Free Software
 Movement.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -77,30 +85,30 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2000, 2007, 2008 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2000, 2021 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:14 $
+$Date: 2021/07/18 17:32:10 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/microsoft-verdict.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-verdict.ru.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/microsoft-verdict.ru.po       18 Jul 2021 17:00:38 -0000      
1.21
+++ philosophy/po/microsoft-verdict.ru.po       18 Jul 2021 17:32:10 -0000      
1.22
@@ -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: 2021-07-18 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"
 
@@ -167,11 +166,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -186,18 +180,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014, 2015-] {+2000, 2021+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2000, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2000, 2010, 2021 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/microsoft.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.ru-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/po/microsoft.ru-en.html  15 Dec 2018 14:46:39 -0000      1.29
+++ philosophy/po/microsoft.ru-en.html  18 Jul 2021 17:32:11 -0000      1.30
@@ -1,17 +1,24 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="licensing" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Is Microsoft the Great Satan?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Is Microsoft the Great Satan?</h2>
 
-<div class="announcement">
-<blockquote><p>This article was given a major rewrite in 2009.
+<p><em>This article was given a major rewrite in 2009.
 The <a href="/philosophy/microsoft-old.html">old version</a> is also
-available.</p></blockquote>
-</div>
+available.</em></p>
+<hr class="thin" />
 
+<div class="article">
 <p>Many people think of Microsoft as the monster menace of the
 software industry.  There is even a specific campaign to boycott
 Microsoft.  This feeling has intensified since Microsoft expressed
@@ -43,7 +50,7 @@
 <p>There is no need to reject Microsoft non-software products, or
 services that you can use without proprietary software.  (When you use
 a web service, whether Microsoft's or not, watch out for
-<a href="/philosophy/javascript-trap.html">non-free JavaScript
+<a href="/philosophy/javascript-trap.html">nonfree JavaScript
 programs</a> that it may try to slip into your browser.)  When
 Microsoft releases free programs, which it occasionally does, they are
 acceptable in theory.  Alas, most of them depend fundamentally on
@@ -62,7 +69,7 @@
 in the future.  For the most part, the companies' main motivation in
 doing these things is to attack each other; now, it seems, we are
 specifically targeted.  Microsoft is using its patents directly to
-<a 
href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>
+<a 
href="https://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";>
 attack the free software community</a>, and our community is fighting
 back.</p>
 
@@ -80,26 +87,29 @@
 &ldquo;donates&rdquo; copies of Windows to schools, it converts these
 schools into tools for implanting a dependence on Windows.  There are
 indications that Microsoft systematically plans these
-activities <a href="http://boycottnovell.com/wiki/index.php/EDGI";> as
+activities <a href="http://techrights.org/wiki/index.php/EDGI";> as
 a campaign against the adoption of GNU/Linux</a>.</p>
 
 <p>Each Windows &ldquo;upgrade&rdquo; augments Microsoft's power over
 the users; Microsoft plans it that way.  And each one is a step
 forward in malicious features, which
-include <a href="http://DefectiveByDesign.org";>Digital Restrictions
+include <a href="https://www.defectivebydesign.org/";>Digital Restrictions
 Management</a> and back doors.  So the FSF runs campaigns to warn
 users against &ldquo;upgrading&rdquo;
-to <a href="http://BadVista.org/";>Windows Vista</a>
-and <a href="http://Windows7Sins.org";>Windows 7</a>.  We aim to reduce
+to <a href="http://badvista.fsf.org/";>Windows Vista</a>
+and <a href="http://windows7sins.org/";>Windows 7</a>.  We aim to reduce
 the amount of inertia they will create.</p>
 
 <p>We don't hate Microsoft, and we don't consider it the Great Satan.
 But we do recognize it as the company that has separated more users
 from their freedom than any other, and a powerful avowed enemy of
 computer users' freedom.  We act accordingly.</p>
+</div>
+</div>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -117,13 +127,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations README</a> for
-information on coordinating and submitting translations of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -143,8 +153,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2017, 2018 
Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 1997-2000, 2009, 2010, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -154,7 +163,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:39 $
+$Date: 2021/07/18 17:32:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/microsoft.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.ru.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/po/microsoft.ru.po       18 Jul 2021 17:00:38 -0000      1.27
+++ philosophy/po/microsoft.ru.po       18 Jul 2021 17:32:11 -0000      1.28
@@ -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: 2021-07-18 09: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,12 +31,6 @@
 
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><p>
-# | [-This-]{+<em>This+} article was given a major rewrite in 2009.  The <a
-# | href=\"/philosophy/microsoft-old.html\">old version</a> is also
-# | [-available.-] {+available.</em>+}
-#| msgid ""
-#| "This article was given a major rewrite in 2009.  The <a href=\"/"
-#| "philosophy/microsoft-old.html\">old version</a> is also available."
 msgid ""
 "<em>This article was given a major rewrite in 2009.  The <a href=\"/"
 "philosophy/microsoft-old.html\">old version</a> is also available.</em>"
@@ -114,25 +107,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | There is no need to reject Microsoft non-software products, or services
-# | that you can use without proprietary software.  (When you use a web
-# | service, whether Microsoft's or not, watch out for <a
-# | href=\"/philosophy/javascript-trap.html\">non[---]free JavaScript
-# | programs</a> that it may try to slip into your browser.)  When Microsoft
-# | releases free programs, which it occasionally does, they are acceptable in
-# | theory.  Alas, most of them depend fundamentally on Microsoft proprietary
-# | software, which we do need to reject, and that makes them useless for
-# | anyone that chooses to live in freedom.
-#| msgid ""
-#| "There is no need to reject Microsoft non-software products, or services "
-#| "that you can use without proprietary software.  (When you use a web "
-#| "service, whether Microsoft's or not, watch out for <a href=\"/philosophy/"
-#| "javascript-trap.html\">non-free JavaScript programs</a> that it may try "
-#| "to slip into your browser.)  When Microsoft releases free programs, which "
-#| "it occasionally does, they are acceptable in theory.  Alas, most of them "
-#| "depend fundamentally on Microsoft proprietary software, which we do need "
-#| "to reject, and that makes them useless for anyone that chooses to live in "
-#| "freedom."
 msgid ""
 "There is no need to reject Microsoft non-software products, or services that "
 "you can use without proprietary software.  (When you use a web service, "
@@ -170,23 +144,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | These obstructionist policies were not new: Microsoft, and many other
-# | software companies, had been doing them for years.  Secrecy and patents
-# | have obstructed us greatly, and they may be more damaging in the future. 
-# | For the most part, the companies' main motivation in doing these things is
-# | to attack each other; now, it seems, we are specifically targeted. 
-# | Microsoft is using its patents directly to <a
-# | 
href=\"http{+s+}://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls\">
-# | attack the free software community</a>, and our community is fighting back.
-#| msgid ""
-#| "These obstructionist policies were not new: Microsoft, and many other "
-#| "software companies, had been doing them for years.  Secrecy and patents "
-#| "have obstructed us greatly, and they may be more damaging in the future.  "
-#| "For the most part, the companies' main motivation in doing these things "
-#| "is to attack each other; now, it seems, we are specifically targeted.  "
-#| "Microsoft is using its patents directly to <a href=\"http://www.redhat.";
-#| "com/about/news/archive/2009/9/microsoft-and-patent-trolls\"> attack the "
-#| "free software community</a>, and our community is fighting back."
 msgid ""
 "These obstructionist policies were not new: Microsoft, and many other "
 "software companies, had been doing them for years.  Secrecy and patents have "
@@ -203,9 +160,9 @@
 "По большей части главным мотивом при 
совершении компаниями этих действий "
 "является нападение друг на друга; теперь, 
кажется, это направлено именно "
 "против нас. Microsoft пользуется своими 
патентами для прямого <a href="
-"\"https://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls";
-"\">нападения на сообщество свободного 
программного обеспечения</a>, и наше "
-"сообщество обороняется."
+"\"https://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-";
+"trolls\">нападения на сообщество свободного 
программного обеспечения</a>, и "
+"наше сообщество обороняется."
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
@@ -224,24 +181,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Other Microsoft practices specifically harmful to the adoption of free
-# | software are the ones designed to build up social inertia that obstructs
-# | migration to GNU/Linux.  For instance, when Microsoft
-# | &ldquo;donates&rdquo; copies of Windows to schools, it converts these
-# | schools into tools for implanting a dependence on Windows.  There are
-# | indications that Microsoft systematically plans these activities <a
-# | [-href=\"http://boycottnovell.com/wiki/index.php/EDGI\";>-]
-# | {+href=\"http://techrights.org/wiki/index.php/EDGI\";>+} as a campaign
-# | against the adoption of GNU/Linux</a>.
-#| msgid ""
-#| "Other Microsoft practices specifically harmful to the adoption of free "
-#| "software are the ones designed to build up social inertia that obstructs "
-#| "migration to GNU/Linux.  For instance, when Microsoft &ldquo;"
-#| "donates&rdquo; copies of Windows to schools, it converts these schools "
-#| "into tools for implanting a dependence on Windows.  There are indications "
-#| "that Microsoft systematically plans these activities <a href=\"http://";
-#| "boycottnovell.com/wiki/index.php/EDGI\"> as a campaign against the "
-#| "adoption of GNU/Linux</a>."
 msgid ""
 "Other Microsoft practices specifically harmful to the adoption of free "
 "software are the ones designed to build up social inertia that obstructs "
@@ -256,33 +195,12 @@
 "переходу на GNU/Linux. Например, когда Microsoft 
&ldquo;приносит в "
 "дар&rdquo; школам копии Windows, она превращает 
эти школы в инструмент для "
 "вживления зависимости от Windows. По 
некоторым признакам, Microsoft "
-"систематически планирует такого рода 
деятельность <a "
-"href=\"http://techrights.org/wiki/index.php/EDGI\";>как кампанию 
против "
-"освоения GNU/Linux</a>."
+"систематически планирует такого рода 
деятельность <a href=\"http://";
+"techrights.org/wiki/index.php/EDGI\">как кампанию против 
освоения GNU/Linux</"
+"a>."
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Each Windows &ldquo;upgrade&rdquo; augments Microsoft's power over the
-# | users; Microsoft plans it that way.  And each one is a step forward in
-# | malicious features, which include <a
-# | [-href=\"http://DefectiveByDesign.org\";>Digital-]
-# | {+href=\"https://www.defectivebydesign.org/\";>Digital+} Restrictions
-# | Management</a> and back doors.  So the FSF runs campaigns to warn users
-# | against &ldquo;upgrading&rdquo; to <a
-# | [-href=\"http://BadVista.org/\";>Windows-]
-# | {+href=\"http://badvista.fsf.org/\";>Windows+} Vista</a> and <a
-# | [-href=\"http://Windows7Sins.org\";>Windows-]
-# | {+href=\"http://windows7sins.org/\";>Windows+} 7</a>.  We aim to reduce the
-# | amount of inertia they will create.
-#| msgid ""
-#| "Each Windows &ldquo;upgrade&rdquo; augments Microsoft's power over the "
-#| "users; Microsoft plans it that way.  And each one is a step forward in "
-#| "malicious features, which include <a href=\"http://DefectiveByDesign.org";
-#| "\">Digital Restrictions Management</a> and back doors.  So the FSF runs "
-#| "campaigns to warn users against &ldquo;upgrading&rdquo; to <a href="
-#| "\"http://BadVista.org/\";>Windows Vista</a> and <a href=\"http://";
-#| "Windows7Sins.org\">Windows 7</a>.  We aim to reduce the amount of inertia "
-#| "they will create."
 msgid ""
 "Each Windows &ldquo;upgrade&rdquo; augments Microsoft's power over the "
 "users; Microsoft plans it that way.  And each one is a step forward in "
@@ -297,8 +215,8 @@
 "вредоносным особенностям, в том числе <a 
href=\"https://DefectiveByDesign.org";
 "\">цифровым оковам</a> и лазейкам. Поэтому 
ФСПО проводит кампании для "
 "предупреждения пользователей об 
опасностях, связанных с &ldquo;"
-"обновлением&rdquo; до <a 
href=\"http://badvista.fsf.org/\";>Windows Vista</a> и "
-"<a href=\"http://windows7sins.org\";>Windows 7</a>. Мы стремимся 
снизить "
+"обновлением&rdquo; до <a 
href=\"http://badvista.fsf.org/\";>Windows Vista</a> "
+"и <a href=\"http://windows7sins.org\";>Windows 7</a>. Мы стремимся 
снизить "
 "величину инерции, которую они создадут."
 
 # type: Content of: <p>
@@ -346,11 +264,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -365,13 +278,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014, 2015, 2016, 2017-] {+1997-2000, 2009, 2010,
-# | 2021+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1997-2000, 2009, 2010, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 1997-2000, 2009, 2010, 2021 Free Software Foundation, 
Inc."
+msgstr ""
+"Copyright &copy; 1997-2000, 2009, 2010, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.2215
retrieving revision 1.2216
diff -u -b -r1.2215 -r1.2216
--- software/recent-releases-include.ru.html    17 Jul 2021 21:01:29 -0000      
1.2215
+++ software/recent-releases-include.ru.html    18 Jul 2021 17:32:11 -0000      
1.2216
@@ -1,13 +1,13 @@
 
 <!--#set var="LINK_CLOSE" value="</a>, <i>" -->
 <ul>
-<li><strong>July 17, 2021</strong>
+<li><strong>17 июля 2021</strong>
 <ul>
 <li><!--#set var="LINK" 
 value='<a href="//lists.gnu.org/archive/html/info-gnu/2021-07/msg00006.html">' 
-->
 <!--#echo 
 encoding="none" var="LINK" -->
-GNU mtools 4.0.33 released<!--#echo 
+Выпущен GNU mtools 4.0.33<!--#echo 
 encoding="none" var="LINK_CLOSE" -->
 Ален Кнафф<!--#set 
 var="TIME" value="</i>, 16:44" -->

Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.3135
retrieving revision 1.3136
diff -u -b -r1.3135 -r1.3136
--- software/po/recent-releases-include.ru.po   18 Jul 2021 17:00:39 -0000      
1.3135
+++ software/po/recent-releases-include.ru.po   18 Jul 2021 17:32:11 -0000      
1.3136
@@ -14,11 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-17 20:56+0000\n"
 
 #. type: Content of: <ul><li>
-# | <strong>July 1[-3-]{+7+}, 2021</strong>
-#| msgid "<strong>July 13, 2021</strong>"
 msgid "<strong>July 17, 2021</strong>"
 msgstr "<strong>17 июля 2021</strong>"
 
@@ -27,8 +24,6 @@
 #. #echo 
 #. encoding="none" var="LINK" 
 #. type: Content of: <ul><li><ul><li>
-# | GNU mtools 4.0.3[-2-]{+3+} released
-#| msgid "GNU mtools 4.0.32 released"
 msgid "GNU mtools 4.0.33 released"
 msgstr "Выпущен GNU mtools 4.0.33"