www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www planetfeeds.ru.html fun/humor.ru.html fun/j...


From: GNUN
Subject: www planetfeeds.ru.html fun/humor.ru.html fun/j...
Date: Fri, 16 Jul 2021 08:02:46 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/16 08:02:45

Modified files:
        .              : planetfeeds.ru.html 
        fun            : humor.ru.html 
        fun/jokes      : 10-kinds-of-people.ru.html c+-.ru.html 
                         error-haiku.ru.html gnu-overflow.ru.html 
                         helloworld.ru.html 
        fun/jokes/po   : 10-kinds-of-people.ru-en.html 
                         10-kinds-of-people.ru.po c+-.ru-en.html 
                         c+-.ru.po error-haiku.ru-en.html 
                         error-haiku.ru.po gnu-overflow.ru-en.html 
                         gnu-overflow.ru.po helloworld.ru-en.html 
                         helloworld.ru.po 
        fun/po         : humor.ru-en.html humor.ru.po 
        philosophy     : floss-and-foss.ru.html free-doc.ru.html 
                         free-open-overlap.ru.html hague.ru.html 
                         linux-gnu-freedom.ru.html 
                         open-source-misses-the-point.ru.html 
                         selling.ru.html shouldbefree.ru.html 
                         when-free-depends-on-nonfree.ru.html 
                         when-free-software-isnt-practically-superior.ru.html 
                         why-free.ru.html 
        philosophy/po  : floss-and-foss.ru-en.html floss-and-foss.ru.po 
                         free-doc.ru-en.html free-doc.ru.po 
                         free-open-overlap.ru-en.html 
                         free-open-overlap.ru.po hague.ru-en.html 
                         hague.ru.po linux-gnu-freedom.ru-en.html 
                         linux-gnu-freedom.ru.po 
                         open-source-misses-the-point.ru-en.html 
                         open-source-misses-the-point.ru.po 
                         selling.ru-en.html selling.ru.po 
                         shouldbefree.ru-en.html shouldbefree.ru.po 
                         when-free-depends-on-nonfree.ru-en.html 
                         when-free-depends-on-nonfree.ru.po 
                         
when-free-software-isnt-practically-superior.ru-en.html 
                         when-free-software-isnt-practically-superior.ru.po 
                         why-free.ru-en.html why-free.ru.po 
        po             : planetfeeds.ru.po 
        proprietary    : all.ru.html malware-microsoft.ru.html 
                         potential-malware.ru.html 
                         proprietary-censorship.ru.html 
                         proprietary-insecurity.ru.html 
                         proprietary-manipulation.ru.html 
                         proprietary.ru.html 
        proprietary/po : all.ru-en.html all.ru.po 
                         malware-microsoft.ru-en.html 
                         malware-microsoft.ru.po 
                         potential-malware.ru-en.html 
                         potential-malware.ru.po 
                         proprietary-censorship.ru-en.html 
                         proprietary-censorship.ru.po 
                         proprietary-insecurity.ru-en.html 
                         proprietary-insecurity.ru.po 
                         proprietary-manipulation.ru-en.html 
                         proprietary-manipulation.ru.po 
                         proprietary.ru-en.html proprietary.ru.po 
        server         : body-include-1.ru.html sitemap.ru.html 
        server/gnun/compendia: compendium.ru.po 
        server/po      : body-include-1.ru.po sitemap.ru-en.html 
                         sitemap.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/planetfeeds.ru.html?cvsroot=www&r1=1.1260&r2=1.1261
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.ru.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/10-kinds-of-people.ru.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/c%43-.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/error-haiku.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/gnu-overflow.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/helloworld.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.ru-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.ru.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/c%43-.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/c%43-.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/error-haiku.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/error-haiku.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnu-overflow.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnu-overflow.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/helloworld.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/helloworld.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ru-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.ru.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.ru.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.ru.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-open-overlap.ru.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/hague.ru.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/linux-gnu-freedom.ru.html?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.ru.html?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.ru.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/shouldbefree.ru.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/when-free-depends-on-nonfree.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/when-free-software-isnt-practically-superior.ru.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-free.ru.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ru.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.ru-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.ru.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ru-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ru.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/hague.ru-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/hague.ru.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/linux-gnu-freedom.ru.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.ru-en.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.ru.po?cvsroot=www&r1=1.113&r2=1.114
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.ru-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.ru.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.ru-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/shouldbefree.ru.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-depends-on-nonfree.ru-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-depends-on-nonfree.ru.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-software-isnt-practically-superior.ru-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/when-free-software-isnt-practically-superior.ru.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-free.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-free.ru.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/po/planetfeeds.ru.po?cvsroot=www&r1=1.1867&r2=1.1868
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/all.ru.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.ru.html?cvsroot=www&r1=1.103&r2=1.104
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/potential-malware.ru.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-censorship.ru.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-insecurity.ru.html?cvsroot=www&r1=1.119&r2=1.120
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-manipulation.ru.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.ru.html?cvsroot=www&r1=1.229&r2=1.230
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/all.ru-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/all.ru.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ru-en.html?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ru.po?cvsroot=www&r1=1.269&r2=1.270
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/potential-malware.ru-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/potential-malware.ru.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-censorship.ru-en.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-censorship.ru.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-insecurity.ru-en.html?cvsroot=www&r1=1.118&r2=1.119
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-insecurity.ru.po?cvsroot=www&r1=1.307&r2=1.308
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-manipulation.ru-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-manipulation.ru.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.ru-en.html?cvsroot=www&r1=1.226&r2=1.227
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.ru.po?cvsroot=www&r1=1.534&r2=1.535
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.ru.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ru.html?cvsroot=www&r1=1.494&r2=1.495
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-1.ru.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru-en.html?cvsroot=www&r1=1.289&r2=1.290
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru.po?cvsroot=www&r1=1.654&r2=1.655
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.2213&r2=1.2214
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.3132&r2=1.3133

Patches:
Index: planetfeeds.ru.html
===================================================================
RCS file: /web/www/www/planetfeeds.ru.html,v
retrieving revision 1.1260
retrieving revision 1.1261
diff -u -b -r1.1260 -r1.1261
--- planetfeeds.ru.html 12 Jul 2021 13:01:10 -0000      1.1260
+++ planetfeeds.ru.html 16 Jul 2021 12:02:40 -0000      1.1261
@@ -6,7 +6,7 @@
 value="<a 
href='http://www.fsf.org/blogs/licensing/new-contributors-frequently-asked-questions-faq-guide'>"
 -->
 <!--#echo
 encoding="none" var="link" -->
-New! Contributor&#39;s Frequently Asked Questions (FAQ) guide<!--#echo 
encoding="none"
+Новое! Руководство для работы над 
&ldquo;вопросами и ответами&rdquo;<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 
http://www.fsf.org/blogs/licensing/new-contributors-frequently-asked-questions-faq-guide
 -->
@@ -16,7 +16,7 @@
 value="<a 
href='http://www.fsf.org/blogs/community/the-journey-begins-with-a-single-step-climb-the-freedom-ladder'>"
 -->
 <!--#echo
 encoding="none" var="link" -->
-The journey begins with a single step: climb the freedom ladder<!--#echo 
encoding="none"
+Путешествие начинается с одного шага: 
взойди по лестнице свободы<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 
http://www.fsf.org/blogs/community/the-journey-begins-with-a-single-step-climb-the-freedom-ladder
 -->
@@ -26,9 +26,9 @@
 value="<a href='http://www.fsf.org/events/freedomladder-20210715-irc'>" -->
 <!--#echo
 encoding="none" var="link" -->
-&quot;Freedom ladder&quot; IRC discussion and brainstorming: July 15<!--#echo 
encoding="none"
+&ldquo;Лестница свободы&rdquo;&nbsp;&mdash; 
обсуждение и мозговой штурм на
+IRC 15 июля<!--#echo encoding="none"
 var="a_close" -->
 <!-- TRANSLATORS: 
 http://www.fsf.org/events/freedomladder-20210715-irc -->
-: Understanding nonfree software / Finding your own reason to use free
-software</p>
+: Понять несвободные программы / найти свою 
причину пользоваться свободными</p>

Index: fun/humor.ru.html
===================================================================
RCS file: /web/www/www/fun/humor.ru.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- fun/humor.ru.html   10 Nov 2020 08:29:18 -0000      1.16
+++ fun/humor.ru.html   16 Jul 2021 12:02:41 -0000      1.17
@@ -1,16 +1,19 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/humor.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 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Смеемся с GNU - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/fun/po/humor.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<div class="reduced-width">
 <h2>Смеемся с GNU</h2>
+<div class="thin"></div>
 
-<p>Эта страница составлена, чтобы доставить 
какое-то веселье работающим
+<p>Этот раздел соствлен, чтобы доставить 
какое-то веселье работающим
 хакерам. Она содержит программы, 
документацию, музыку, стихи и т.д.,
 присланные пользователями GNU и собранные 
разработчиками GNU за все эти
 годы.</p>
@@ -26,30 +29,56 @@
 также несут юмористическую нагрузку.</p>
 
 <!-- It would be nice to see alphabetical order be maintained -->
+<h3 id="Computing">Вычислительная техника</h3>
+
+<ul>
+  <li><a href="/fun/jokes/10-kinds-of-people.html">В мире 10 типов 
людей</a></li>
+  <li><a href="/fun/jokes/any-key.html">Где же эта любая 
кнопка??</a></li>
+  <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a></li>
+  <li>Что доктор Emacs думает о <a
+href="/fun/jokes/doctor.manifesto.html">Манифесте GNU</a>?</li>
+  <li><a href="/fun/jokes/evilmalware.html">Почему вирусы под 
GNU/Linux довольно
+редки</a></li>
+  <li><a href="/fun/jokes/gcc_audio.html">Рой мошек?</a></li>
+  <li><a href="/fun/jokes/gullibility.virus.html">Вирус 
доверчивости</a></li>
+  <li><a href="/fun/jokes/p5.delay.html">Главные 10 причин, по 
которым компания
+Intel отложила объявление о P5</a></li>
+  <li><a href="/fun/jokes/programmer.txt">Вы программист, 
если...</a></li>
+  <li><a href="/fun/jokes/unreliable.net.html">10 самых 
ненадежных сетей</a></li>
+  <li><a href="/fun/jokes/vaxorcist.html">VAXорцист</a></li>
+  <li><a href="/fun/jokes/virus-warning.html">Предупреждение о 
вирусе</a></li>
+  <li><a href="/fun/jokes/xmodmap.html">Физический Xmodmap: 
модификация пишущей
+машинки под дворек</a></li>
+  <li><a
+href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
+Куда уходят стертые символы?</a></li>
+</ul>
+
 <h3 id="Software">Программы</h3>
 
 <ul>
-  <li><a href="/fun/jokes/gcc.html">Предложенные ключи 
командной строки GCC</a></li>
+  <li><a href="/fun/jokes/brainfuck.html">Исходный текст ed на 
мозговой канители
+;-)</a></li>
   <li><a href="/fun/jokes/c+-.html">Си более или менее</a></li>
   <li><a href="/fun/jokes/dna.html">Исходный текст</a> 
человека под GPL</li>
   <li><a href="/fun/jokes/ed.html">Исходный текст ed :-)</a></li>
-  <li><a href="/fun/jokes/brainfuck.html">Исходный текст ed на 
мозговой канители
-;-)</a></li>
+  <li><a href="/fun/jokes/emacs.man">Страница man Emacs из 
Plan9</a></li>
   <li><a href="/fun/jokes/errno.2.html">Коды errno</a></li>
   <li><a href="/fun/jokes/error-haiku.html">Сообщения об 
ошибках</a> в хайку</li>
+  <li><a href="/fun/jokes/gcc.html">Предложенные ключи 
командной строки GCC</a></li>
+  <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
+  <li><a href="/fun/jokes/gnu-overflow.html">GNU: 
переполнение?</a></li>
   <li><a href="/fun/jokes/happy-new-year.html">&ldquo;С Новым 
годом&rdquo; на
 четырех языках</a></li>
+  <li><a href="/fun/jokes/helloworld.html">Здравствуй, 
мир!</a></li>
+  <li><a href="/fun/jokes/long-options.html">Длинные 
ключи?</a></li>
   <li><a href="/fun/jokes/merry-xmas.html">Поздравления с 
рождеством на четырех
 языках</a></li>
-  <li><a href="/fun/jokes/long-options.html">Длинные 
ключи?</a></li>
-  <li><a href="/fun/jokes/software.terms.html">Компьютерные 
термины</a></li>
   <li><a 
href="/fun/jokes/pasta.code.html">Программа-спагетти</a></li>
-  <li><a href="/fun/jokes/unix.errors.html">Сообщения об 
ошибках в Unix</a></li>
-  <li><a href="/fun/jokes/gnu-overflow.html">GNU: 
переполнение?</a></li>
-  <li><a href="/fun/jokes/helloworld.html">Здравствуй, 
мир!</a></li>
-  <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
-  <li><a href="/fun/jokes/emacs.man">Страница man Emacs из 
Plan9</a></li>
+  <li><a href="/fun/jokes/santa_comes_to_town.html">Маршрут Деда 
Мороза</a></li>
+  <li><a href="/fun/jokes/software.terms.html">Компьютерные 
термины</a></li>
   <li><a href="/fun/jokes/ubuntu.html">Ubuntu</a></li>
+  <li><a href="/fun/jokes/unix.errors.html">Сообщения об 
ошибках в Unix</a></li>
   <li><a href="https://twitter.com/1990sLinuxUser";>Юмор из 
Твиттера</a></li>
 </ul>
 
@@ -58,11 +87,19 @@
 <ul>
   <li><a href="/fun/jokes/echo-msg.html">GNU Echo</a></li>
   <li><a href="/fun/jokes/ed-msg.html">Ed, man! !man ed</a></li>
-  <li><a href="/fun/jokes/power.users.html">Руководство 
опытного пользователя</a></li>
-  <li><a href="/fun/jokes/know.your.sysadmin.html"> Кто твой 
системный
-администратор?</a></li>
   <li><a href="/fun/jokes/gnuemacs.acro.exp.html">Расшифровки 
сокращения
 &ldquo;Emacs&rdquo;</a></li>
+  <li><a href="/fun/jokes/know.your.sysadmin.html"> Кто твой 
системный
+администратор?</a></li>
+  <li><a href="/fun/jokes/power.users.html">Руководство 
опытного пользователя</a></li>
+</ul>
+
+<h3 id="ScienceAndEngineering">Наука и техника</h3>
+
+<ul>
+  <li><a href="/fun/jokes/phone.features.html">Функции 
телефона</a></li>
+  <li><a href="/fun/jokes/physics.html">Физический 
магазин</a></li>
+  <li>Некоторые <a 
href="/fun/jokes/science.facts.html">научные факты</a></li>
 </ul>
 
 <h3 id="Music">Музыка</h3>
@@ -73,18 +110,16 @@
      was set up in 10/99.  -->
 <!-- moved to its own page, mattl -->
 <ul>
-  <li><a href="/music/">Музыка и песни GNU</a></li>
-  <li><a href="/fun/jokes/lauper.html">GNU просто хотят 
поразвлечься</a></li>
+  <li><a href="/music/music.html">Музыка и песни GNU</a></li>
 </ul>
 
 <h3 id="Poems">Стихи</h3>
 
 <ul>
+  <li><a href="/fun/jokes/hakawatha.html">Хакавата</a></li>
   <li><a href="/fun/jokes/last.bug.html">Последняя 
ошибка</a></li>
   <li><a href="/fun/jokes/midnight.dreary.html">Кошмар</a></li>
   <li><a href="/fun/jokes/networkologist.html">Сочельник 
сетеолога</a></li>
-  <li><a href="/fun/jokes/hakawatha.html">Хакавата</a></li>
-  <li><a href="/fun/jokes/only-gnu.html">Только GNU</a></li>
 </ul>
 
 <h3 id="Philosophy">Философия</h3>
@@ -97,43 +132,24 @@
 <h3 id="TheFourthEstate">Четвертое сословие</h3>
 
 <ul>
-  <li><a href="/fun/jokes/freesoftware.html">Хак со свободными 
программами</a></li>
+  <li><a href="/fun/jokes/look-and-feel.html">Внешний вид</a></li>
   <li><a href="/fun/jokes/microsoft-church.html">Microsoft и 
церковь</a></li>
   <li><a href="/fun/jokes/rectium.html">Ректиум?</a></li>
   <li><a href="/fun/jokes/unix-hoax.html">Unix&nbsp;&mdash; 
пародия?</a></li>
 </ul>
 
-<h3 id="Computing">Вычислительная техника</h3>
-
-<ul>
-  <li><a href="/fun/jokes/programmer.txt">Вы программист, 
если...</a></li>
-  <li><a href="/fun/jokes/any-key.html">Где же эта любая 
кнопка??</a></li>
-  <li>Что доктор Emacs думает о <a
-href="/fun/jokes/doctor.manifesto.html">Манифесте GNU</a>?</li>
-  <li><a href="/fun/jokes/p5.delay.html">Главные 10 причин, по 
которым компания
-Intel отложила объявление о P5</a></li>
-  <li><a href="/fun/jokes/unreliable.net.html">10 самых 
ненадежных сетей</a></li>
-  <li><a href="/fun/jokes/vaxorcist.html">VAXорцист</a></li>
-  <li><a href="/fun/jokes/virus-warning.html">Предупреждение о 
вирусе</a></li>
-  <li><a href="/fun/jokes/gullibility.virus.html">Вирус 
доверчивости</a></li>
-  <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a></li>
-  <li><a href="/fun/jokes/gcc_audio.html">Рой мошек?</a></li>
-  <li><a
-href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
-Куда уходят стертые символы?</a></li>
-  <li><a href="/fun/jokes/10-kinds-of-people.html">В мире 10 типов 
людей</a></li>
-  <li><a href="/fun/jokes/xmodmap.html">Физический Xmodmap: 
модификация пишущей
-машинки под дворек</a></li>
-  <li><a href="/fun/jokes/evilmalware.html">Почему вирусы под 
GNU/Linux довольно
-редки</a></li>
-</ul>
-
-<h3 id="ScienceAndEngineering">Наука и техника</h3>
+<h3 id="Dictionary">Словарь и игра слов</h3>
 
 <ul>
-  <li><a href="/fun/jokes/phone.features.html">Функции 
телефона</a></li>
-  <li><a href="/fun/jokes/physics.html">Физический 
магазин</a></li>
-  <li>Некоторые <a 
href="/fun/jokes/science.facts.html">научные факты</a></li>
+  <li><a href="/fun/jokes/anagrams.html">Анаграммы</a> 
некоторых общих слов</li>
+  <li><a href="/fun/jokes/fsf-in-german.html">ФСПО 
по-немецки</a></li>
+  <li><a href="/fun/jokes/fundefinitions1.html">Забавные 
определения 1</a></li>
+  <li><a href="/fun/jokes/fundefinitions2.html">Забавные 
определения 2</a></li>
+  <li><a href="/fun/jokes/grammar-in-the-bar.html">Грамматика в 
баре</a></li>
+  <li><a href="/fun/jokes/musical-pickup.html">Музыкальная 
съемка</a></li>
+  <li><a href="/fun/jokes/panama.html">Панама</a></li>
+  <li><a 
href="/fun/jokes/spilling-checker.html">Левописание</a></li>
+  <li><a href="/fun/jokes/typoglycemia.html">Типогликемия</a></li>
 </ul>
 
 <h3 id="Spam">Спам</h3>
@@ -144,13 +160,6 @@
 пространства</a></li>
 </ul>
 
-<h3 id="Dictionary">Словарь</h3>
-
-<ul>
-  <li><a href="/fun/jokes/fundefinitions1.html">Забавные 
определения 1</a></li>
-  <li><a href="/fun/jokes/fundefinitions2.html">Забавные 
определения 2</a></li>
-</ul>
-
 <!-- Most readers like lists to be of manageable length.  So try as
      this Unclassified section grows, to add new sections above.
      That is, classify some of the unclassified jokes into new
@@ -158,32 +167,27 @@
 <h3 id="Unclassified">Без раздела</h3>
 
 <ul>
-  <li><a href="/fun/jokes/grammar-in-the-bar.html">Грамматика в 
баре</a></li>
-  <li><a href="/fun/jokes/luser-vs-rms.html">Взаимодействие 
неискушенного
-пользователя</a> с <a href="http://www.stallman.org/";>rms</a></li>
-  <li><a href="/fun/jokes/anagrams.html">Анаграммы</a> 
некоторых общих слов</li>
   <li><a href="/fun/jokes/bug.war.html">Ошибкам&nbsp;&mdash; 
бой</a>!</li>
   <li>Забавные <a 
href="/fun/jokes/courtroom.quips.html">заявления на суде</a></li>
-  <li><a href="/fun/jokes/fsf-in-german.html">ФСПО 
по-немецки</a></li>
+  <li><a href="/fun/jokes/freesoftware.html">Хак со свободными 
программами</a></li>
   <li><a href="/fun/jokes/gospel.html">Евангелие</a></li>
-  <li><a href="/fun/jokes/look-and-feel.html">Внешний вид</a></li>
-  <li><a href="/fun/jokes/panama.html">Панама</a></li>
+  <li><a href="/fun/jokes/luser-vs-rms.html">Взаимодействие 
неискушенного
+пользователя</a> с <a href="http://www.stallman.org/";>rms</a></li>
+  <li><a href="/fun/jokes/paging.game.html">Страничная 
игра</a></li>
   <li><a href="/fun/jokes/quotations.html">Цитаты</a></li>
   <li><a href="/fun/jokes/smileys.html">Смайлики :-)</a></li>
-  <li><a 
href="/fun/jokes/spilling-checker.html">Левописание</a></li>
-  <li><a href="/fun/jokes/santa_comes_to_town.html">Маршрут Деда 
Мороза</a></li>
-  <li><a href="/fun/jokes/typoglycemia.html">Типогликемия</a></li>
-  <li><a href="/fun/jokes/wolf-logo.html">Эмблема волка</a></li>
-  <li><a href="/fun/jokes/filks.html">Филки</a></li>
   <li><a href="/fun/jokes/users-lightbulb.html">Сколько нужно 
пользователей
 GNU/Linux, чтобы заменить лампочку?</a></li>
+  <li><a href="/fun/jokes/wolf-logo.html">Эмблема волка</a></li>
 </ul>
 
 <!-- Most readers like lists to be of manageable length.  So try as
      this Unclassified section grows, to add new sections above.
      That is, classify some of the unclassified jokes into new
      categories. -->
-<h4 id="Guidelines">Правила приема шуток</h4>
+<div class="infobox">
+<hr />
+<h3 id="Guidelines">Правила приема шуток</h3>
 
 <!-- See the  README file under the /fun/ directory -->
 <p>Наши правила по приему в раздел юмора:</p>
@@ -199,15 +203,16 @@
 свободным программам, GNU, среде UNIX и 
подобным областям.</li>
 </ol>
 
-<h4 id="Disclaimer">Уведомление</h4>
-
+<div id="Disclaimer" role="contentinfo">
+<h3>Уведомление</h3>
 <p>Многое из материала на этой странице (и 
материала, на который она ссылается)
-получено из <a href="ftp://lists.gnu.org/";>архивов 
электронной почты</a>
-проекта GNU ФСПО.</p>
+получено из архивов электронной почты 
проекта GNU ФСПО.</p>
+</div>
+</div>
 
-<p>Фонд свободного программного 
обеспечения не претендует на авторские 
права на
-эти материалы. Заканчиваем эту страницу 
отличным <a
-href="/fun/jokes/purchase.agreement.html">уведомлением</a>!</p>
+<p class="comment">***&nbsp;&nbsp;А заканчиваем мы эту 
страницу отличным <a
+href="/fun/jokes/purchase.agreement.html">уведомлением</a>!&nbsp;&nbsp;***</p>
+</div>
 
 <div class="translators-notes">
 
@@ -217,7 +222,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
@@ -237,7 +242,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 +271,8 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2018, 2020 Richard M. Stallman<br />Copyright &copy;
-2015, 2018, 2020 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1999-2021 Richard M. Stallman<br />Copyright &copy; 2015,
+2018, 2020, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -287,7 +292,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/11/10 08:29:18 $
+$Date: 2021/07/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>

Index: fun/jokes/10-kinds-of-people.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/10-kinds-of-people.ru.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/10-kinds-of-people.ru.html        13 Sep 2015 17:00:04 -0000      
1.17
+++ fun/jokes/10-kinds-of-people.ru.html        16 Jul 2021 12:02:41 -0000      
1.18
@@ -1,7 +1,9 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/10-kinds-of-people.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.78 -->
+<!-- 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>В мире 10 типов людей - Проект GNU - Фонд 
свободного программного
@@ -9,21 +11,29 @@
 
 <!--#include virtual="/fun/jokes/po/10-kinds-of-people.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">Шутки GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Computing">Вычисления</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>В мире 10 типов людей</h2>
 
-<blockquote><p>В мире 10&nbsp;типов людей&nbsp;&mdash; те, 
кто знает двоичные числа, и те,
+<p>В мире 10&nbsp;типов людей&nbsp;&mdash; те, кто 
знает двоичные числа, и те,
 кто не знает.</p>
-<p>В мире 10&nbsp;типов людей&nbsp;&mdash; те, кто 
знает троичные числа, те,
-кто не знает троичных чисел, и те, кто 
путает их с двоичными.</p></blockquote>
-
-<p><a href="/fun/humor.html">Другой юмор</a> в 
юмористической коллекции GNU.</p>
-
-<h3 id="Disclaimer">Предупреждение</h3>
 
-<p>Первую шутку прислал Колин Шарп, 
вторую&nbsp;&mdash; Франсуа Селье.</p>
+<p>В мире 10&nbsp;типов людей&nbsp;&mdash; те, кто 
знает троичные числа, те,
+кто не знает троичных чисел, и те, кто 
путает их с двоичными.</p>
 
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<p>Первую шутку в проект GNU прислал Колин 
Шарп в 2004&nbsp;году,
+вторую&nbsp;&mdash; Франсуа Селье в 2008&nbsp;году.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -33,7 +43,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
@@ -53,7 +63,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>. -->
@@ -66,22 +76,6 @@
 переводам&rdquo;</a>.</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 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
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
 
@@ -95,11 +89,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/09/13 17:00:04 $
+$Date: 2021/07/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/c+-.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/c+-.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/c+-.ru.html       17 Dec 2020 11:31:53 -0000      1.2
+++ fun/jokes/c+-.ru.html       16 Jul 2021 12:02:41 -0000      1.3
@@ -1,24 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/c+-.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.78 -->
+<!-- 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>Си более или менее - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/fun/jokes/po/c+-.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2>Си более или менее</h2>
-
-<blockquote>
-<pre>
-Дата: Tue, 16 Apr 91 13:16:47 EDT
-От кого: geoff@circus.camex.com
-Кому: clp@home.harvardsq.com, rms@ai.mit.edu
-Тема: Си более-или-менее
-</pre>
+<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">Шутки GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Software">Программы</a>&nbsp;/
+</div>
 
-<p>[из rec.funny: Си более-или-менее]</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
+<h2>Си более или менее</h2>
 
 <p>C+-: (произносится &ldquo;Си более или 
менее&rdquo;)</p>
 
@@ -65,7 +66,7 @@
 других случаях слабые связи между 
классами незаконны, так что могут
 потребоваться операторы брака и развода:</p>
 
-<pre>
+<pre class="emph-box">
 брак (МРодитель1, ЖРодитель1);
 // теперь можно производить детские классы
 подкласс МойПодкласс: открытый МРодитель1, 
ЖРодитель1
@@ -83,29 +84,20 @@
 }
 </pre>
 
-<p>Правила порядка операторов могут 
отменяться директивой <code>#pragma
-дчях</code>, известной как прагма &ldquo;делай, 
что я
+<p>Правила порядка операторов могут 
отменяться директивой
+<code>#pragma&nbsp;дчях</code>, известной как прагма 
&ldquo;делай, что я
 хочу&rdquo;. ANSIфикации будет оказываться 
упорное сопротивление. Девиз
 C+-&nbsp;&mdash; &ldquo;Будь своим собственным 
стандартом&rdquo;.</p>
 
-<p>[из апрельского (91 года) выпуска AIExpert]</p>
-
-<p>--<br />
-Морис Сур<br />
-suhre@trwrb.dsd.trw.com</p></blockquote>
-
-<p>Оригинал этой шутки доступен также в 
виде <a
-href="/fun/jokes/c+-.txt">простого текста</a>.</p>
-
-<p style="margin-top: 2em"><a href="/fun/humor.html">Другой юмор</a> 
из коллекции GNU.</p>
+<p class="button right-align"><a 
href="/fun/jokes/c+-.txt">Первоначальное 
сообщение</a></p>
 
+<div class="infobox" role="contentinfo">
+<hr />
 <h3 id="Disclaimer">Предупреждение</h3>
-
-<p>Эта шутка извлечена из <a 
href="https://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<p>Шутка на этой странице получена из арх
ивов электронной почты проекта GNU
+(1991). ФСПО не заявляет авторских прав на 
нее.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -115,7 +107,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
@@ -135,7 +127,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>. -->
@@ -148,23 +140,6 @@
 переводам&rdquo;</a>.</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 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
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-<!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
@@ -177,11 +152,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/12/17 11:31:53 $
+$Date: 2021/07/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/error-haiku.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/error-haiku.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/error-haiku.ru.html       1 Mar 2021 08:00:26 -0000       1.2
+++ fun/jokes/error-haiku.ru.html       16 Jul 2021 12:02:41 -0000      1.3
@@ -1,31 +1,57 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/error-haiku.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>Сообщения об ошибках в хайку - Проект GNU 
- Фонд свободного программного
 обеспечения</title>
+<style type="text/css" media="screen, print">
+<!--
+.lyrics {
+  box-sizing: border-box;
+  max-width: 100%;
+  padding: 0 1em 1.2em;
+  margin-left: 0;
+}
+.lyrics p { display: inline-block; }
+#content .button a { margin: .5em; }
+-->
+ 
+</style>
 
 <!--#include virtual="/fun/jokes/po/error-haiku.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">Шутки GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Software">Программы</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Сообщения об ошибках в хайку?</h2>
 
-<blockquote><p>ПРЕДСТАВЬТЕ СЕБЕ, ЧТО ВМЕСТО 
НЕПОНЯТНЫХ СТРОК ТЕКСТА ВАШ КОМПЬЮТЕР 
ВЫВОДИЛ
-БЫ СООБЩЕНИЯ ОБ ОШИБКАХ В ХАЙКУ...</p></blockquote>
+<p>Представьте себе, что вместо непонятных 
строк текста ваш компьютер выводил
+бы сообщения об ошибках в хайку...</p>
 
-<div class="lyrics">
+<div class="lyrics c">
 <p>Такущий файл?<br />
 Как мог бы быть полезен!<br />
 Но нет его уже.</p>
 
 <p>Вчера работала,<br />
 А нынче вот не пашет.<br />
-На то она и Windows</p>
+На то она и Windows.</p>
 
-<p>Терпенье храни<br />
-Вся твоя ярость тщетна<br />
-Сеть полегла</p>
+<p>Терпенье храни.<br />
+Вся твоя ярость тщетна:<br />
+Сеть полегла.</p>
 
-<p>Неумолимы<br />
+<p>Неумолимы:<br />
 Смерть, налог, потеря данных.<br />
 Угадай, что случилось.</p>
 
@@ -86,22 +112,15 @@
 Мы познали горечь утраты.</p>
 </div>
 
-<p>Оригинал этой шутки есть также в виде <a
-href="/fun/jokes/error-haiku.txt">простого текста</a>.</p>
-
-<!--
-<p>
-Credits and more haiku error messages can be found at
-<a href="http://archive.salon.com/21st/chal/1998/02/10chal2.html";>
-http://archive.salon.com/21st/chal/1998/02/10chal2.html</a>.</p>
--->
-<p><a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
+<p class="button right-align"><a href="/fun/jokes/error-haiku.txt">То же 
в формате простого текста</a>.</p>
 
-<h4 id="Disclaimer">Предупреждение</h4>
-<p>Эта шутка извлечена из <a 
href="http://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<p><a
+href="https://web.archive.org/web/20050301085638/http://archive.salon.com/21st/chal/1998/02/10chal2.html";>Дополнительные
+подробности и хайку</a> можно было найти на  
salon.com.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -109,27 +128,40 @@
  </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
 href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>.
 </p><p>Сведения по координации и 
предложениям переводов наших статей см. в
 <a href="/server/standards/README.translations.html">&ldquo;Р
уководстве по
-переводам&rdquo;</a>.
-</p>
+переводам&rdquo;</a>.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -141,15 +173,15 @@
 href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
 gnu.org</a>.</em></div>
 
-<p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/03/01 08:00:26 $
+$Date: 2021/07/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/gnu-overflow.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/gnu-overflow.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/gnu-overflow.ru.html      7 Jul 2020 09:59:53 -0000       1.2
+++ fun/jokes/gnu-overflow.ru.html      16 Jul 2021 12:02:41 -0000      1.3
@@ -1,11 +1,24 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/gnu-overflow.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>Переполнение ГНU - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/fun/jokes/po/gnu-overflow.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">Шутки GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Software">Программы</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Переполнение ГНU</h2>
 
 <p>Рекурсивное сокращение &ldquo;ГНU&nbsp;&mdash; не 
Unix&rdquo; дает почву для
@@ -62,15 +75,15 @@
 процесс непрерывного пересмотра 
превратил как свободные программы, так и
 человеческий язык в силы, с которыми 
принято считаться.</p>
 
-<p>Автор этого репортажа&nbsp;&mdash; Джейк 
Берендес</p>
-
-<p><a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
+<p><i>Автор этого репортажа&nbsp;&mdash; Джейк 
Берендес</i></p>
 
-<h4 id="Disclaimer">Предупреждение</h4>
-<p>Эта шутка извлечена из <a 
href="http://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Предупреждение</h3>
+<p>Эта шутка извлечена из архивов почты 
проекта GNU ФСПО. ФСПО не заявляет
+авторских прав на нее.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -78,27 +91,40 @@
  </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
 href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>.
 </p><p>Сведения по координации и 
предложениям переводов наших статей см. в
 <a href="/server/standards/README.translations.html">&ldquo;Р
уководстве по
-переводам&rdquo;</a>.
-</p>
+переводам&rdquo;</a>.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -110,15 +136,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/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/helloworld.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/helloworld.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/helloworld.ru.html        24 Sep 2015 05:57:50 -0000      1.1
+++ fun/jokes/helloworld.ru.html        16 Jul 2021 12:02:41 -0000      1.2
@@ -1,26 +1,41 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/helloworld.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>Здравствуй, мир! - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/fun/jokes/po/helloworld.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">Шутки GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Software">Программы</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Здравствуй, мир!</h2>
 
+<address class="byline">Дени Лу и другие</address>
+
 <p>Люди пишут программу &ldquo;Здравствуй, 
мир&rdquo; по-разному в зависимости
 от их возраста и должности:</p>
 
 <h4>Старшеклассники</h4>
 
-<pre>
+<pre class="emph-box">
  10 PRINT "ЗДРАВСТВУЙ МИР"
  20 END
 </pre>
 
 <h4>Первый курс техникума</h4>
 
-<pre>
+<pre class="emph-box">
  program Hello(input, output)
  begin
  writeln('Здравствуй, мир!')
@@ -29,7 +44,7 @@
 
 <h4>Старший курс техникума</h4>
 
-<pre>
+<pre class="emph-box">
  (defun hello
  (print
  (cons 'Здравствуй (list 'мир))))
@@ -37,7 +52,7 @@
 
 <h4>Молодой специалист</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
 
  void main(void)
@@ -52,7 +67,7 @@
 
 <h4>Специалист со стажем</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;iostream.h&gt;
  #include &lt;string.h&gt;
  class string
@@ -101,7 +116,7 @@
 
 <h4>Системный администратор</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
  #include &lt;stdlib.h&gt;
  main()
@@ -121,7 +136,7 @@
 
 <h4>Начинающий хакер</h4>
 
-<pre>
+<pre class="emph-box">
  #!/usr/local/bin/perl
  $msg="Здравствуй, мир.\n";
  if ($#ARGV &gt;= 0) {
@@ -139,7 +154,7 @@
 
 <h4>Опытный хакер</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
  #include &lt;string.h&gt;
  #define S "Здравствуй, мир\n"
@@ -148,7 +163,7 @@
 
 <h4>Хакер со стажем</h4>
 
-<pre>
+<pre class="emph-box">
  % cc -o a.out ~/src/misc/hw/hw.c
  % ./a.out
  Здравствуй, мир.
@@ -156,21 +171,21 @@
 
 <h4>Хакер-гуру</h4>
 
-<pre>
+<pre class="emph-box">
  % cat
  Здравствуй, мир.
 </pre>
 
 <h4>Новый начальник (помните?)</h4>
 
-<pre>
+<pre class="emph-box">
  10 PRINT "ЗДРАВСТВУЙ МИР"
  20 END
 </pre>
 
 <h4>Руководитель среднего подразделения</h4>
 
-<pre>
+<pre class="emph-box">
  mail -s "Здравствуй, мир." vap@b12
  Вась, ты не напишешь мне программу, 
которая выводит "Здравствуй, мир."?
  Мне ее нужно сделать до завтра.
@@ -179,14 +194,14 @@
 
 <h4>Руководитель крупного подразделения</h4>
 
-<pre>
+<pre class="emph-box">
  % zmail leha
  Мне к обеду нужна программа "Здравствуй, 
мир.".
 </pre>
 
 <h4>Директор</h4>
 
-<pre>
+<pre class="emph-box">
  % letter
  letter: команда не найдена.
  % mail
@@ -200,7 +215,7 @@
 
 <h4>Научный работник</h4>
 
-<pre>
+<pre class="emph-box">
        PROGRAM HELLO
        PRINT *, 'Здравствуй, мир'
        END
@@ -208,48 +223,62 @@
 
 <h4>Старый научный работник</h4>
 
-<pre>
+<pre class="emph-box">
        WRITE (6, 100)
     100 FORMAT (1H ,26HЗДРАВСТВУЙ МИР)
        CALL EXIT
        END
 </pre>
 
-<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 class="infobox" role="contentinfo">
+<hr />
+<p>Шутка с этой страницы извлечена из арх
ивов электронной почты проекта GNU
+ФСПО. Некоторые пункты можно также найти в 
<a
+href="https://www.netfunny.com/rhf/jokes/new90/helowor.html";>
+rec.humor.funny</a> (1990).</p>
+</div>
+</div>
 
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </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
 href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>.
 </p><p>Сведения по координации и 
предложениям переводов наших статей см. в
 <a href="/server/standards/README.translations.html">&ldquo;Р
уководстве по
-переводам&rdquo;</a>.
-</p>
+переводам&rdquo;</a>.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -257,16 +286,15 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
  </div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/09/24 05:57:50 $
+$Date: 2021/07/16 12:02:41 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/10-kinds-of-people.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.ru-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- fun/jokes/po/10-kinds-of-people.ru-en.html  13 Sep 2015 17:00:43 -0000      
1.13
+++ fun/jokes/po/10-kinds-of-people.ru-en.html  16 Jul 2021 12:02:41 -0000      
1.14
@@ -1,31 +1,39 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.78 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>10 Kinds of People in the World
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/10-kinds-of-people.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 humor</a>&nbsp;/
+ <a href="/fun/humor.html#Computing">Computing</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>10 Kinds of People in the World</h2>
 
-<blockquote><p>There are 10 kinds of people in the world &mdash;
+<p>There are 10 kinds of people in the world &mdash;
 those who understand binary and those who don't.</p>
+
 <p>There are 10 kinds of people in the world &mdash; those who
 understand trinary, those who don't understand trinary and those who
-mistake it for binary.</p></blockquote>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h3 id="Disclaimer">Disclaimer</h3>
-
-<p>The first joke was submitted by Colin Sharpe and the second by
-Fran&ccedil;ois Celliers.</p>
+mistake it for binary.</p>
 
-<p>The Free Software Foundation claims no copyright on this joke.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<p>The first joke was submitted to the GNU Project by Colin Sharpe in 2004,
+and the second by Fran&ccedil;ois Celliers in 2008.</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
@@ -43,42 +51,24 @@
         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 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
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/13 17:00:43 $
+$Date: 2021/07/16 12:02:41 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/10-kinds-of-people.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.ru.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/10-kinds-of-people.ru.po       16 Jul 2021 11:43:12 -0000      
1.8
+++ fun/jokes/po/10-kinds-of-people.ru.po       16 Jul 2021 12:02:41 -0000      
1.9
@@ -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-14 16:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,14 +23,10 @@
 "В мире 10 типов людей - Проект GNU - Фонд 
свободного программного обеспечения"
 
 #. type: Content of: <div><a>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"/\">"
 msgid "<a href=\"/\">"
 msgstr "<a href=\"/\">"
 
 #. type: Attribute 'title' of: <div><a><img>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "GNU Home"
 msgid "GNU Home"
 msgstr "Домашняя страница GNU"
 
@@ -65,18 +60,12 @@
 "кто не знает троичных чисел, и те, кто 
путает их с двоичными."
 
 #. type: Content of: <div><div><p>
-# | The first joke was submitted {+to the GNU Project+} by Colin Sharpe {+in
-# | 2004,+} and the second by Fran&ccedil;ois [-Celliers.-] {+Celliers in
-# | 2008.+}
-#| msgid ""
-#| "The first joke was submitted by Colin Sharpe and the second by "
-#| "Fran&ccedil;ois Celliers."
 msgid ""
 "The first joke was submitted to the GNU Project by Colin Sharpe in 2004, and "
 "the second by Fran&ccedil;ois Celliers in 2008."
 msgstr ""
-"Первую шутку в проект GNU прислал Колин 
Шарп в 2004&nbsp;году, "
-"вторую&nbsp;&mdash; Франсуа Селье в 2008&nbsp;году."
+"Первую шутку в проект GNU прислал Колин 
Шарп в 2004&nbsp;году, вторую&nbsp;"
+"&mdash; Франсуа Селье в 2008&nbsp;году."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -110,11 +99,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: fun/jokes/po/c+-.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/c+-.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/c+-.ru-en.html 17 Dec 2020 11:31:53 -0000      1.2
+++ fun/jokes/po/c+-.ru-en.html 16 Jul 2021 12:02:41 -0000      1.3
@@ -1,21 +1,22 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.78 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>C more or less
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/c+-.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 humor</a>&nbsp;/
+ <a href="/fun/humor.html#Software">Software</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>C more or less</h2>
 
-<blockquote>
-<pre>
-Date: Tue, 16 Apr 91 13:16:47 EDT
-From: geoff@circus.camex.com
-To: clp@home.harvardsq.com, rms@ai.mit.edu
-Subject: C more-or-less
-</pre>
-
-<p>[from rec.funny: C more-or-less]</p>
-
 <p>C+-: (pronounced &ldquo;C more or less&rdquo;)</p>
 
 <p>Unlike C++, C+- is a subject oriented language.  Each C+- class
@@ -61,7 +62,7 @@
 loose coupling between classes is illegal, so the marriage and divorce
 operators may be needed:</p>
 
-<pre>
+<pre class="emph-box">
 marriage (MParent1, FParent1);
 // child classes can now be derived
 sclass MySclass: public MParent1, FParent1
@@ -80,33 +81,24 @@
 </pre>
 
 <p>Operator precedence rules can be suspended with the directive
-<code>#pragma dwim</code>, known as the &ldquo;Do what I mean&rdquo;
+<code>#pragma&nbsp;dwim</code>, known as the &ldquo;Do what I mean&rdquo;
 pragma.  ANSIfication will be firmly resisted.  C+-'s slogan is
 &ldquo;Be Your Own Standard.&rdquo;</p>
 
-<p>[from the april '91 issue of AIExpert]</p>
-
-<p>--<br />
-Maurice Suhre<br />
-suhre@trwrb.dsd.trw.com</p></blockquote>
-
-<p>This joke is also available in <a href="/fun/jokes/c+-">plain
-text</a>.</p>
-
-<p style="margin-top: 2em"><a href="/fun/humor.html">Other humor</a> in the 
GNU Humor
-Collection.</p>
+<p class="button right-align"><a href="/fun/jokes/c+-.txt">original
+email</a></p>
 
+<div class="infobox" role="contentinfo">
+<hr />
 <h3 id="Disclaimer">Disclaimer</h3>
-
-<p>The joke on this page was obtained from the
-FSF's <a href="https://lists.gnu.org/";>email archives</a> of the GNU
-Project.</p>
-
-<p>The Free Software Foundation claims no copyright on this joke.</p>
+<p>The joke on this page was obtained from the FSF's email archives of the
+GNU Project (1991). 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">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -124,41 +116,22 @@
         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 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
-     document was modified, or published.
-     
-     If you wish to list earlier years, that is ok too.
-     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
-     years, as long as each year in the range is in fact a copyrightable
-     year, i.e., a year in which the document was published (including
-     being publicly visible on the web or in a revision control system).
-     
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<!--#include virtual="/server/bottom-notes.html" -->
-
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/12/17 11:31:53 $
+$Date: 2021/07/16 12:02:41 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/c+-.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/c+-.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/c+-.ru.po      16 Jul 2021 11:43:12 -0000      1.6
+++ fun/jokes/po/c+-.ru.po      16 Jul 2021 12:02:41 -0000      1.7
@@ -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-14 16:25+0000\n"
 
 #. type: Content of: <title>
 msgid "C more or less - GNU Project - Free Software Foundation"
@@ -23,14 +22,10 @@
 "Си более или менее - Проект GNU - Фонд 
свободного программного обеспечения"
 
 #. type: Content of: <div><a>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"/\">"
 msgid "<a href=\"/\">"
 msgstr "<a href=\"/\">"
 
 #. type: Attribute 'title' of: <div><a><img>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "GNU Home"
 msgid "GNU Home"
 msgstr "Домашняя страница GNU"
 
@@ -205,25 +200,16 @@
 "}\n"
 
 #. type: Content of: <div><p>
-# | Operator precedence rules can be suspended with the directive
-# | [-<code>#pragma dwim</code>,-] {+<code>#pragma&nbsp;dwim</code>,+} known
-# | as the &ldquo;Do what I mean&rdquo; pragma.  ANSIfication will be firmly
-# | resisted.  C+-'s slogan is &ldquo;Be Your Own Standard.&rdquo;
-#| msgid ""
-#| "Operator precedence rules can be suspended with the directive "
-#| "<code>#pragma dwim</code>, known as the &ldquo;Do what I mean&rdquo; "
-#| "pragma.  ANSIfication will be firmly resisted.  C+-'s slogan is &ldquo;Be "
-#| "Your Own Standard.&rdquo;"
 msgid ""
 "Operator precedence rules can be suspended with the directive "
 "<code>#pragma&nbsp;dwim</code>, known as the &ldquo;Do what I mean&rdquo; "
 "pragma.  ANSIfication will be firmly resisted.  C+-'s slogan is &ldquo;Be "
 "Your Own Standard.&rdquo;"
 msgstr ""
-"Правила порядка операторов могут 
отменяться директивой <code>#pragma&nbsp;дчях</"
-"code>, известной как прагма &ldquo;делай, что я х
очу&rdquo;. ANSIфикации "
-"будет оказываться упорное сопротивление. 
Девиз C+-&nbsp;&mdash; &ldquo;Будь "
-"своим собственным стандартом&rdquo;."
+"Правила порядка операторов могут 
отменяться директивой <code>#pragma&nbsp;"
+"дчях</code>, известной как прагма &ldquo;делай, 
что я хочу&rdquo;. "
+"ANSIфикации будет оказываться упорное 
сопротивление. Девиз C+-&nbsp;&mdash; "
+"&ldquo;Будь своим собственным 
стандартом&rdquo;."
 
 #. type: Content of: <div><p>
 msgid "<a href=\"/fun/jokes/c+-.txt\">original email</a>"
@@ -234,19 +220,12 @@
 msgstr "Предупреждение"
 
 #. type: Content of: <div><div><p>
-# | The joke on this page was obtained from the FSF's [-<a
-# | href=\"http://lists.gnu.org/\";>email archives</a>-] {+email archives+} of
-# | the GNU [-Project.-] {+Project (1991). The Free Software Foundation claims
-# | no copyright on it.+}
-#| msgid ""
-#| "The joke on this page was obtained from the FSF's <a href=\"http://lists.";
-#| "gnu.org/\">email archives</a> of the GNU Project."
 msgid ""
 "The joke on this page was obtained from the FSF's email archives of the GNU "
 "Project (1991). The Free Software Foundation claims no copyright on it."
 msgstr ""
-"Шутка на этой странице получена из арх
ивов "
-"электронной почты проекта GNU (1991). ФСПО не 
заявляет авторских прав на нее."
+"Шутка на этой странице получена из арх
ивов электронной почты проекта GNU "
+"(1991). ФСПО не заявляет авторских прав на 
нее."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -280,11 +259,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: fun/jokes/po/error-haiku.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/error-haiku.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/error-haiku.ru-en.html 1 Mar 2021 08:00:28 -0000       1.2
+++ fun/jokes/po/error-haiku.ru-en.html 16 Jul 2021 12:02:41 -0000      1.3
@@ -1,24 +1,48 @@
 <!--#include virtual="/server/header.html" -->
-<title>Haiku error messages - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Haiku error messages - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.lyrics p { width: 20em; }
+<!--
+.lyrics {
+  box-sizing: border-box;
+  max-width: 100%;
+  padding: 0 1em 1.2em;
+  margin-left: 0;
+}
+.lyrics p { display: inline-block; }
+#content .button a { margin: .5em; }
+--></style>
 <!--#include virtual="/fun/jokes/po/error-haiku.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 humor</a>&nbsp;/
+ <a href="/fun/humor.html#Software">Software</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Error messages in Haiku?</h2>
 
-<blockquote><p>IMAGINE IF INSTEAD OF CRYPTIC TEXT STRINGS, YOUR
-COMPUTER PRODUCED ERROR MESSAGES IN HAIKU&hellip;</p></blockquote>
+<p>Imagine if, instead of cryptic text strings, your
+computer produced error messages in haiku&hellip;</p>
 
-<div class="lyrics">
+<div class="lyrics c">
 <p>A file that big?<br />
 It might be very useful.<br />
 But now it is gone.</p>
 
-<p>Yesterday it worked<br />
-Today it is not working<br />
-Windows is like that</p>
-
-<p>Stay the patient course<br />
-Of little worth is your ire<br />
-The network is down</p>
+<p>Yesterday it worked,<br />
+Today it is not working.<br />
+Windows is like that.</p>
+
+<p>Stay the patient course.<br />
+Of little worth is your ire,<br />
+The network is down.</p>
 
 <p>Three things are certain:<br />
 Death, taxes, and lost data.<br />
@@ -81,54 +105,55 @@
 We now know shared loss.</p>
 </div>
 
-<p>This joke is also available
-in <a href="/fun/jokes/error-haiku.txt">plain text</a>.</p>
-
-<!--
-<p>Credits and more haiku error messages can be found at
-<a href="http://archive.salon.com/21st/chal/1998/02/10chal2.html";>
-http://archive.salon.com/21st/chal/1998/02/10chal2.html</a>.</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>
+<p class="button right-align"><a href="/fun/jokes/error-haiku.txt">Plain
+text version</a></p>
 
+<div class="infobox" role="contentinfo">
+<hr />
+<p>Credits and more haiku messages can be found at <a
+href="https://web.archive.org/web/20050301085638/http://archive.salon.com/21st/chal/1998/02/10chal2.html";>
+salon.com</a>.</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
-<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>
-
-<p>
-Please see
-the <a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
-of this article.
-</p>
+<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.  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:
+
+        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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/03/01 08:00:28 $
+$Date: 2021/07/16 12:02:41 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/error-haiku.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/error-haiku.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/error-haiku.ru.po      16 Jul 2021 11:43:13 -0000      1.6
+++ fun/jokes/po/error-haiku.ru.po      16 Jul 2021 12:02:41 -0000      1.7
@@ -15,11 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-14 16:25+0000\n"
 
 #. type: Content of: <title>
-# | Haiku error messages - GNU Project - Free Software Foundation [-(FSF)-]
-#| msgid "Haiku error messages - GNU Project - Free Software Foundation (FSF)"
 msgid "Haiku error messages - GNU Project - Free Software Foundation"
 msgstr ""
 "Сообщения об ошибках в хайку - Проект GNU - 
Фонд свободного программного "
@@ -41,14 +38,10 @@
 msgstr " \n"
 
 #. type: Content of: <div><a>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"/\">"
 msgid "<a href=\"/\">"
 msgstr "<a href=\"/\">"
 
 #. type: Attribute 'title' of: <div><a><img>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "GNU Home"
 msgid "GNU Home"
 msgstr "Домашняя страница GNU"
 
@@ -69,8 +62,8 @@
 "Imagine if, instead of cryptic text strings, your computer produced error "
 "messages in haiku&hellip;"
 msgstr ""
-"Представьте себе, что вместо непонятных 
строк текста ваш компьютер "
-"выводил бы сообщения об ошибках в хайку..."
+"Представьте себе, что вместо непонятных 
строк текста ваш компьютер выводил "
+"бы сообщения об ошибках в хайку..."
 
 #. type: Content of: <div><div><p>
 msgid "A file that big?"
@@ -85,38 +78,26 @@
 msgstr "Но нет его уже."
 
 #. type: Content of: <div><div><p>
-# | Yesterday it worked{+,+}
-#| msgid "Yesterday it worked"
 msgid "Yesterday it worked,"
 msgstr "Вчера работала,"
 
 #. type: Content of: <div><div><p>
-# | Today it is not working{+.+}
-#| msgid "Today it is not working"
 msgid "Today it is not working."
 msgstr "А нынче вот не пашет."
 
 #. type: Content of: <div><div><p>
-# | Windows is like that{+.+}
-#| msgid "Windows is like that"
 msgid "Windows is like that."
 msgstr "На то она и Windows."
 
 #. type: Content of: <div><div><p>
-# | Stay the patient course{+.+}
-#| msgid "Stay the patient course"
 msgid "Stay the patient course."
 msgstr "Терпенье храни."
 
 #. type: Content of: <div><div><p>
-# | Of little worth is your ire{+,+}
-#| msgid "Of little worth is your ire"
 msgid "Of little worth is your ire,"
 msgstr "Вся твоя ярость тщетна:"
 
 #. type: Content of: <div><div><p>
-# | The network is down{+.+}
-#| msgid "The network is down"
 msgid "The network is down."
 msgstr "Сеть полегла."
 
@@ -301,16 +282,9 @@
 msgstr "Мы познали горечь утраты."
 
 #. type: Content of: <div><p>
-# | [-This joke is also available in-]<a
-# | [-href=\"/fun/jokes/error-haiku.txt\">plain text</a>.-]
-# | {+href=\"/fun/jokes/error-haiku.txt\">Plain text version</a>+}
-#| msgid ""
-#| "This joke is also available in <a href=\"/fun/jokes/error-haiku.txt"
-#| "\">plain text</a>."
 msgid "<a href=\"/fun/jokes/error-haiku.txt\">Plain text version</a>"
 msgstr ""
-"<a href=\"/fun/jokes/error-haiku.txt"
-"\">То же в формате простого текста</a>."
+"<a href=\"/fun/jokes/error-haiku.txt\">То же в формате 
простого текста</a>."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -318,9 +292,8 @@
 "archive.org/web/20050301085638/http://archive.salon.com/21st/";
 "chal/1998/02/10chal2.html\"> salon.com</a>."
 msgstr ""
-"<a href=\"https://web.";
-"archive.org/web/20050301085638/http://archive.salon.com/21st/";
-"chal/1998/02/10chal2.html\">Дополнительные 
подробности и хайку</a> "
+"<a href=\"https://web.archive.org/web/20050301085638/http://archive.salon.";
+"com/21st/chal/1998/02/10chal2.html\">Дополнительные 
подробности и хайку</a> "
 "можно было найти на  salon.com."
 
 # type: Content of: <div><div>
@@ -355,11 +328,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: fun/jokes/po/gnu-overflow.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnu-overflow.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/gnu-overflow.ru-en.html        7 Jul 2020 09:59:53 -0000       
1.2
+++ fun/jokes/po/gnu-overflow.ru-en.html        16 Jul 2021 12:02:41 -0000      
1.3
@@ -1,7 +1,19 @@
 <!--#include virtual="/server/header.html" -->
-<title>GNU-Overflow - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>GNU-Overflow - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/gnu-overflow.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 humor</a>&nbsp;/
+ <a href="/fun/humor.html#Software">Software</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>GNU-Overflow</h2>
 
 <p>The recursive acronym &ldquo;GNU's Not Unix&rdquo; harbors a stack
@@ -58,47 +70,54 @@
 this process of continuous revision is what has made both free
 software and human language into forces to be reckoned with.</p>
 
-<p>Jake Berendes contributed to this report.</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>
+<p><i>Jake Berendes contributed to this report.</i></p>
 
+<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
-<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>
-
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<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.  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:
+
+        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 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/16 12:02:41 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/gnu-overflow.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnu-overflow.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/gnu-overflow.ru.po     16 Jul 2021 11:43:13 -0000      1.6
+++ fun/jokes/po/gnu-overflow.ru.po     16 Jul 2021 12:02:41 -0000      1.7
@@ -15,24 +15,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-14 16:25+0000\n"
 
 #. type: Content of: <title>
-# | GNU-Overflow - GNU Project - Free Software Foundation [-(FSF)-]
-#| msgid "GNU-Overflow - GNU Project - Free Software Foundation (FSF)"
 msgid "GNU-Overflow - GNU Project - Free Software Foundation"
 msgstr ""
 "Переполнение ГНU - Проект GNU - Фонд 
свободного программного обеспечения"
 
 #. type: Content of: <div><a>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"/\">"
 msgid "<a href=\"/\">"
 msgstr "<a href=\"/\">"
 
 #. type: Attribute 'title' of: <div><a><img>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "GNU Home"
 msgid "GNU Home"
 msgstr "Домашняя страница GNU"
 
@@ -164,9 +157,6 @@
 "человеческий язык в силы, с которыми 
принято считаться."
 
 #. type: Content of: <div><p>
-# | [-Jake-]{+<i>Jake+} Berendes contributed to this [-report.-]
-# | {+report.</i>+}
-#| msgid "Jake Berendes contributed to this report."
 msgid "<i>Jake Berendes contributed to this report.</i>"
 msgstr "<i>Автор этого репортажа&nbsp;&mdash; Джейк 
Берендес</i>"
 
@@ -175,19 +165,12 @@
 msgstr "Предупреждение"
 
 #. type: Content of: <div><div><p>
-# | The joke on this page was obtained from the FSF's [-<a
-# | href=\"http://lists.gnu.org/\";>email archives</a>-] {+email archives+} of
-# | the GNU Project. {+The Free Software Foundation claims no copyright on
-# | it.+}
-#| msgid ""
-#| "The joke on this page was obtained from the FSF's <a href=\"http://lists.";
-#| "gnu.org/\">email archives</a> of the GNU Project."
 msgid ""
 "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."
 msgstr ""
-"Эта шутка извлечена из архивов почты "
-"проекта GNU ФСПО. ФСПО не заявляет авторских
 прав на нее."
+"Эта шутка извлечена из архивов почты 
проекта GNU ФСПО. ФСПО не заявляет "
+"авторских прав на нее."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -221,11 +204,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: fun/jokes/po/helloworld.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/helloworld.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/po/helloworld.ru-en.html  24 Sep 2015 05:57:50 -0000      1.1
+++ fun/jokes/po/helloworld.ru-en.html  16 Jul 2021 12:02:42 -0000      1.2
@@ -1,23 +1,36 @@
 <!--#include virtual="/server/header.html" -->
-<title>Hello World! - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Hello World! - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/helloworld.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 humor</a>&nbsp;/
+ <a href="/fun/humor.html#Software">Software</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Hello World!</h2>
 
+<address class="byline">by Dennis Lou and others</address>
+
 <p>How the way people code &ldquo;Hello World&rdquo; varies depending
 on their age and job:</p>
 
 <h4>High School/Jr. High</h4>
 
-<pre>
+<pre class="emph-box">
  10 PRINT "HELLO WORLD"
  20 END
 </pre>
 
 <h4>First year in College</h4>
 
-<pre>
+<pre class="emph-box">
  program Hello(input, output)
  begin
  writeln('Hello World')
@@ -26,7 +39,7 @@
 
 <h4>Senior year in College</h4>
 
-<pre>
+<pre class="emph-box">
  (defun hello
  (print
  (cons 'Hello (list 'World))))
@@ -34,7 +47,7 @@
 
 <h4>New professional</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
 
  void main(void)
@@ -49,7 +62,7 @@
 
 <h4>Seasoned professional</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;iostream.h&gt;
  #include &lt;string.h&gt;
  class string
@@ -98,7 +111,7 @@
 
 <h4>System Administrator</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
  #include &lt;stdlib.h&gt;
  main()
@@ -118,7 +131,7 @@
 
 <h4>Apprentice Hacker</h4>
 
-<pre>
+<pre class="emph-box">
  #!/usr/local/bin/perl
  $msg="Hello, world.\n";
  if ($#ARGV &gt;= 0) {
@@ -136,7 +149,7 @@
 
 <h4>Experienced Hacker</h4>
 
-<pre>
+<pre class="emph-box">
  #include &lt;stdio.h&gt;
  #include &lt;string.h&gt;
  #define S "Hello, World\n"
@@ -145,7 +158,7 @@
 
 <h4>Seasoned Hacker</h4>
 
-<pre>
+<pre class="emph-box">
  % cc -o a.out ~/src/misc/hw/hw.c
  % a.out
  Hello, world.
@@ -153,21 +166,21 @@
 
 <h4>Guru Hacker</h4>
 
-<pre>
+<pre class="emph-box">
  % cat
  Hello, world.
 </pre>
 
 <h4>New Manager (do you remember?)</h4>
 
-<pre>
+<pre class="emph-box">
  10 PRINT "HELLO WORLD"
  20 END
 </pre>
 
 <h4>Middle Manager</h4>
 
-<pre>
+<pre class="emph-box">
  mail -s "Hello, world." bob@b12
  Bob, could you please write me a program that prints "Hello, world."?
  I need it by tomorrow.
@@ -176,14 +189,14 @@
 
 <h4>Senior Manager</h4>
 
-<pre>
+<pre class="emph-box">
  % zmail jim
  I need a "Hello, world." program by this afternoon.
 </pre>
 
 <h4>Chief Executive</h4>
 
-<pre>
+<pre class="emph-box">
  % letter
  letter: Command not found.
  % mail
@@ -197,7 +210,7 @@
 
 <h4>Research Scientist</h4>
 
-<pre>
+<pre class="emph-box">
        PROGRAM HELLO
        PRINT *, 'Hello World'
        END
@@ -205,51 +218,60 @@
 
 <h4>Older research Scientist</h4>
 
-<pre>
+<pre class="emph-box">
        WRITE (6, 100)
     100 FORMAT (1H ,11HHELLO WORLD)
        CALL EXIT
        END
 </pre>
 
-<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 class="infobox" role="contentinfo">
+<hr />
+<p>The joke on this page was obtained from the FSF's email archives of the
+GNU Project. Some of the entries are also found at <a
+href="https://www.netfunny.com/rhf/jokes/new90/helowor.html";>
+rec.humor.funny</a> (1990).</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
-<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>
-
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<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.  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:
+
+        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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/24 05:57:50 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/po/helloworld.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/helloworld.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/helloworld.ru.po       16 Jul 2021 11:43:13 -0000      1.4
+++ fun/jokes/po/helloworld.ru.po       16 Jul 2021 12:02:42 -0000      1.5
@@ -15,24 +15,17 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-14 16:25+0000\n"
 
 #. type: Content of: <title>
-# | Hello World! - GNU Project - Free Software Foundation [-(FSF)-]
-#| msgid "Hello World! - GNU Project - Free Software Foundation (FSF)"
 msgid "Hello World! - GNU Project - Free Software Foundation"
 msgstr ""
 "Здравствуй, мир! - Проект GNU - Фонд 
свободного программного обеспечения"
 
 #. type: Content of: <div><a>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "<a href=\"/\">"
 msgid "<a href=\"/\">"
 msgstr "<a href=\"/\">"
 
 #. type: Attribute 'title' of: <div><a><img>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "GNU Home"
 msgid "GNU Home"
 msgstr "Домашняя страница GNU"
 
@@ -416,13 +409,7 @@
 msgstr "Научный работник"
 
 #. type: Content of: <div><pre>
-# | [-\tPROGRAM HELLO\\n\tPRINT-]    {+PROGRAM HELLO\\n    PRINT+} *, 'Hello
-# | [-World'\\n\tEND\\n-] {+World'\\n    END\\n+}
 #, no-wrap
-#| msgid ""
-#| "\tPROGRAM HELLO\n"
-#| "\tPRINT *, 'Hello World'\n"
-#| "\tEND\n"
 msgid ""
 "    PROGRAM HELLO\n"
 "    PRINT *, 'Hello World'\n"
@@ -437,14 +424,7 @@
 msgstr "Старый научный работник"
 
 #. type: Content of: <div><pre>
-# | [-\tWRITE-]    {+WRITE+} (6, 100)\\n    100 FORMAT (1H ,11HHELLO
-# | [-WORLD)\\n\tCALL EXIT\\n\tEND\\n-] {+WORLD)\\n    CALL EXIT\\n    END\\n+}
 #, no-wrap
-#| msgid ""
-#| "\tWRITE (6, 100)\n"
-#| "    100 FORMAT (1H ,11HHELLO WORLD)\n"
-#| "\tCALL EXIT\n"
-#| "\tEND\n"
 msgid ""
 "    WRITE (6, 100)\n"
 "    100 FORMAT (1H ,11HHELLO WORLD)\n"
@@ -463,8 +443,8 @@
 "netfunny.com/rhf/jokes/new90/helowor.html\"> rec.humor.funny</a> (1990)."
 msgstr ""
 "Шутка с этой страницы извлечена из арх
ивов электронной почты проекта GNU "
-"ФСПО. Некоторые пункты можно также найти в 
<a href=\"https://www.";
-"netfunny.com/rhf/jokes/new90/helowor.html\"> rec.humor.funny</a> (1990)."
+"ФСПО. Некоторые пункты можно также найти в 
<a href=\"https://www.netfunny.";
+"com/rhf/jokes/new90/helowor.html\"> rec.humor.funny</a> (1990)."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -498,11 +478,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: fun/po/humor.ru-en.html
===================================================================
RCS file: /web/www/www/fun/po/humor.ru-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- fun/po/humor.ru-en.html     10 Nov 2020 08:29:19 -0000      1.15
+++ fun/po/humor.ru-en.html     16 Jul 2021 12:02:42 -0000      1.16
@@ -1,12 +1,15 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Laugh along with GNU
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/po/humor.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="reduced-width">
 <h2>Laugh along with GNU</h2>
+<div class="thin"></div>
 
-<p>This is a web page designed to provide some laughs to the working
+<p>This section is designed to provide some laughs to the working
 hackers. It contains software, documentation, music, poems, etc. submitted
 by GNU users and collected by GNU contributors over the years.</p>
 
@@ -22,30 +25,59 @@
 
 <!-- It would be nice to see alphabetical order be maintained -->
 
+<h3 id="Computing">Computing</h3>
+
+<ul>
+  <li><a href="/fun/jokes/10-kinds-of-people.html">10 Kinds of People in
+  the World</a></li>
+  <li><a href="/fun/jokes/any-key.html">Where is any-key??</a></li>
+  <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>?</li>
+  <li>What does Dr. Emacs think of
+  the <a href="/fun/jokes/doctor.manifesto.html">GNU Manifesto</a>?</li>
+  <li><a href="/fun/jokes/evilmalware.html">Why GNU/Linux Viruses are
+  fairly uncommon</a></li>
+  <li><a href="/fun/jokes/gcc_audio.html">A Swarm of Gnats?</a></li>
+  <li><a href="/fun/jokes/gullibility.virus.html">The Gullibility 
Virus</a></li>
+  <li><a href="/fun/jokes/p5.delay.html">Top 10 reasons why Intel
+  delayed announcing the P5</a></li>
+  <li><a href="/fun/jokes/programmer.txt">You know you're a programmer
+  when&hellip;</a></li>
+  <li><a href="/fun/jokes/unreliable.net.html">Top 10 Unreliable
+  Networks</a></li>
+  <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
+  <li><a href="/fun/jokes/virus-warning.html">Virus Warning</a></li>
+  <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
+  Typewriter Hack</a></li>
+  <li><a 
href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
+  Where Do Deleted Characters Go?</a></li>
+</ul>
+
 <h3 id="Software">Software</h3>
 
 <ul>
-  <li><a href="/fun/jokes/gcc.html">Suggested GCC Options</a></li>
+  <li><a href="/fun/jokes/brainfuck.html">Source code for ed in
+  BrainFuck ;-)</a></li>
   <li><a href="/fun/jokes/c+-.html">C more or less</a></li>
   <li>GPL'd <a href="/fun/jokes/dna.html">source code</a> for humans</li>
   <li><a href="/fun/jokes/ed.html">Source code for ed :-)</a></li>
-  <li><a href="/fun/jokes/brainfuck.html">Source code for ed in
-  BrainFuck ;-)</a></li>
+  <li><a href="/fun/jokes/emacs.man">Emacs man page from Plan9</a></li>
   <li><a href="/fun/jokes/errno.2.html">Errno codes</a></li>
   <li><a href="/fun/jokes/error-haiku.html">Error messages</a> in Haiku</li>
+  <li><a href="/fun/jokes/gcc.html">Suggested GCC Options</a></li>
+  <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
+  <li><a href="/fun/jokes/gnu-overflow.html">GNU-Overflow?</a></li>
   <li><a href="/fun/jokes/happy-new-year.html">Happy New Year in 4
   languages</a></li>
+  <li><a href="/fun/jokes/helloworld.html">Hello World!</a></li>
+  <li><a href="/fun/jokes/long-options.html">Long Options?</a></li>
   <li><a href="/fun/jokes/merry-xmas.html">Merry Christmas in 4
   languages</a></li>
-  <li><a href="/fun/jokes/long-options.html">Long Options?</a></li>
-  <li><a href="/fun/jokes/software.terms.html">Software Terms</a></li>
   <li><a href="/fun/jokes/pasta.code.html">Spaghetti Code</a></li>
-  <li><a href="/fun/jokes/unix.errors.html">Unix Error Messages</a></li>
-  <li><a href="/fun/jokes/gnu-overflow.html">GNU-Overflow?</a></li>
-  <li><a href="/fun/jokes/helloworld.html">Hello World!</a></li>
-  <li><a href="/fun/jokes/gnuemacs.html">GNU Emacs</a></li>
-  <li><a href="/fun/jokes/emacs.man">Emacs man page from Plan9</a></li>
+  <li><a href="/fun/jokes/santa_comes_to_town.html">Santa Claus comes to
+  town</a></li>
+  <li><a href="/fun/jokes/software.terms.html">Software Terms</a></li>
   <li><a href="/fun/jokes/ubuntu.html">Ubuntu</a></li>
+  <li><a href="/fun/jokes/unix.errors.html">Unix Error Messages</a></li>
   <li><a href="https://twitter.com/1990sLinuxUser";>Some humor via 
Twitter</a></li>
 </ul>
 
@@ -54,11 +86,19 @@
 <ul>
   <li><a href="/fun/jokes/echo-msg.html">GNU Echo</a></li>
   <li><a href="/fun/jokes/ed-msg.html">Ed, man! !man ed</a></li>
-  <li><a href="/fun/jokes/power.users.html">Power Users Guide</a></li>
-  <li><a href="/fun/jokes/know.your.sysadmin.html">Know your system
-  administrator</a></li>
   <li><a href="/fun/jokes/gnuemacs.acro.exp.html">GNU Emacs acronym
   expansions</a></li>
+  <li><a href="/fun/jokes/know.your.sysadmin.html">Know your system
+  administrator</a></li>
+  <li><a href="/fun/jokes/power.users.html">Power Users Guide</a></li>
+</ul>
+
+<h3 id="ScienceAndEngineering">Science and Engineering</h3>
+
+<ul>
+  <li><a href="/fun/jokes/phone.features.html">Phone Features</a></li>
+  <li><a href="/fun/jokes/physics.html">The Physics Store!</a></li>
+  <li>Some <a href="/fun/jokes/science.facts.html">Scientific Facts</a></li>
 </ul>
 
 <h3 id="Music">Music</h3>
@@ -70,19 +110,17 @@
 <!-- moved to its own page, mattl -->
 
 <ul>
-  <li><a href="/music/">GNU music and songs</a></li>
-  <li><a href="/fun/jokes/lauper.html">Gnus Just Wanna Have Fun</a></li>
+  <li><a href="/music/music.html">GNU Music and Songs</a></li>
 </ul>
 
 <h3 id="Poems">Poems</h3>
 
 <ul>
+  <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
   <li><a href="/fun/jokes/last.bug.html">The Last Bug</a></li>
   <li><a href="/fun/jokes/midnight.dreary.html">Midnight Dreary</a></li>
   <li><a href="/fun/jokes/networkologist.html">A Networkologist's
   Christmas</a></li>
-  <li><a href="/fun/jokes/hakawatha.html">Hakawatha</a></li>
-  <li><a href="/fun/jokes/only-gnu.html">Only G.N.U.</a></li>
 </ul>
 
 <h3 id="Philosophy">Philosophy</h3>
@@ -96,46 +134,26 @@
 <h3 id="TheFourthEstate">The Fourth Estate</h3>
 
 <ul>
-  <li><a href="/fun/jokes/freesoftware.html">Free Software Hack</a></li>
+  <li><a href="/fun/jokes/look-and-feel.html">Look and Feel</a></li>
   <li><a href="/fun/jokes/microsoft-church.html">Microsoft and the
   Church</a></li>
   <li><a href="/fun/jokes/rectium.html">Rectium?</a></li>
   <li><a href="/fun/jokes/unix-hoax.html">Unix, a Hoax?</a></li>
 </ul>
 
-<h3 id="Computing">Computing</h3>
+<h3 id="Dictionary">Dictionary and Word Play</h3>
 
 <ul>
-  <li><a href="/fun/jokes/programmer.txt">You know you're a programmer
-  when&hellip;</a></li>
-  <li><a href="/fun/jokes/any-key.html">Where is any-key??</a></li>
-  <li>What does Dr. Emacs think of
-  the <a href="/fun/jokes/doctor.manifesto.html">GNU Manifesto</a>?</li>
-  <li><a href="/fun/jokes/p5.delay.html">Top 10 reasons why Intel
-  delayed announcing the P5</a></li>
-  <li><a href="/fun/jokes/unreliable.net.html">Top 10 Unreliable
-  Networks</a></li>
-  <li>The <a href="/fun/jokes/vaxorcist.html">Vaxorcist</a></li>
-  <li><a href="/fun/jokes/virus-warning.html">Virus Warning</a></li>
-  <li><a href="/fun/jokes/gullibility.virus.html">The Gullibility 
Virus</a></li>
-  <li><a href="/fun/jokes/deadbeef.html">Dead Beef</a>?</li>
-  <li><a href="/fun/jokes/gcc_audio.html">A Swarm of Gnats?</a></li>
-  <li><a 
href="https://web.archive.org/web/20150224010742/http://www.joke-archives.com/computers/deletedcharacters.html";>
-  Where Do Deleted Characters Go?</a></li>
-  <li><a href="/fun/jokes/10-kinds-of-people.html">10 Kinds of People in
-  the World</a></li>
-  <li><a href="/fun/jokes/xmodmap.html">Physical Xmodmap, or The Dvorak
-  Typewriter Hack</a></li>
-  <li><a href="/fun/jokes/evilmalware.html">Why GNU/Linux Viruses are
-  fairly uncommon</a></li>
-</ul>
-
-<h3 id="ScienceAndEngineering">Science and Engineering</h3>
-
-<ul>
-  <li><a href="/fun/jokes/phone.features.html">Phone Features</a></li>
-  <li><a href="/fun/jokes/physics.html">The Physics Store!</a></li>
-  <li>Some <a href="/fun/jokes/science.facts.html">Scientific Facts</a></li>
+  <li><a href="/fun/jokes/anagrams.html">Anagrams</a> for some common
+  words</li>
+  <li><a href="/fun/jokes/fsf-in-german.html">FSF in German</a></li>
+  <li><a href="/fun/jokes/fundefinitions1.html">Fun Definitions 1</a></li>
+  <li><a href="/fun/jokes/fundefinitions2.html">Fun Definitions 2</a></li>
+  <li><a href="/fun/jokes/grammar-in-the-bar.html">Grammar in the bar</a></li>
+  <li><a href="/fun/jokes/musical-pickup.html">Musical pickup</a></li>
+  <li><a href="/fun/jokes/panama.html">Panama</a></li>
+  <li><a href="/fun/jokes/spilling-checker.html">Spilling Checker</a></li>
+  <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
 </ul>
 
 <h3 id="Spam">Spam</h3>
@@ -146,13 +164,6 @@
   Needed</a></li>
 </ul>
 
-<h3 id="Dictionary">Dictionary</h3>
-
-<ul>
-  <li><a href="/fun/jokes/fundefinitions1.html">Fun Definitions 1</a></li>
-  <li><a href="/fun/jokes/fundefinitions2.html">Fun Definitions 2</a></li>
-</ul>
-
 <!-- Most readers like lists to be of manageable length.  So try as
      this Unclassified section grows, to add new sections above.
      That is, classify some of the unclassified jokes into new
@@ -161,35 +172,28 @@
 <h3 id="Unclassified">Unclassified</h3>
 
 <ul>
-  <li><a href="/fun/jokes/grammar-in-the-bar.html">Grammar in the bar</a></li>
-  <li>A luser's <a href="/fun/jokes/luser-vs-rms.html">interaction</a>
-  with <a href= "http://www.stallman.org/";>rms</a></li>
-  <li><a href="/fun/jokes/anagrams.html">Anagrams</a> for some common
-  words</li>
-  <li>A war against <a href="/fun/jokes/bug.war.html">Bugs</a>!</li>
+  <li><a href="/fun/jokes/bug.war.html">A war against bugs</a>!</li>
   <li>Funny <a href="/fun/jokes/courtroom.quips.html">Court
   Statements</a></li>
-  <li><a href="/fun/jokes/fsf-in-german.html">FSF in German</a></li>
+  <li><a href="/fun/jokes/freesoftware.html">Free Software Hack</a></li>
   <li><a href="/fun/jokes/gospel.html">Gospel</a></li>
-  <li><a href="/fun/jokes/look-and-feel.html">Look and Feel</a></li>
-  <li><a href="/fun/jokes/panama.html">Panama</a></li>
+  <li>A luser's <a href="/fun/jokes/luser-vs-rms.html">interaction</a>
+  with <a href= "http://www.stallman.org/";>rms</a></li>
+  <li><a href="/fun/jokes/paging.game.html">The Paging Game</a></li>
   <li><a href="/fun/jokes/quotations.html">Quotations</a></li>
   <li><a href="/fun/jokes/smileys.html">Smileys :-)</a></li>
-  <li><a href="/fun/jokes/spilling-checker.html">Spilling Checker</a></li>
-  <li><a href="/fun/jokes/santa_comes_to_town.html">Santa Claus comes to
-  town</a></li>
-  <li><a href="/fun/jokes/typoglycemia.html">Typoglycemia</a></li>
-  <li>The <a href="/fun/jokes/wolf-logo.html">Wolf Logo</a></li>
-  <li><a href="/fun/jokes/filks.html">Some Filks</a></li>
   <li><a href="/fun/jokes/users-lightbulb.html">How many GNU/Linux users are
   needed to change a light bulb?</a></li>
+  <li><a href="/fun/jokes/wolf-logo.html">The Wolf Logo</a></li>
 </ul>
 <!-- Most readers like lists to be of manageable length.  So try as
      this Unclassified section grows, to add new sections above.
      That is, classify some of the unclassified jokes into new
      categories. -->
 
-<h4 id="Guidelines">Humor Submission Guidelines</h4>
+<div class="infobox">
+<hr />
+<h3 id="Guidelines">Humor Submission Guidelines</h3>
 
 <!-- See the  README file under the /fun/ directory -->
 
@@ -207,19 +211,21 @@
   fields.</li>
 </ol>
 
-<h4 id="Disclaimer">Disclaimer</h4>
-
+<div id="Disclaimer" role="contentinfo">
+<h3>Disclaimer</h3>
 <p>Much of the material on this page (and linked to from it) was
-obtained from the FSF's <a href= "ftp://lists.gnu.org/";>email
-archives</a> of the GNU Project.</p>
+obtained from the FSF's email archives of the GNU Project. The Free Software
+Foundation claims no copyrights on these.</p>
+</div>
+</div>
 
-<p>The Free Software Foundation claims no copyrights on these. And
-we'll end this page with a
-perfect <a href="/fun/jokes/purchase.agreement.html">Disclaimer</a>!</p>
+<p class="comment">***&nbsp;&nbsp;And we'll end this page with a perfect <a
+href="/fun/jokes/purchase.agreement.html">Disclaimer</a>!&nbsp;&nbsp;***</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
@@ -237,13 +243,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>
 
@@ -264,7 +270,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2018, 2020 Richard M. Stallman</p>
+<p>Copyright &copy; 1999-2021 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -274,7 +280,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/11/10 08:29:19 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fun/po/humor.ru.po
===================================================================
RCS file: /web/www/www/fun/po/humor.ru.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- fun/po/humor.ru.po  16 Jul 2021 11:43:12 -0000      1.26
+++ fun/po/humor.ru.po  16 Jul 2021 12:02:42 -0000      1.27
@@ -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-11 17:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Laugh along with GNU - GNU Project - Free Software Foundation"
@@ -27,21 +26,14 @@
 msgstr "Смеемся с GNU"
 
 #. type: Content of: <div><p>
-# | This {+section+} is [-a web page-] designed to provide some laughs to the
-# | working hackers. It contains software, documentation, music, poems, etc.
-# | submitted by GNU users and collected by GNU contributors over the years.
-#| msgid ""
-#| "This is a web page designed to provide some laughs to the working "
-#| "hackers. It contains software, documentation, music, poems, etc. "
-#| "submitted by GNU users and collected by GNU contributors over the years."
 msgid ""
 "This section is designed to provide some laughs to the working hackers. It "
 "contains software, documentation, music, poems, etc. submitted by GNU users "
 "and collected by GNU contributors over the years."
 msgstr ""
-"Этот раздел соствлен, чтобы доставить 
какое-то веселье работающим "
-"хакерам. Она содержит программы, 
документацию, музыку, стихи и т.д., "
-"присланные пользователями GNU и собранные 
разработчиками GNU за все эти годы."
+"Этот раздел соствлен, чтобы доставить 
какое-то веселье работающим хакерам. "
+"Она содержит программы, документацию, 
музыку, стихи и т.д., присланные "
+"пользователями GNU и собранные 
разработчиками GNU за все эти годы."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -308,9 +300,6 @@
 msgstr "Музыка"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/music/\">GNU music-] {+href=\"/music/music.html\">GNU Music+}
-# | and [-s-]{+S+}ongs</a>
-#| msgid "<a href=\"/music/\">GNU music and songs</a>"
 msgid "<a href=\"/music/music.html\">GNU Music and Songs</a>"
 msgstr "<a href=\"/music/music.html\">Музыка и песни GNU</a>"
 
@@ -399,9 +388,6 @@
 msgstr "<a href=\"/fun/jokes/grammar-in-the-bar.html\">Грамматика в 
баре</a>"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/fun/jokes/quayle.html\">Quayle</a>-]
-# | {+href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>+}
-#| msgid "<a href=\"/fun/jokes/quayle.html\">Quayle</a>"
 msgid "<a href=\"/fun/jokes/musical-pickup.html\">Musical pickup</a>"
 msgstr "<a href=\"/fun/jokes/musical-pickup.html\">Музыкальная 
съемка</a>"
 
@@ -438,9 +424,6 @@
 msgstr "Без раздела"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/fun/jokes/last.bug.html\">The Last Bug</a>-]
-# | {+href=\"/fun/jokes/bug.war.html\">A war against bugs</a>!+}
-#| msgid "<a href=\"/fun/jokes/last.bug.html\">The Last Bug</a>"
 msgid "<a href=\"/fun/jokes/bug.war.html\">A war against bugs</a>!"
 msgstr "<a href=\"/fun/jokes/bug.war.html\">Ошибкам&nbsp;&mdash; 
бой</a>!"
 
@@ -467,9 +450,6 @@
 "пользователя</a> с <a href=\"http://www.stallman.org/\";>rms</a>"
 
 #. type: Content of: <div><ul><li>
-# | <a [-href=\"/fun/jokes/panama.html\">Panama</a>-]
-# | {+href=\"/fun/jokes/paging.game.html\">The Paging Game</a>+}
-#| msgid "<a href=\"/fun/jokes/panama.html\">Panama</a>"
 msgid "<a href=\"/fun/jokes/paging.game.html\">The Paging Game</a>"
 msgstr "<a href=\"/fun/jokes/paging.game.html\">Страничная 
игра</a>"
 
@@ -490,9 +470,6 @@
 "Linux, чтобы заменить лампочку?</a>"
 
 #. type: Content of: <div><ul><li>
-# | [-The-]<a [-href=\"/fun/jokes/wolf-logo.html\">Wolf-]
-# | {+href=\"/fun/jokes/wolf-logo.html\">The Wolf+} Logo</a>
-#| msgid "The <a href=\"/fun/jokes/wolf-logo.html\">Wolf Logo</a>"
 msgid "<a href=\"/fun/jokes/wolf-logo.html\">The Wolf Logo</a>"
 msgstr "<a href=\"/fun/jokes/wolf-logo.html\">Эмблема волка</a>"
 
@@ -537,33 +514,15 @@
 msgstr "Уведомление"
 
 #. type: Content of: <div><div><div><p>
-# | Much of the material on this page (and linked to from it) was obtained
-# | from the FSF's [-<a href= \"ftp://lists.gnu.org/\";>email archives</a>-]
-# | {+email archives+} of the GNU Project. {+The Free Software Foundation
-# | claims no copyrights on these.+}
-#| msgid ""
-#| "Much of the material on this page (and linked to from it) was obtained "
-#| "from the FSF's <a href= \"ftp://lists.gnu.org/\";>email archives</a> of "
-#| "the GNU Project."
 msgid ""
 "Much of the material on this page (and linked to from it) was obtained from "
 "the FSF's email archives of the GNU Project. The Free Software Foundation "
 "claims no copyrights on these."
 msgstr ""
 "Многое из материала на этой странице (и 
материала, на который она ссылается) "
-"получено из архивов электронной почты "
-"проекта GNU ФСПО."
+"получено из архивов электронной почты 
проекта GNU ФСПО."
 
 #. type: Content of: <div><p>
-# | [-The Free Software Foundation claims no copyrights on these.
-# | And-]{+***&nbsp;&nbsp;And+} we'll end this page with a perfect <a
-# | [-href=\"/fun/jokes/purchase.agreement.html\">Disclaimer</a>!-]
-# | {+href=\"/fun/jokes/purchase.agreement.html\">Disclaimer</a>!&nbsp;&nbsp;**
-# | *+}
-#| msgid ""
-#| "The Free Software Foundation claims no copyrights on these. And we'll end "
-#| "this page with a perfect <a href=\"/fun/jokes/purchase.agreement.html"
-#| "\">Disclaimer</a>!"
 msgid ""
 "***&nbsp;&nbsp;And we'll end this page with a perfect <a href=\"/fun/jokes/"
 "purchase.agreement.html\">Disclaimer</a>!&nbsp;&nbsp;***"
@@ -603,11 +562,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 "
@@ -622,12 +576,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2015, 2018, 2020-] {+1999-2021+} Richard M. Stallman
-#| msgid "Copyright &copy; 2015, 2018, 2020 Richard M. Stallman"
 msgid "Copyright &copy; 1999-2021 Richard M. Stallman"
 msgstr ""
-"Copyright &copy; 1999-2021 Richard M. Stallman<br />Copyright &copy; "
-"2015, 2018, 2020, 2021 Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 1999-2021 Richard M. Stallman<br />Copyright &copy; 2015, "
+"2018, 2020, 2021 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/floss-and-foss.ru.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.ru.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/floss-and-foss.ru.html   18 Nov 2016 07:32:43 -0000      1.7
+++ philosophy/floss-and-foss.ru.html   16 Jul 2021 12:02:42 -0000      1.8
@@ -1,17 +1,25 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>FLOSS и FOSS - Проект GNU - Фонд свободного 
программного обеспечения</title>
 
 <!--#include virtual="/philosophy/po/floss-and-foss.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>FLOSS и FOSS</h2>
 
-<p><strong>Ричард Столмен</strong></p>
+<address class="byline">Ричард Столмен</address>
 
+<div class="article">
 <p>В сообществе свободного программного 
обеспечения два лагеря: движение за
 свободные программы и открытый исходный 
текст. Движение за свободные
 программы представляет собой кампанию за <a
@@ -70,6 +78,8 @@
 другим выражением, потому что мы не хотим 
быть нейтральными по этому
 политическому вопросу. Мы стоим за свободу 
и показываем это каждый
 раз&nbsp;&mdash; говоря &ldquo;свободные&rdquo; и 
подчеркивая их свободу.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -79,7 +89,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
@@ -100,7 +110,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,8 +123,9 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2013, 2015, 2016 Richard Stallman<br />Copyright &copy;
-2016 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2021 Richard Stallman<br />Copyright
+&copy; 2013, 2014, 2015, 2016, 2021 Free Software Foundation,
+Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -130,11 +141,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/11/18 07:32:43 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/free-doc.ru.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.ru.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- philosophy/free-doc.ru.html 28 Dec 2019 15:30:27 -0000      1.38
+++ philosophy/free-doc.ru.html 16 Jul 2021 12:02:42 -0000      1.39
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/free-doc.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему свободным программам нужна 
свободная документация - Проект GNU - Фонд
@@ -9,17 +12,14 @@
 
 <!--#include virtual="/philosophy/po/free-doc.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>
+<div class="thin"></div>
 
-<blockquote class="announcement"><p>
-<a 
href="http://defectivebydesign.org/ebooks.html";>Присоединяйтесь 
к нашему
-списку рассылки об опасностях электронных 
книг</a>.
-</p></blockquote>
-
-<ul>
-<li><a href="/copyleft/fdl.html">Лицензия свободной 
документации GNU</a></li>
-</ul>
-
+<div class="article">
 <p>
 Больше всего в свободных операционных 
системах не хватает не программ; самый
 большой дефицит&nbsp;&mdash; свободные 
руководства, которые мы могли бы
@@ -57,12 +57,19 @@
 программистов нечасто, мы едва ли можем 
позволить себе терять документацию
 таким образом.</p>
 
+<hr class="no-display" />
+<div class="announcement" role="complementary"><p>
+<a 
href="https://defectivebydesign.org/ebooks.html";>Присоединяйтесь 
к нашему
+списку рассылки об опасностях электронных 
книг</a>.
+</p></div>
+<hr class="no-display" />
+
 <p>
 Свободная документация, как и свободные 
программы, означает свободу, а не
 стоимость. Проблема этих книг заключалась 
не в том, что O'Reilly Associates
 взимала плату за типографские 
копии&nbsp;&mdash; само по себе это не
 плохо. (Фонд свободного программного 
обеспечения тоже <a
-href="http://shop.fsf.org/category/books/";>продает 
типографские копии</a>
+href="https://shop.fsf.org/category/books/";>продает 
типографские копии</a>
 свободной <a href="/doc/doc.html">документации GNU</a>.) 
Но документация GNU
 доступна в виде исходного текста, а эти 
руководства&nbsp;&mdash; только в
 печатном виде. Руководства GNU разрешено 
копировать и изменять; руководства
@@ -76,6 +83,10 @@
 программы, в электронном виде или на 
бумаге. Разрешение вносить изменения
 тоже жизненно важно.</p>
 
+<ul>
+<li><a href="/licenses/fdl.html">Лицензия свободной 
документации GNU</a></li>
+</ul>
+
 <p>
 В общем случае я не думаю, что важно, чтобы 
людям было разрешено изменять
 любого рода статьи и книги. Вопросы, 
связанные с литературными
@@ -154,6 +165,8 @@
 <p>
 [Примечание: Мы поддерживаем <a 
href="/doc/other-free-books.html">страницу,
 на которой перечислены свободные книги 
других издателей</a>].</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -163,7 +176,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 +196,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 +225,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1996-2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019, 2021
+Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -230,11 +242,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2019/12/28 15:30:27 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/free-open-overlap.ru.html
===================================================================
RCS file: /web/www/www/philosophy/free-open-overlap.ru.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/free-open-overlap.ru.html        14 Jul 2017 16:28:42 -0000      
1.5
+++ philosophy/free-open-overlap.ru.html        16 Jul 2021 12:02:42 -0000      
1.6
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/free-open-overlap.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Свободные программы и открытый исх
одный текст - Проект GNU - Фонд свободного
@@ -9,14 +12,18 @@
 
 <!--#include virtual="/philosophy/po/free-open-overlap.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="/philosophy/open-source-misses-the-point.html">свободных 
программ и
 открытого исходного текста</a>:</p>
 
+<div style="max-width:max-content; padding:1em 1.5em; background:#f3f3f3">
 <pre>
-<code>
              -------------------------------------
            / |                                   | \
            | |                                   | |
@@ -34,8 +41,8 @@
              ------------------------------------- |
              | тивоизованные устройства | прочие 
| /
              -------------------------------------
-</code>
 </pre>
+</div>
 
 <p>Программы, представляющие открытый исх
одный текст, но не свободные,
 составляют небольшую часть по отношению к 
тем, что свободны. Если изображать
@@ -60,6 +67,7 @@
 
 <p>Большинство лицензий несвободных 
программ не являются и лицензиями программ
 с открытым исходным текстом.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -69,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
@@ -89,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>. -->
@@ -102,12 +110,12 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015, 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">
@@ -122,11 +130,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/07/14 16:28:42 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/hague.ru.html
===================================================================
RCS file: /web/www/www/philosophy/hague.ru.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/hague.ru.html    12 Sep 2017 10:05:39 -0000      1.9
+++ philosophy/hague.ru.html    16 Jul 2021 12:02:42 -0000      1.10
@@ -248,7 +248,7 @@
 -->
 <p>
 Более подробные сведения о проблемах 
Гаагского соглашения можно найти на <a
-href="http://web.lemuria.org/DeCSS/hague.html";>http://web.lemuria.org/DeCSS/hague.html</a>.</p>
+href="https://web.lemuria.org/DeCSS/hague.html";>http://web.lemuria.org/DeCSS/hague.html</a>.</p>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -290,13 +290,13 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001 Richard Stallman<br />
-Copyright &copy; 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2021 Richard Stallman<br />
+Copyright &copy; 2001, 2013, 2014, 2017, 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">
@@ -311,7 +311,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/09/12 10:05:39 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/linux-gnu-freedom.ru.html
===================================================================
RCS file: /web/www/www/philosophy/linux-gnu-freedom.ru.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- philosophy/linux-gnu-freedom.ru.html        9 Dec 2020 18:29:42 -0000       
1.35
+++ philosophy/linux-gnu-freedom.ru.html        16 Jul 2021 12:02:42 -0000      
1.36
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/linux-gnu-freedom.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Linux, GNU и свобода - Проект GNU - Фонд 
свободного программного обеспечения </title>
@@ -14,11 +17,15 @@
 
 <!--#include virtual="/philosophy/po/linux-gnu-freedom.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>Linux, GNU и свобода</h2>
 
-<p>
-  <strong>Ричард М. Столмен</strong></p>
+<address class="byline">Ричард Столмен</address>
 
+<div class="article">
 <p>
   Поскольку <a
 
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>статья
@@ -144,8 +151,8 @@
 их&rdquo;. Если они признают нашу роль, то они 
будут больше прислушиваться
 к нашим словам, и они от нас услышат: 
&ldquo;Эта система существует
 благодаря тем, кому небезразлична свобода. 
Присоединяйтесь к нам, цените
-свою свободу, и вместе мы сохраним ее&rdquo;. 
См. историю проекта на <a
-href="/gnu/thegnuproject.html">http://www.gnu.org/gnu/thegnuproject.html</a>.</p>
+свою свободу, и вместе мы сохраним ее&rdquo;. 
См. историю проекта на
+странице <a href="/gnu/thegnuproject.html">Проект GNU</a>.</p>
 <p>
   Когда я прошу называть систему 
&ldquo;GNU/Linux&rdquo;, некоторые отвечают
 <a href="/gnu/gnu-linux-faq.html">глупыми оправданиями и 
ничтожными
@@ -239,6 +246,7 @@
   &ldquo;Цените свою свободу, чтобы не 
потерять ее&rdquo;,&mdash; учит
 история. &ldquo;Не путайте нас в 
политику&rdquo;,&mdash; отвечают те,
 кто не хочет учиться.</p>
+<div class="column-limit"></div>
 
 <p id="update">
   <strong>Обновление:</strong> С 2005 года BitKeeper 
больше не применяется для
@@ -248,6 +256,9 @@
 января 2008 года поддерживается <a
 href="//directory.fsf.org/project/linux">свободная версия 
Linux</a> для
 применения в свободных дистрибутивах 
GNU/Linux.</p>
+</div>
+</div>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -260,14 +271,15 @@
 информации; вмешательство в работу этих 
систем незаконно.</li>
 <li id="ft3">См. &ldquo;<span lang="en" xml:lang="en">Broadcast Protection
 Discussion Group</span>&rdquo; на <a
-href="http://www.eff.org/";>http://www.eff.org/</a>)</li><li
-id="ft4">Стандартная общественная лицензия GNU; 
лицензия, по которой
-распространяется Linux.</li> </ol></div>
+href="https://www.eff.org/";>http://www.eff.org/</a>)</li>
+<li id="ft4">Стандартная общественная лицензия 
GNU; лицензия, по которой
+распространяется Linux.</li>
+</ol></div>
 </div>
 
 <!-- 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>. -->
@@ -300,8 +312,9 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2002, 2017, 2019 Richard M. Stallman<br />Copyright &copy;
-2014, 2017, 2019, 2020 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman<br />Copyright
+&copy; 2010, 2011, 2013, 2014, 2017, 2020, 2021 Free Software Foundation,
+Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -317,11 +330,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/12/09 18:29:42 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/open-source-misses-the-point.ru.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.ru.html,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- philosophy/open-source-misses-the-point.ru.html     27 Apr 2021 12:30:47 
-0000      1.71
+++ philosophy/open-source-misses-the-point.ru.html     16 Jul 2021 12:02:42 
-0000      1.72
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/open-source-misses-the-point.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему &ldquo;открытый исходный текст&rdquo; 
не передает понятия
@@ -10,14 +13,17 @@
 
 <!--#include virtual="/philosophy/po/open-source-misses-the-point.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>Почему &ldquo;открытый исходный текст&rdquo; 
не передает понятия
 &ldquo;свободная программа&rdquo;</h2>
 
 <address class="byline">Ричард Столмен</address>
 
 <div class="article">
-
-<blockquote class="comment"><p>
+<div class="important"><p>
 Выражения &ldquo;свободные программы&rdquo; и 
&ldquo;открытый исходный
 текст&rdquo; описывают почти один и тот же 
диапазон программ. Однако они
 говорят об этих программах глубоко 
различные вещи, основанные на разных
@@ -27,7 +33,7 @@
 образом на ценность практического превосх
одства и не выступает за
 принципы. Вот почему мы не согласны с 
открытым исходным текстом и не
 употребляем это выражение.
-</p></blockquote>
+</p></div>
 
 <p>Когда мы называем программу 
&ldquo;свободной&rdquo;, мы имеем в виду, что
 она уважает <a href="/philosophy/free-sw.html">основные 
свободы
@@ -88,7 +94,7 @@
 исходного текста, и они ассоциируются с 
тем же. В большинстве обсуждений
 &ldquo;открытого исходного текста&rdquo; не 
обращают внимания на то, что
 хорошо и что плохо, а только на 
популярность и успешность; <a
-href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>типичный
+href="https://linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>типичный
 пример</a>&nbsp;&mdash; заметка о последних 
тенденциях в
 LinuxInsider. Небольшая часть сторонников 
открытого исходного текста
 действительно говорит, что свобода входит 
в состав проблемы, но их не
@@ -228,7 +234,7 @@
 соглашения по-разному определяют, что 
позволено делать с этим исходным
 текстом&rdquo;.</p>
 
-<p><em>Нью-Йорк таймс</em> <a
+<p><cite>Нью-Йорк таймс</cite> <a
 
href="http://www.nytimes.com/external/gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-37415.html";>
 напечатала статью, которая распространяет 
значение этого понятия</a> на
 предварительное тестирование 
пользователями&nbsp;&mdash; передачу небольшому
@@ -237,7 +243,7 @@
 несвободных программ десятилетиями.</p>
 
 <p>Термин был растянут так, что включил в 
себя проекты оборудования, которые <a
-href="http://www.theguardian.com/sustainable-business/2015/aug/27/texas-teenager-water-purifier-toxic-e-waste-pollution";>публикуются
+href="https://www.theguardian.com/sustainable-business/2015/aug/27/texas-teenager-water-purifier-toxic-e-waste-pollution";>публикуются
 без патента</a>. Свободные от патентов 
проекты могут быть похвальным вкладом
 в общество, но термин &ldquo;исходный 
текст&rdquo; не имеет к ним прямого
 отношения.</p>
@@ -272,7 +278,7 @@
 к участию. Они растянули это понятие до 
того, что оно означает только
 участие со стороны, прозрачность или даже 
менее того. В худших случаях оно
 <a
-href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
+href="https://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
 становится пустым модным словечком</a>.</p>
 
 <h3>Различные ценности могут вести к сх
одным заключениям&mdash; но не всегда</h3>
@@ -339,7 +345,7 @@
 пользования разрабатываются всё в большей 
степени специально для того, чтобы
 ограничить пользователей. Эта 
злонамеренная черта известна как DRM, или
 &ldquo;цифровое управление ограничениями&rdquo; 
(см. <a
-href="http://defectivebydesign.org/";>DefectiveByDesign.org</a>). Это
+href="https://defectivebydesign.org";>DefectiveByDesign.org</a>). Это
 противоположно духу свободы, которую 
свободные программы стремятся
 предоставить. И не только духу: поскольку 
цель DRM состоит в том, чтобы
 попрать вашу свободу, разработчики DRM 
стараются затруднить, сделать
@@ -472,10 +478,10 @@
 она дает вам свободу!&rdquo; Каждый раз, когда 
вы говорите &ldquo;свободная
 программа&rdquo; а не &ldquo;открытый исходный 
текст&rdquo;, вы помогаете
 нашему делу.</p>
-
+<div class="column-limit"></div>
 </div>
 
-<h4>Примечание</h4>
+<h3 class="footnote">Примечание</h3>
 
 <!-- The article is incomplete (#793776) as of 21st January 2013.
 <p>
@@ -486,12 +492,13 @@
 -->
 <p>
 Работа Лакхани и Вольфа <a
-href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>
+href="https://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>
 о мотивации разработчиков свободных 
программ</a> говорит, что значительная
 доля мотивируется взглядами, согласно 
которым программы должны быть
 свободными. И это несмотря на то, что они 
опрашивали разработчиков на
 SourceForge&nbsp;&mdash; сайте, который не разделяет 
мнения о том, что
 это&nbsp;&mdash; вопрос этики.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -501,7 +508,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
@@ -522,7 +529,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>. -->
@@ -535,10 +542,10 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2013, 2015, 2016, 2019, 2020, 2021
-Richard Stallman <br /> Copyright &copy; 2008 jeder (translation) <br />
-Copyright &copy; 2010, 2011, 2012, 2015, 2016, 2019, 2020, 2021 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2013, 2015, 2016, 2019-2021 Richard
+Stallman <br /> Copyright &copy; 2008 jeder (translation) <br /> Copyright
+&copy; 2010, 2011, 2012, 2015, 2016, 2019, 2020, 2021 Free Software
+Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -554,11 +561,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/04/27 12:30:47 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/selling.ru.html
===================================================================
RCS file: /web/www/www/philosophy/selling.ru.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- philosophy/selling.ru.html  29 Jan 2019 09:01:19 -0000      1.38
+++ philosophy/selling.ru.html  16 Jul 2021 12:02:42 -0000      1.39
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/selling.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Продажа свободных программ - Проект GNU - 
Фонд свободного программного
@@ -9,12 +12,18 @@
 
 <!--#include virtual="/philosophy/po/selling.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><em>У нас есть также <a 
href="/philosophy/selling-exceptions.html">некоторые
 соображения и мысли о платных исключениях 
из лицензий свободных программ,
 таких, как GNU GPL</a>.</em></p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Многие убеждены, что дух проекта GNU состоит 
в том, что вы не должны брать
 денег за распространение копий программ 
или что вы должны брать как можно
@@ -188,6 +197,8 @@
 отвлекаемся на такие смежные вопросы, как 
величина платы за
 распространение. Мы думаем о свободе, 
только о свободе и ни о чем, кроме
 свободы.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -197,7 +208,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
@@ -217,7 +228,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>. -->
@@ -246,8 +257,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2013, 2015, 2016, 2017, 2018
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1996-1998, 2001, 2007, 2010, 2011, 2013, 2014, 2015-2018,
+2019, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -267,7 +278,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2019/01/29 09:01:19 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/shouldbefree.ru.html
===================================================================
RCS file: /web/www/www/philosophy/shouldbefree.ru.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/shouldbefree.ru.html     26 Oct 2020 13:34:15 -0000      1.41
+++ philosophy/shouldbefree.ru.html     16 Jul 2021 12:02:42 -0000      1.42
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/shouldbefree.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему программы должны быть свободны 
- Проект GNU - Фонд свободного
@@ -9,12 +12,16 @@
 
 <!--#include virtual="/philosophy/po/shouldbefree.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></p>
-<h3 id="introduction">Введение</h3>
-<p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
+
+<div class="article">
+<p  id="introduction">
 Существование программ неизбежно 
поднимает вопрос о том, как должны
 приниматься решения по их использованию. 
Например, представьте, что некто, у
 кого есть копия программы, встречает того, 
кто хотел бы скопировать ее
@@ -47,7 +54,7 @@
 словами, писать  <a 
href="/philosophy/free-sw.html">&ldquo;свободные&rdquo;
 программы</a><a href="#f1">(1)</a>.</p>
 
-<h3 id="owner-justification">Как владельцы оправдывают 
свою власть</h3>
+<h3 id="owner-justification" class="subheader">Как владельцы 
оправдывают свою власть</h3>
 <p>
    Те, кому выгодна существующая система, в 
которой программы являются
 собственностью, выдвигают два аргумента в 
поддержку своих претензий на
@@ -94,7 +101,7 @@
 имущественные права. Если ставить вопрос 
как выбор между несвободными
 программами и отсутствием программ, то 
решение напрашивается само собой.</p>
 
-<h3 id="against-having-owners">Аргументы против наличия 
владельцев</h3>
+<h3 id="against-having-owners" class="subheader">Аргументы 
против наличия владельцев</h3>
 <p>
    Вопрос, который нас интересует&nbsp;&mdash; 
должна ли разработка программ
 быть связана с наличием владельцев, 
ограничивающих их использование?</p>
@@ -484,7 +491,7 @@
 возможность успеха в своем собственном 
узком смысле, но это не то, что
 полезно для общества. </p>
 
-<h3 id="why-develop">Почему люди будут 
разрабатывать программы</h3>
+<h3 id="why-develop" class="subheader">Почему люди будут 
разрабатывать программы</h3>
 <p>
    Если мы устраним авторское право как 
средство поощрять людей разрабатывать
 программы, то вначале будет 
разрабатываться меньше программ, но эти
@@ -638,7 +645,7 @@
 пользователи научатся поддерживать 
разработчиков без принуждения, подобно
 тому, как они уже привыкли делать это для 
общественного радио и телевидения.</p>
 
-<h3 id="productivity">Что такое производительность 
программы? </h3>
+<h3 id="productivity" class="subheader">Что такое 
производительность программы? </h3>
 <p>
    Если бы программы были свободны, 
программисты все равно нашлись бы, но
 возможно, в меньшем количестве. Было бы ли 
это плохо для общества?</p>
@@ -676,7 +683,7 @@
 втором, ограниченном, толковании 
производительности, улучшение которой
 требует сложных технических 
усовершенствований.</p>
 
-<h3 id="competition">Неизбежна ли конкуренция?</h3>
+<h3 id="competition" class="subheader">Неизбежна ли 
конкуренция?</h3>
 <p>
    Неизбежно ли люди будут стараться 
соперничать, чтобы превзойти конкурентов?
 Возможно. Но соперничество само по себе не 
вредно, вредна <em>драка</em>.</p>
@@ -718,7 +725,7 @@
 новые формы драки, которые не запрещены 
особым законом. Ресурсы общества
 разбазариваются на экономический 
эквивалент гражданской войны.</p>
 
-<h3 id="communism">&ldquo;Почему бы вам не уехать в Р
оссию?&rdquo;</h3>
+<h3 id="communism" class="subheader">&ldquo;Почему бы вам не 
уехать в Россию?&rdquo;</h3>
 <p>
    В Соединенных Штатах каждый защитник 
взглядов, отличающихся от крайних форм
 эгоистичной вседозволенности, не раз 
слышал эти слова. Например, их бросали
@@ -750,7 +757,7 @@
 с русским коммунизмом, то коммунистами 
скорее следует называть владельцев
 программ.</p>
 
-<h3 id="premises">Вопрос о предпосылках</h3>
+<h3 id="premises" class="subheader">Вопрос о предпосылках
</h3>
 <p>
    В этой работе я предполагаю, что 
пользователь программы не менее важен, чем
 автор и даже наниматель автора. Другими 
словами, их интересы и нужды имеют
@@ -791,7 +798,7 @@
 понимание того, что эта посылка&nbsp;&mdash; 
крайне правое, а не традиционно
 признанное предположение, ослабит ее 
привлекательность.</p>
 
-<h3 id="conclusion">Заключение</h3>
+<h3 id="conclusion" class="subheader">Заключение</h3>
 <p>
    Нам приятно думать, что наше общество 
поощряет помощь ближнему своему, но
 всякий раз, когда мы награждаем кого-либо 
за создание помех или восхищаемся
@@ -813,9 +820,10 @@
 этому: по крайней мере в одной области 
человеческой деятельности мы сможем
 заменить дикий лес более эффективной 
системой, которая поощряет добровольное
 сотрудничество и зиждется на нем.</p>
+<div class="column-limit"></div>
+</div>
 
-
-<h3 id="footnotes">Примечания</h3>
+<h3 id="footnotes" class="footnote">Примечания</h3>
 
 <ol>
 <li id="f1">Слово &ldquo;свободный&rdquo; в выражении 
&ldquo;свободные программы&rdquo;
@@ -842,11 +850,14 @@
 использование которой считается 
разрушительным.</li>
 </ol>
 
-<hr />
-<blockquote id="fsfs"><p>Этот очерк публикуется в 
сборнике <a
-href="http://shop.fsf.org/product/free-software-free-society/";>&ldquo;Свободные
+<hr class="thin" />
+<div id="fsfs" role="complementary">
+<p>Этот очерк публикуется в сборнике <a
+href="https://shop.fsf.org/product/free-software-free-society/";>&ldquo;Свободные
 программы, свободное общество: Избранные 
очерки
-Ричарда&nbsp;М.&nbsp;Столмена&rdquo;</a>.</p></blockquote>
+Ричарда&nbsp;М.&nbsp;Столмена&rdquo;</a>.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -856,7 +867,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
@@ -876,7 +887,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>. -->
@@ -889,8 +900,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 2018,
-2020 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2011, 2013,
+2014, 2017, 2018, 2020, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -908,7 +919,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/10/26 13:34:15 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/when-free-depends-on-nonfree.ru.html
===================================================================
RCS file: /web/www/www/philosophy/when-free-depends-on-nonfree.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/when-free-depends-on-nonfree.ru.html     12 Feb 2021 20:00:49 
-0000      1.8
+++ philosophy/when-free-depends-on-nonfree.ru.html     16 Jul 2021 12:02:42 
-0000      1.9
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/when-free-depends-on-nonfree.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Когда свободные программы зависят от 
несвободных - Проект GNU - Фонд
@@ -9,19 +12,23 @@
 
 <!--#include virtual="/philosophy/po/when-free-depends-on-nonfree.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></p>
+<address class="byline">Ричард Столмен</address>
 
+<div class="article">
 <p>Когда программа свободна (от слова 
&ldquo;свобода&rdquo;<a
-href="#tf1">[1]</a>), это значит, что она дает 
пользователям четыре свободы
-(<a href="/philosophy/free-sw.html">gnu.org/philosophy/free-sw.html</a>),
-так что они контролируют, что делает 
программа. В большинстве случаев этого
-достаточно, чтобы распространяемая 
программа была этичной; но не
-всегда. Есть дополнительные проблемы, 
которые могут возникнуть в
-специфических обстоятельствах. В этой 
статье описана неочевидная проблема,
-возникающая, когда обновление свободной 
программы требует применения
-несвободной.</p>
+href="#tf1">[1]</a>), это значит, что она дает 
пользователям <a
+href="/philosophy/free-sw.html">четыре свободы</a>, так что 
они
+контролируют, что делает программа. В 
большинстве случаев этого достаточно,
+чтобы распространяемая программа была 
этичной; но не всегда. Есть
+дополнительные проблемы, которые могут 
возникнуть в специфических
+обстоятельствах. В этой статье описана 
неочевидная проблема, возникающая,
+когда обновление свободной программы 
требует применения несвободной.</p>
 
 <p>Если пользование свободной программой 
неизбежно зависит от другой программы,
 которая несвободна, мы говорим, что 
свободная программа &ldquo;в
@@ -91,7 +98,7 @@
 программы: она требует, чтобы клиника, 
которая пользуется GNU Health,
 доверила свои собственные вычисления и 
свои данные компании-разработчику
 OpenERP. Фалкон не сдался, он перевел GNU Health на <a
-href="http://www.tryton.org";>Tryton</a>.</p>
+href="https://www.tryton.org";>Tryton</a>.</p>
 
 <p>Пользование услугой-заменой программы 
принципиально эквивалентно работе с
 несвободной программой с функциями 
слежки, а также универсальной
@@ -100,9 +107,9 @@
 предоставляющая эту услугу, никому 
никогда ни в каком виде преднамеренно эти
 данные не покажет, мы не можем быть 
уверены, что доступ к данным не получат
 <a href="/philosophy/surveillance-vs-democracy.html"> агентства 
разведки
-различных стран</a> или взломщики систем 
безопасности <a
-href="http://stallman.org/articles/on-hacking.html";>(пожалуйста, не
-называйте их &ldquo;хакерами&rdquo;)</a>.</p>
+различных стран</a> или взломщики систем 
безопасности (<a
+href="https://stallman.org/articles/on-hacking.html";>пожалуйста, не
+называйте их &ldquo;хакерами&rdquo;</a>).</p>
 
 <p>Когда программа в диахронической 
западне, вызволение ее из западни требует
 больше, чем однократной работы по 
программированию. Работу приходится делать
@@ -118,6 +125,8 @@
 подальше. И предприятия, и частные лица 
найдут прекрасные свободные
 альтернативы, у которых нет такой 
проблемы; чтобы избежать этой западни,
 нужно только распознать ее.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -135,7 +144,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
@@ -155,7 +164,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>. -->
@@ -184,7 +193,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2016, 2017, 2018, 2021 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2016-2018, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -204,7 +213,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/02/12 20:00:49 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/when-free-software-isnt-practically-superior.ru.html
===================================================================
RCS file: 
/web/www/www/philosophy/when-free-software-isnt-practically-superior.ru.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/when-free-software-isnt-practically-superior.ru.html     18 Nov 
2016 07:32:51 -0000      1.5
+++ philosophy/when-free-software-isnt-practically-superior.ru.html     16 Jul 
2021 12:02:42 -0000      1.6
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" 
value="/philosophy/when-free-software-isnt-practically-superior.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title> Когда свободная программа 
(практически) не превосходна - Проект GNU - 
Фонд
@@ -9,11 +12,16 @@
 
 <!--#include 
virtual="/philosophy/po/when-free-software-isnt-practically-superior.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="https://mako.cc/writing/";>Бенджамин Мейко 
Хилл</a></p>
+<address class="byline">
+<a href="https://mako.cc/writing/";>Бенджамин Мейко 
Хилл</a></address>
 
+<div class="article">
 <p>Заявление о задачах Инициативы 
открытого исходного текста гласит:
 &ldquo;Открытый исходный текст&nbsp;&mdash; метод 
разработки программ,
 который обуздывает энергию распределенных
 взаимных проверок и прозрачности
@@ -86,7 +94,7 @@
 текстом&rdquo;).</p>
 
 <p>Несколько научных исследований SourceForge и <a
-href="http://sv.gnu.org";>Savannah</a>&nbsp;&mdash; <a
+href="//sv.gnu.org">Savannah</a>&nbsp;&mdash; <a
 href="/software/repo-criteria.html">сайтов, 
предоставляющих инфраструктуру
 для разработки свободных программ</a>,&mdash; 
показали то, что многие
 разработчики свободных программ, которым 
доводилось размещать тексты
@@ -141,6 +149,8 @@
 поддерживать, над чем нужно работать, а не 
тем, что нужно принимать как само
 собой разумеющееся перед лицом 
свидетельств, которые отказываются 
следовать
 идеологии.</p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -150,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
@@ -170,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>. -->
@@ -199,8 +209,9 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999-2011 Benjamin Mako Hill<br />Copyright &copy; 2016
-Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1999-2011 Benjamin Mako Hill<br />
+Copyright &copy; 2013, 2015, 2016, 2021 Free Software Foundation,
+Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 
href="http://creativecommons.org/licenses/by-sa/3.0/us/deed.ru";>лицензии
@@ -220,12 +231,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2016/11/18 07:32:51 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>
-

Index: philosophy/why-free.ru.html
===================================================================
RCS file: /web/www/www/philosophy/why-free.ru.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/why-free.ru.html 26 Oct 2020 13:34:16 -0000      1.34
+++ philosophy/why-free.ru.html 16 Jul 2021 12:02:42 -0000      1.35
@@ -1,7 +1,10 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/why-free.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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему у программ не должно быть 
владельцев - Проект GNU - Фонд свободного
@@ -12,10 +15,15 @@
 
 <!--#include virtual="/philosophy/po/why-free.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></p>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
+<div class="article">
 <p>
 Цифровая информационная техника 
способствует мировому прогрессу, облегчая
 копирование и модификацию информации. 
Компьютеры обещают сделать это легким
@@ -315,17 +323,22 @@
 
 <p>
 Вы достойны свободных программ.</p>
+<div class="column-limit"></div>
+</div>
 
-<h3>Примечания</h3>
+<h3 class="footnote">Примечание</h3>
 <ol>
 <li id="footnote1">Впоследствии обвинения были 
сняты.</li>
 </ol>
 
-<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;&mdash; свободное общество: 
Избранные очерки
-Ричарда&nbsp;М.&nbsp;Столмена</cite></a></p></blockquote>
+Ричарда&nbsp;М.&nbsp;Столмена</cite></a></p>
+</div>
+</div>
 
 <div class="translators-notes">
 
@@ -335,7 +348,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
@@ -355,7 +368,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>. -->
@@ -384,8 +397,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1994, 2009, 2020 Richard Stallman<br />Copyright &copy;
-2015, 2020 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1994, 2009, 2020, 2021 Richard Stallman<br />Copyright
+&copy; 2015, 2020, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -405,11 +418,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/10/26 13:34:16 $
+$Date: 2021/07/16 12:02:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/floss-and-foss.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/floss-and-foss.ru-en.html     18 Nov 2016 07:32:55 -0000      
1.6
+++ philosophy/po/floss-and-foss.ru-en.html     16 Jul 2021 12:02:42 -0000      
1.7
@@ -1,12 +1,20 @@
 <!--#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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>FLOSS and FOSS - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/philosophy/po/floss-and-foss.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>FLOSS and FOSS</h2>
 
-<p>by <strong>Richard Stallman</strong></p>
+<address class="byline">by Richard Stallman</address>
 
+<div class="article">
 <p>The two political camps in the free software community are the free
 software movement and open source.  The free software movement is a
 campaign
@@ -55,12 +63,12 @@
 stand for freedom, and we show it every time&mdash;by saying
 &ldquo;free&rdquo; and &ldquo;libre&rdquo;&mdash; or &ldquo;free
 (libre)&rdquo;.</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
@@ -78,18 +86,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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2013, 2015, 2016 Richard Stallman</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -99,10 +107,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/18 07:32:55 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/floss-and-foss.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ru.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/floss-and-foss.ru.po  16 Jul 2021 11:43:09 -0000      1.16
+++ philosophy/po/floss-and-foss.ru.po  16 Jul 2021 12:02:42 -0000      1.17
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-11 09:25+0000\n"
 
 #. type: Content of: <title>
 msgid "FLOSS and FOSS - GNU Project - Free Software Foundation"
@@ -28,8 +27,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 "Ричард Столмен"
 
@@ -179,11 +176,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 "
@@ -201,7 +193,8 @@
 msgid "Copyright &copy; 2013, 2015, 2016, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2013, 2015, 2016, 2021 Richard Stallman<br />Copyright "
-"&copy; 2013, 2014, 2015, 2016, 2021 Free Software Foundation, Inc. 
(translation)"
+"&copy; 2013, 2014, 2015, 2016, 2021 Free Software Foundation, Inc. "
+"(translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/free-doc.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.ru-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/po/free-doc.ru-en.html   28 Dec 2019 15:30:28 -0000      1.26
+++ philosophy/po/free-doc.ru-en.html   16 Jul 2021 12:02:42 -0000      1.27
@@ -1,22 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
-<title>Why Free Software needs Free Documentation
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Why Free Software Needs Free Documentation
 - GNU Project - Free Software Foundation</title>
-
 <!--#include virtual="/philosophy/po/free-doc.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>Why Free Software Needs Free Documentation</h2>
+<div class="thin"></div>
    
-<h2>Why Free Software needs Free Documentation</h2>
-
-<blockquote class="announcement"><p>
-<a href="http://defectivebydesign.org/ebooks.html";>Join our mailing list
-about the dangers of eBooks</a>.
-</p></blockquote>
-
-<ul>
-<li><a href="/copyleft/fdl.html">The GNU Free Documentation License</a></li>
-</ul>
-
+<div class="article">
 <p>
 The biggest deficiency in free operating systems is not in the
 software&mdash;it is the lack of good free manuals that we can include
@@ -53,12 +51,19 @@
 Given that writing good English is a rare skill among programmers, we
 can ill afford to lose manuals this way.</p>
 
+<hr class="no-display" />
+<div class="announcement" role="complementary"><p>
+<a href="https://defectivebydesign.org/ebooks.html";>Join our mailing list
+about the dangers of eBooks</a>.
+</p></div>
+<hr class="no-display" />
+
 <p>
 Free documentation, like free software, is a matter of freedom, not
 price.  The problem with these manuals was not that O'Reilly
 Associates charged a price for printed copies&mdash;that in itself is
 fine.  (The Free Software Foundation
-<a href="http://shop.fsf.org/category/books/";>sells printed
+<a href="https://shop.fsf.org/category/books/";>sells printed
 copies</a> of free <a href="/doc/doc.html">GNU manuals</a>, too.)  But
 GNU manuals are available in source code form, while these manuals are
 available only on paper.  GNU manuals come with permission to copy and
@@ -71,6 +76,10 @@
 permitted, so that the manual can accompany every copy of the program,
 on line or on paper.  Permission for modification is crucial too.</p>
 
+<ul>
+<li><a href="/licenses/fdl.html">The GNU Free Documentation License</a></li>
+</ul>
+
 <p>
 As a general rule, I don't believe that it is essential for people to
 have permission to modify all sorts of articles and books.  The issues
@@ -147,10 +156,12 @@
 <p>
 [Note: We maintain a <a href="/doc/other-free-books.html">page
 that lists free books available from other publishers</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
@@ -168,13 +179,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>
 
@@ -195,8 +206,8 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2009, 2015, 2016, 2019 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1996-2007, 2009, 2015, 2016, 2019, 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
@@ -206,10 +217,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/28 15:30:28 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/free-doc.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-doc.ru.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/po/free-doc.ru.po        16 Jul 2021 11:43:09 -0000      1.29
+++ philosophy/po/free-doc.ru.po        16 Jul 2021 12:02:42 -0000      1.30
@@ -1,6 +1,5 @@
 # Russian translation for http://gnu.org/philosophy/free-doc.html
-# Copyright (C) 1996-2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019, \
-#               2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019, #         
      2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # Ineiev <ineiev@gnu.org>, 2010, 2011, 2013, 2016, 2019, 2021
 # Alexander Barakin <a-barakin@ukr.net>, 2010
@@ -16,17 +15,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-11 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"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-# | Why Free Software [-n-]{+N+}eeds Free Documentation - GNU Project - Free
-# | Software Foundation
-#| msgid ""
-#| "Why Free Software needs Free Documentation - GNU Project - Free Software "
-#| "Foundation"
 msgid ""
 "Why Free Software Needs Free Documentation - GNU Project - Free Software "
 "Foundation"
@@ -36,8 +29,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h2>
-# | Why Free Software [-n-]{+N+}eeds Free Documentation
-#| msgid "Why Free Software needs Free Documentation"
 msgid "Why Free Software Needs Free Documentation"
 msgstr "Почему свободным программам нужна 
свободная документация"
 
@@ -117,11 +108,6 @@
 "таким образом."
 
 #. type: Content of: <div><div><div><p>
-# | <a href=\"http{+s+}://defectivebydesign.org/ebooks.html\">Join our mailing
-# | list about the dangers of eBooks</a>.
-#| msgid ""
-#| "<a href=\"http://defectivebydesign.org/ebooks.html\";>Join our mailing "
-#| "list about the dangers of eBooks</a>."
 msgid ""
 "<a href=\"https://defectivebydesign.org/ebooks.html\";>Join our mailing list "
 "about the dangers of eBooks</a>."
@@ -131,25 +117,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Free documentation, like free software, is a matter of freedom, not price.
-# |  The problem with these manuals was not that O'Reilly Associates charged a
-# | price for printed copies&mdash;that in itself is fine.  (The Free Software
-# | Foundation <a href=\"http{+s+}://shop.fsf.org/category/books/\">sells
-# | printed copies</a> of free <a href=\"/doc/doc.html\">GNU manuals</a>,
-# | too.)  But GNU manuals are available in source code form, while these
-# | manuals are available only on paper.  GNU manuals come with permission to
-# | copy and modify; the Perl manuals do not.  These restrictions are the
-# | problems.
-#| msgid ""
-#| "Free documentation, like free software, is a matter of freedom, not "
-#| "price.  The problem with these manuals was not that O'Reilly Associates "
-#| "charged a price for printed copies&mdash;that in itself is fine.  (The "
-#| "Free Software Foundation <a href=\"http://shop.fsf.org/category/books/";
-#| "\">sells printed copies</a> of free <a href=\"/doc/doc.html\">GNU "
-#| "manuals</a>, too.)  But GNU manuals are available in source code form, "
-#| "while these manuals are available only on paper.  GNU manuals come with "
-#| "permission to copy and modify; the Perl manuals do not.  These "
-#| "restrictions are the problems."
 msgid ""
 "Free documentation, like free software, is a matter of freedom, not price.  "
 "The problem with these manuals was not that O'Reilly Associates charged a "
@@ -163,9 +130,9 @@
 "Свободная документация, как и свободные 
программы, означает свободу, а не "
 "стоимость. Проблема этих книг заключалась 
не в том, что O'Reilly Associates "
 "взимала плату за типографские 
копии&nbsp;&mdash; само по себе это не плохо. "
-"(Фонд свободного программного 
обеспечения тоже <a href=\"https://shop.fsf.org/";
-"category/books/\">продает типографские копии</a> 
свободной <a href=\"/doc/"
-"doc.html\">документации GNU</a>.) Но документация 
GNU доступна в виде "
+"(Фонд свободного программного 
обеспечения тоже <a href=\"https://shop.fsf.";
+"org/category/books/\">продает типографские копии</a> 
свободной <a href=\"/"
+"doc/doc.html\">документации GNU</a>.) Но 
документация GNU доступна в виде "
 "исходного текста, а эти 
руководства&nbsp;&mdash; только в печатном виде. "
 "Руководства GNU разрешено копировать и 
изменять; руководства по Перл&nbsp;"
 "&mdash; нет. Проблема заключается в этих 
ограничениях."
@@ -188,10 +155,6 @@
 
 # type: Content of: <ul><li>
 #. type: Content of: <div><div><ul><li>
-# | <a [-href=\"/copyleft/fdl.html\">The-] {+href=\"/licenses/fdl.html\">The+}
-# | GNU Free Documentation License</a>
-#| msgid ""
-#| "<a href=\"/copyleft/fdl.html\">The GNU Free Documentation License</a>"
 msgid "<a href=\"/licenses/fdl.html\">The GNU Free Documentation License</a>"
 msgstr "<a href=\"/licenses/fdl.html\">Лицензия свободной 
документации GNU</a>"
 
@@ -390,11 +353,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 "
@@ -409,16 +367,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014,-] {+1996-2007, 2009,+} 2015, 2016, [-2017-]
-# | {+2019, 2021+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996-2007, 2009, 2015, 2016, 2019, 2021 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996-2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019, "
-"2021 Free Software Foundation, Inc."
+"Copyright &copy; 1996-2007, 2009, 2010, 2011, 2013, 2015, 2016, 2019, 2021 "
+"Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/free-open-overlap.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.ru-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/free-open-overlap.ru-en.html  8 Jan 2015 16:57:02 -0000       
1.4
+++ philosophy/po/free-open-overlap.ru-en.html  16 Jul 2021 12:02:42 -0000      
1.5
@@ -1,17 +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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>How Free Software and Open Source Relate as Categories of
 Programs
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/philosophy/po/free-open-overlap.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>How Free Software and Open Source Relate as Categories of Programs</h2>
 
 <p>Here's how <a href="/philosophy/open-source-misses-the-point.html">free 
software and open source</a> relate as categories of 
 programs:</p>
 
+<div style="max-width:max-content; padding:1em 1.5em; background:#f3f3f3">
 <pre>
-<code>
        /----------------------------------------------\
       / |                                            | \
      /  |                                            |  \
@@ -29,8 +36,8 @@
        \----------------------------------------------  /
         |     tivoized (tyrant) devices          | O | /
         ----------------------------------------------/
-</code>
 </pre>
+</div>
 
 <p>Among all programs that are open source, only a minuscule fraction
 are not free.  If the bottom row were drawn to scale, its text would
@@ -51,10 +58,11 @@
 are still used.</p>
 
 <p>Most nonfree licenses are not open source either.</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
@@ -72,30 +80,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; 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015, 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: 2015/01/08 16:57:02 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/free-open-overlap.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.ru.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/free-open-overlap.ru.po       16 Jul 2021 11:43:09 -0000      
1.13
+++ philosophy/po/free-open-overlap.ru.po       16 Jul 2021 12:02:42 -0000      
1.14
@@ -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-11 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -39,43 +38,7 @@
 "текста</a>:"
 
 #. type: Content of: <div><div><pre>
-# | [-<code>\\n-]       /----------------------------------------------\\\\n  
-# |    / |                                            | \\\\n     /  |        
-# |                                    |  \\\\n    /   |                      
-# |                      |   \\\\n        |                                   
-# |         |\\n        |       Source license is GNU *GPL, Apache,  |\\n     
-# |   |        original BSD, modified BSD,         |\\nfree    |        X11,
-# | expat, Python, MPL, etc.,      |\\n        |        and executable is not
-# | tivoized      |   open source\\n        |                                 
-# |           | \\n        |                                            |\\n  
-# |  \\   |                                            |\\n     \\  |         
-# |                                   |\\n      \\ |                          
-# |                  |   /\\n      
-# | \\----------------------------------------------  /\\n        |    
-# | tivoized (tyrant) devices          | O | /\\n       
-# | [-----------------------------------------------/\\n</code>\\n-]       
-# | {+----------------------------------------------/\\n+}
 #, no-wrap
-#| msgid ""
-#| "<code>\n"
-#| "       /----------------------------------------------\\\n"
-#| "      / |                                            | \\\n"
-#| "     /  |                                            |  \\\n"
-#| "    /   |                                            |   \\\n"
-#| "        |                                            |\n"
-#| "        |       Source license is GNU *GPL, Apache,  |\n"
-#| "        |        original BSD, modified BSD,         |\n"
-#| "free    |        X11, expat, Python, MPL, etc.,      |\n"
-#| "        |        and executable is not tivoized      |   open source\n"
-#| "        |                                            | \n"
-#| "        |                                            |\n"
-#| "    \\   |                                            |\n"
-#| "     \\  |                                            |\n"
-#| "      \\ |                                            |   /\n"
-#| "       \\----------------------------------------------  /\n"
-#| "        |     tivoized (tyrant) devices          | O | /\n"
-#| "        ----------------------------------------------/\n"
-#| "</code>\n"
 msgid ""
 "       /----------------------------------------------\\\n"
 "      / |                                            | \\\n"
@@ -191,11 +154,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 "
@@ -214,11 +172,6 @@
 msgstr "Copyright &copy; 2015, 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/hague.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/hague.ru-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/hague.ru-en.html      12 Apr 2014 13:58:58 -0000      1.3
+++ philosophy/po/hague.ru-en.html      16 Jul 2021 12:02:42 -0000      1.4
@@ -232,7 +232,7 @@
 -->
 <p>
 There is more information about the problems with the Hague
-at <a 
href="http://web.lemuria.org/DeCSS/hague.html";>http://web.lemuria.org/DeCSS/hague.html</a>.</p>
+at <a 
href="https://web.archive.org/web/20210507012748/http://web.lemuria.org/DeCSS/hague.html";>web.lemuria.org</a>.</p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -262,18 +262,18 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001 Richard Stallman<br />
-Copyright &copy; 2001 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001, 2021 Richard Stallman<br />
+Copyright &copy; 2001, 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:58:58 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/hague.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/hague.ru.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/hague.ru.po   16 Jul 2021 11:43:09 -0000      1.8
+++ philosophy/po/hague.ru.po   16 Jul 2021 12:02:42 -0000      1.9
@@ -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-10 06:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Harm from the Hague - GNU Project - Free Software Foundation"
@@ -446,14 +445,6 @@
 "проинформировать министерства и 
общественность о возможных опасностях."
 
 #. type: Content of: <p>
-# | There is more information about the problems with the Hague at <a
-# | 
[-href=\"http://web.lemuria.org/DeCSS/hague.html\";>http://web.lemuria.org/DeCSS/hague.html</a>.-]
-# | {+href=\"https://web.archive.org/web/20210507012748/http://web.lemuria.org/
-# | DeCSS/hague.html\">web.lemuria.org</a>.+}
-#| msgid ""
-#| "There is more information about the problems with the Hague at <a href="
-#| "\"http://web.lemuria.org/DeCSS/hague.html\";>http://web.lemuria.org/DeCSS/";
-#| "hague.html</a>."
 msgid ""
 "There is more information about the problems with the Hague at <a href="
 "\"https://web.archive.org/web/20210507012748/http://web.lemuria.org/DeCSS/";
@@ -515,14 +506,10 @@
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2001, 2021 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2001, 2013, 2014, 2017, 2021 Free Software 
Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2001, 2013, 2014, 2017, 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/linux-gnu-freedom.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/linux-gnu-freedom.ru-en.html  30 Dec 2019 12:08:32 -0000      
1.23
+++ philosophy/po/linux-gnu-freedom.ru-en.html  16 Jul 2021 12:02:42 -0000      
1.24
@@ -1,17 +1,24 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.90 -->
-<title>Linux, GNU, and freedom
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Linux, GNU, and Freedom
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords"
       content="GNU, FSF, Free Software Foundation, Linux, freedom, software, 
power, rights, Richard Stallman, rms, SIGLINUX, Joe Barr" />
 <meta http-equiv="Description" content="In this essay, Linux, GNU, and 
freedom, Richard M. Stallman responds to Joe Barr's account of the FSF's 
dealings with the Austin Linux users group." />
 <!--#include virtual="/philosophy/po/linux-gnu-freedom.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Linux, GNU, and freedom</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Linux, GNU, and Freedom</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong></p>
+<address class="byline">by Richard M. Stallman</address>
 
+<div class="article">
 <p>
   Since <a
   
href="https://web.archive.org/web/20190404115541/http://linux.sys-con.com/node/32755";>Joe
 Barr's
@@ -94,7 +101,7 @@
   There are people like Barr, that want their software &ldquo;free
   from ideology&rdquo; and criticize anyone that says freedom matters.
   There are people like Torvalds that will pressure our community into
-  use of a non-free program, and challenge anyone who complains to
+  use of a nonfree program, and challenge anyone who complains to
   provide a (technically) better program immediately or shut up.
   There are people who say that technical decisions should not be
   &ldquo;politicized&rdquo; by consideration of their social
@@ -111,11 +118,11 @@
   Television Promotion Act">CBDTPA</abbr>
   (formerly <abbr title="Security Systems Standards and Certification 
Act">SSSCA</abbr>),
   by the Broadcast &ldquo;Protection&rdquo; Discussion Group
-  (see <a href="http://www.eff.org/";>http://www.eff.org/</a>) which
+  (see <a href="https://www.eff.org/";>www.eff.org</a>) which
   proposes to prohibit free software to access digital TV broadcasts,
   by software patents (Europe is now considering whether to have
   software patents), by Microsoft nondisclosure agreements for vital
-  protocols, and by everyone who tempts us with a non-free program
+  protocols, and by everyone who tempts us with a nonfree program
   that is &ldquo;better&rdquo; (technically) than available free
   programs.  We can lose our freedom again just as we lost it the
   first time, if we don't care enough to protect it.</p>
@@ -123,17 +130,17 @@
   Will enough of us care?  That depends on many things; among them,
   how much influence the GNU Project has, and how much influence Linus
   Torvalds has.  The GNU Project says, &ldquo;Value your
-  freedom!&rdquo;.  Joe Barr says, &ldquo;Choose between non-free and
+  freedom!&rdquo;.  Joe Barr says, &ldquo;Choose between nonfree and
   free programs on technical grounds alone!&rdquo;.  If people credit
   Torvalds as the main developer of the GNU/Linux system, that's not
   just inaccurate, it also makes his message more
-  influential&mdash;and that message says, &ldquo;Non-free software is
-  ok; I use it and develop it myself.&rdquo; If they recognize our
+  influential&mdash;and that message says, &ldquo;Nonfree software is
+  OK; I use it and develop it myself.&rdquo; If they recognize our
   role, they will listen to us more, and the message we will give them
   is, &ldquo;This system exists because of people who care about
   freedom. Join us, value your freedom, and together we can preserve
   it.&rdquo;
-  See <a 
href="/gnu/thegnuproject.html">http://www.gnu.org/gnu/thegnuproject.html</a>
+  See <a href="/gnu/thegnuproject.html">The GNU Project</a>
   for the history.</p>
 <p>
   When I ask people to call the system GNU/Linux, some of them respond
@@ -150,7 +157,7 @@
   Project campaign for freedom.</p>
 <p>
   Since this came up in the context of Linux (the kernel) and Bitkeeper,
-  the non-free version control system that Linus Torvalds now uses, I'd
+  the nonfree version control system that Linus Torvalds now uses, I'd
   like to address that issue as well.</p>
 
 <h3 id="bitkeeper">Bitkeeper issue</h3>
@@ -159,10 +166,10 @@
 <p>
   The use of Bitkeeper for the Linux sources has a grave effect on the
   free software community, because anyone who wants to closely track
-  patches to Linux can only do it by installing that non-free program.
+  patches to Linux can only do it by installing that nonfree program.
   There must be dozens or even hundreds of kernel hackers who have done
   this.  Most of them are gradually convincing themselves that it is ok
-  to use non-free software, in order to avoid a sense of cognitive
+  to use nonfree software, in order to avoid a sense of cognitive
   dissonance about the presence of Bitkeeper on their machines.  What
   can be done about this?</p>
 <p>
@@ -173,14 +180,14 @@
   That update process could run automatically and frequently.</p>
 <p>
   The FSF cannot do this, because we cannot install Bitkeeper on our
-  machines.  We have no non-free systems or applications on them now,
+  machines.  We have no nonfree systems or applications on them now,
   and our principles say we must keep it that way.  Operating this
   repository would have to be done by someone else who is willing to
   have Bitkeeper on his machine, unless someone can find or make a way
   to do it using free software.</p>
 <p>
   The Linux sources themselves have an even more serious problem with
-  non-free software: they actually contain some.  Quite a few device
+  nonfree software: they actually contain some.  Quite a few device
   drivers contain series of numbers that represent firmware programs to
   be installed in the device.  These programs are not free software.  A
   few numbers to be deposited into device registers are one thing; a
@@ -196,11 +203,11 @@
   The Linux developers have a plan to move these firmware programs
   into separate files; it will take a few years to mature, but when
   completed it will solve the secondary problem; we could make a
-  &ldquo;free Linux&rdquo; version that doesn't have the non-free
+  &ldquo;free Linux&rdquo; version that doesn't have the nonfree
   firmware files.  That by itself won't do much good if most people
-  use the non-free &ldquo;official&rdquo; version of Linux.  That may
+  use the nonfree &ldquo;official&rdquo; version of Linux.  That may
   well occur, because on many platforms the free version won't run
-  without the non-free firmware.  The &ldquo;free Linux&rdquo; project
+  without the nonfree firmware.  The &ldquo;free Linux&rdquo; project
   will have to figure out what the firmware does and write source code
   for it, perhaps in assembler language for whatever embedded
   processor it runs on.  It's a daunting job.  It would be less
@@ -210,7 +217,7 @@
   that the job is not necessary.</p>
 <p>
   Linux, the kernel, is often thought of as the flagship of free
-  software, yet its current version is partially non-free.  How did
+  software, yet its current version is partially nonfree.  How did
   this happen?  This problem, like the decision to use Bitkeeper,
   reflects the attitude of the original developer of Linux, a person
   who thinks that &ldquo;technically better&rdquo; is more important
@@ -219,19 +226,23 @@
   Value your freedom, or you will lose it, teaches history.
   &ldquo;Don't bother us with politics,&rdquo; respond those who don't
   want to learn.</p>
+<div class="column-limit"></div>
 
 <p id="update">
   <strong>Update:</strong> Since 2005, BitKeeper
   is no longer used to manage the Linux kernel source tree.  See the
   article, <a href="/philosophy/mcvoy.html">Thank You, Larry
-  McVoy</a>.  The Linux sources still contain non-free firmware blobs,
+  McVoy</a>.  The Linux sources still contain nonfree firmware blobs,
   but as of January 2008,
   a <a href="//directory.fsf.org/project/linux"> free version of
   Linux</a> is now maintained for use in free GNU/Linux
   distributions.</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
@@ -249,16 +260,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; 2002, 2017, 2019 Richard M. Stallman</p>
+<p>Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -268,10 +279,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/30 12:08:32 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/linux-gnu-freedom.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/linux-gnu-freedom.ru.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/po/linux-gnu-freedom.ru.po       16 Jul 2021 11:43:11 -0000      
1.33
+++ philosophy/po/linux-gnu-freedom.ru.po       16 Jul 2021 12:02:42 -0000      
1.34
@@ -16,12 +16,9 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-11 08:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
-# | Linux, GNU, and [-f-]{+F+}reedom - GNU Project - Free Software Foundation
-#| msgid "Linux, GNU, and freedom - GNU Project - Free Software Foundation"
 msgid "Linux, GNU, and Freedom - GNU Project - Free Software Foundation"
 msgstr ""
 "Linux, GNU и свобода - Проект GNU - Фонд 
свободного программного обеспечения "
@@ -47,15 +44,11 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h2>
-# | Linux, GNU, and [-f-]{+F+}reedom
-#| msgid "Linux, GNU, and freedom"
 msgid "Linux, GNU, and Freedom"
 msgstr "Linux, GNU и свобода"
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by Richard {+M.+} Stallman
-#| msgid "by Richard Stallman"
 msgid "by Richard M. Stallman"
 msgstr "Ричард Столмен"
 
@@ -226,27 +219,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Calling this variant of the GNU system &ldquo;Linux&rdquo; plays into the
-# | hands of people who choose their software based only on technical
-# | advantage, not caring whether it respects their freedom.  There are people
-# | like Barr, that want their software &ldquo;free from ideology&rdquo; and
-# | criticize anyone that says freedom matters.  There are people like
-# | Torvalds that will pressure our community into use of a non[---]free
-# | program, and challenge anyone who complains to provide a (technically)
-# | better program immediately or shut up.  There are people who say that
-# | technical decisions should not be &ldquo;politicized&rdquo; by
-# | consideration of their social consequences.
-#| msgid ""
-#| "Calling this variant of the GNU system &ldquo;Linux&rdquo; plays into the "
-#| "hands of people who choose their software based only on technical "
-#| "advantage, not caring whether it respects their freedom.  There are "
-#| "people like Barr, that want their software &ldquo;free from "
-#| "ideology&rdquo; and criticize anyone that says freedom matters.  There "
-#| "are people like Torvalds that will pressure our community into use of a "
-#| "non-free program, and challenge anyone who complains to provide a "
-#| "(technically) better program immediately or shut up.  There are people "
-#| "who say that technical decisions should not be &ldquo;politicized&rdquo; "
-#| "by consideration of their social consequences."
 msgid ""
 "Calling this variant of the GNU system &ldquo;Linux&rdquo; plays into the "
 "hands of people who choose their software based only on technical advantage, "
@@ -292,32 +264,6 @@
 #  NOTE: (see <a href=\"http://www.eff.org/"; "\">http://www.eff.org/</a>)
 #         moved down to a translator footnote -- ineiev
 #. type: Content of: <div><div><p>
-# | We have partial freedom today, but our freedom is not secure.  It is
-# | threatened by the <abbr title=\"Consumer Broadband and Digital Television
-# | Promotion Act\">CBDTPA</abbr> (formerly <abbr title=\"Security Systems
-# | Standards and Certification Act\">SSSCA</abbr>), by the Broadcast
-# | &ldquo;Protection&rdquo; Discussion Group (see <a
-# | [-href=\"http://www.eff.org/\";>http://www.eff.org/</a>)-]
-# | {+href=\"https://www.eff.org/\";>www.eff.org</a>)+} which proposes to
-# | prohibit free software to access digital TV broadcasts, by software
-# | patents (Europe is now considering whether to have software patents), by
-# | Microsoft nondisclosure agreements for vital protocols, and by everyone
-# | who tempts us with a non[---]free program that is &ldquo;better&rdquo;
-# | (technically) than available free programs.  We can lose our freedom again
-# | just as we lost it the first time, if we don't care enough to protect it.
-#| msgid ""
-#| "We have partial freedom today, but our freedom is not secure.  It is "
-#| "threatened by the <abbr title=\"Consumer Broadband and Digital Television "
-#| "Promotion Act\">CBDTPA</abbr> (formerly <abbr title=\"Security Systems "
-#| "Standards and Certification Act\">SSSCA</abbr>), by the Broadcast &ldquo;"
-#| "Protection&rdquo; Discussion Group (see <a href=\"http://www.eff.org/";
-#| "\">http://www.eff.org/</a>) which proposes to prohibit free software to "
-#| "access digital TV broadcasts, by software patents (Europe is now "
-#| "considering whether to have software patents), by Microsoft nondisclosure "
-#| "agreements for vital protocols, and by everyone who tempts us with a non-"
-#| "free program that is &ldquo;better&rdquo; (technically) than available "
-#| "free programs.  We can lose our freedom again just as we lost it the "
-#| "first time, if we don't care enough to protect it."
 msgid ""
 "We have partial freedom today, but our freedom is not secure.  It is "
 "threatened by the <abbr title=\"Consumer Broadband and Digital Television "
@@ -349,34 +295,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Will enough of us care? That depends on many things; among them, how much
-# | influence the GNU Project has, and how much influence Linus Torvalds has. 
-# | The GNU Project says, &ldquo;Value your freedom!&rdquo;.  Joe Barr says,
-# | &ldquo;Choose between non[---]free and free programs on technical grounds
-# | alone!&rdquo;.  If people credit Torvalds as the main developer of the
-# | GNU/Linux system, that's not just inaccurate, it also makes his message
-# | more influential&mdash;and that message says, &ldquo;Non[---]free software
-# | is [-ok;-] {+OK;+} I use it and develop it myself.&rdquo; If they
-# | recognize our role, they will listen to us more, and the message we will
-# | give them is, &ldquo;This system exists because of people who care about
-# | freedom. Join us, value your freedom, and together we can preserve
-# | it.&rdquo; See <a
-# | 
[-href=\"/gnu/thegnuproject.html\">http://www.gnu.org/gnu/thegnuproject.html</a>-]
-# | {+href=\"/gnu/thegnuproject.html\">The GNU Project</a>+} for the history.
-#| msgid ""
-#| "Will enough of us care? That depends on many things; among them, how much "
-#| "influence the GNU Project has, and how much influence Linus Torvalds "
-#| "has.  The GNU Project says, &ldquo;Value your freedom!&rdquo;.  Joe Barr "
-#| "says, &ldquo;Choose between non-free and free programs on technical "
-#| "grounds alone!&rdquo;.  If people credit Torvalds as the main developer "
-#| "of the GNU/Linux system, that's not just inaccurate, it also makes his "
-#| "message more influential&mdash;and that message says, &ldquo;Non-free "
-#| "software is ok; I use it and develop it myself.&rdquo; If they recognize "
-#| "our role, they will listen to us more, and the message we will give them "
-#| "is, &ldquo;This system exists because of people who care about freedom. "
-#| "Join us, value your freedom, and together we can preserve it.&rdquo; See "
-#| "<a href=\"/gnu/thegnuproject.html\">http://www.gnu.org/gnu/thegnuproject.";
-#| "html</a> for the history."
 msgid ""
 "Will enough of us care? That depends on many things; among them, how much "
 "influence the GNU Project has, and how much influence Linus Torvalds has.  "
@@ -404,8 +322,8 @@
 "их&rdquo;. Если они признают нашу роль, то они 
будут больше прислушиваться \n"
 "к нашим словам, и они от нас услышат: 
&ldquo;Эта система существует "
 "благодаря тем, кому небезразлична 
свобода. Присоединяйтесь к нам, цените "
-"свою свободу, и вместе мы сохраним ее&rdquo;. 
См. историю проекта на странице <a href="
-"\"/gnu/thegnuproject.html\">Проект GNU</a>."
+"свою свободу, и вместе мы сохраним ее&rdquo;. 
См. историю проекта на "
+"странице <a href=\"/gnu/thegnuproject.html\">Проект GNU</a>."
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
@@ -441,13 +359,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Since this came up in the context of Linux (the kernel) and Bitkeeper, the
-# | non[---]free version control system that Linus Torvalds now uses, I'd like
-# | to address that issue as well.
-#| msgid ""
-#| "Since this came up in the context of Linux (the kernel) and Bitkeeper, "
-#| "the non-free version control system that Linus Torvalds now uses, I'd "
-#| "like to address that issue as well."
 msgid ""
 "Since this came up in the context of Linux (the kernel) and Bitkeeper, the "
 "nonfree version control system that Linus Torvalds now uses, I'd like to "
@@ -469,21 +380,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The use of Bitkeeper for the Linux sources has a grave effect on the free
-# | software community, because anyone who wants to closely track patches to
-# | Linux can only do it by installing that non[---]free program.  There must
-# | be dozens or even hundreds of kernel hackers who have done this.  Most of
-# | them are gradually convincing themselves that it is ok to use non[---]free
-# | software, in order to avoid a sense of cognitive dissonance about the
-# | presence of Bitkeeper on their machines.  What can be done about this?
-#| msgid ""
-#| "The use of Bitkeeper for the Linux sources has a grave effect on the free "
-#| "software community, because anyone who wants to closely track patches to "
-#| "Linux can only do it by installing that non-free program.  There must be "
-#| "dozens or even hundreds of kernel hackers who have done this.  Most of "
-#| "them are gradually convincing themselves that it is ok to use non-free "
-#| "software, in order to avoid a sense of cognitive dissonance about the "
-#| "presence of Bitkeeper on their machines.  What can be done about this?"
 msgid ""
 "The use of Bitkeeper for the Linux sources has a grave effect on the free "
 "software community, because anyone who wants to closely track patches to "
@@ -522,19 +418,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The FSF cannot do this, because we cannot install Bitkeeper on our
-# | machines.  We have no non[---]free systems or applications on them now,
-# | and our principles say we must keep it that way.  Operating this
-# | repository would have to be done by someone else who is willing to have
-# | Bitkeeper on his machine, unless someone can find or make a way to do it
-# | using free software.
-#| msgid ""
-#| "The FSF cannot do this, because we cannot install Bitkeeper on our "
-#| "machines.  We have no non-free systems or applications on them now, and "
-#| "our principles say we must keep it that way.  Operating this repository "
-#| "would have to be done by someone else who is willing to have Bitkeeper on "
-#| "his machine, unless someone can find or make a way to do it using free "
-#| "software."
 msgid ""
 "The FSF cannot do this, because we cannot install Bitkeeper on our "
 "machines.  We have no nonfree systems or applications on them now, and our "
@@ -553,19 +436,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The Linux sources themselves have an even more serious problem with
-# | non[---]free software: they actually contain some.  Quite a few device
-# | drivers contain series of numbers that represent firmware programs to be
-# | installed in the device.  These programs are not free software.  A few
-# | numbers to be deposited into device registers are one thing; a substantial
-# | program in binary is another.
-#| msgid ""
-#| "The Linux sources themselves have an even more serious problem with non-"
-#| "free software: they actually contain some.  Quite a few device drivers "
-#| "contain series of numbers that represent firmware programs to be "
-#| "installed in the device.  These programs are not free software.  A few "
-#| "numbers to be deposited into device registers are one thing; a "
-#| "substantial program in binary is another."
 msgid ""
 "The Linux sources themselves have an even more serious problem with nonfree "
 "software: they actually contain some.  Quite a few device drivers contain "
@@ -602,35 +472,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The Linux developers have a plan to move these firmware programs into
-# | separate files; it will take a few years to mature, but when completed it
-# | will solve the secondary problem; we could make a &ldquo;free Linux&rdquo;
-# | version that doesn't have the non[---]free firmware files.  That by itself
-# | won't do much good if most people use the non[---]free
-# | &ldquo;official&rdquo; version of Linux.  That may well occur, because on
-# | many platforms the free version won't run without the non[---]free
-# | firmware.  The &ldquo;free Linux&rdquo; project will have to figure out
-# | what the firmware does and write source code for it, perhaps in assembler
-# | language for whatever embedded processor it runs on.  It's a daunting job.
-# |  It would be less daunting if we had done it little by little over the
-# | years, rather than letting it mount up.  In recruiting people to do this
-# | job, we will have to overcome the idea, spread by some Linux developers,
-# | that the job is not necessary.
-#| msgid ""
-#| "The Linux developers have a plan to move these firmware programs into "
-#| "separate files; it will take a few years to mature, but when completed it "
-#| "will solve the secondary problem; we could make a &ldquo;free "
-#| "Linux&rdquo; version that doesn't have the non-free firmware files.  That "
-#| "by itself won't do much good if most people use the non-free &ldquo;"
-#| "official&rdquo; version of Linux.  That may well occur, because on many "
-#| "platforms the free version won't run without the non-free firmware.  The "
-#| "&ldquo;free Linux&rdquo; project will have to figure out what the "
-#| "firmware does and write source code for it, perhaps in assembler language "
-#| "for whatever embedded processor it runs on.  It's a daunting job.  It "
-#| "would be less daunting if we had done it little by little over the years, "
-#| "rather than letting it mount up.  In recruiting people to do this job, we "
-#| "will have to overcome the idea, spread by some Linux developers, that the "
-#| "job is not necessary."
 msgid ""
 "The Linux developers have a plan to move these firmware programs into "
 "separate files; it will take a few years to mature, but when completed it "
@@ -666,17 +507,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Linux, the kernel, is often thought of as the flagship of free software,
-# | yet its current version is partially non[---]free.  How did this happen?
-# | This problem, like the decision to use Bitkeeper, reflects the attitude of
-# | the original developer of Linux, a person who thinks that
-# | &ldquo;technically better&rdquo; is more important than freedom.
-#| msgid ""
-#| "Linux, the kernel, is often thought of as the flagship of free software, "
-#| "yet its current version is partially non-free.  How did this happen? This "
-#| "problem, like the decision to use Bitkeeper, reflects the attitude of the "
-#| "original developer of Linux, a person who thinks that &ldquo;technically "
-#| "better&rdquo; is more important than freedom."
 msgid ""
 "Linux, the kernel, is often thought of as the flagship of free software, yet "
 "its current version is partially nonfree.  How did this happen? This "
@@ -702,19 +532,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | <strong>Update:</strong> Since 2005, BitKeeper is no longer used to manage
-# | the Linux kernel source tree.  See the article, <a
-# | href=\"/philosophy/mcvoy.html\">Thank You, Larry McVoy</a>.  The Linux
-# | sources still contain non[---]free firmware blobs, but as of January 2008,
-# | a <a href=\"//directory.fsf.org/project/linux\"> free version of Linux</a>
-# | is now maintained for use in free GNU/Linux distributions.
-#| msgid ""
-#| "<strong>Update:</strong> Since 2005, BitKeeper is no longer used to "
-#| "manage the Linux kernel source tree.  See the article, <a href=\"/"
-#| "philosophy/mcvoy.html\">Thank You, Larry McVoy</a>.  The Linux sources "
-#| "still contain non-free firmware blobs, but as of January 2008, a <a href="
-#| "\"//directory.fsf.org/project/linux\"> free version of Linux</a> is now "
-#| "maintained for use in free GNU/Linux distributions."
 msgid ""
 "<strong>Update:</strong> Since 2005, BitKeeper is no longer used to manage "
 "the Linux kernel source tree.  See the article, <a href=\"/philosophy/mcvoy."
@@ -746,8 +563,10 @@
 "li>\n"
 "<li id=\"ft3\">См. &ldquo;<span lang=\"en\" xml:lang=\"en\">Broadcast "
 "Protection Discussion Group</span>&rdquo; на <a href=\"https://www.eff.org/";
-"\">http://www.eff.org/</a>)</li>\n<li id=\"ft4\">Стандартная 
общественная "
-"лицензия GNU; лицензия, по которой 
распространяется Linux.</li>\n</ol>"
+"\">http://www.eff.org/</a>)</li>\n"
+"<li id=\"ft4\">Стандартная общественная 
лицензия GNU; лицензия, по которой "
+"распространяется Linux.</li>\n"
+"</ol>"
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -775,11 +594,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 "
@@ -797,8 +611,8 @@
 msgid "Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman"
 msgstr ""
 "Copyright &copy; 2002, 2017, 2019, 2021 Richard M. Stallman<br />Copyright "
-"&copy; 2010, 2011, 2013, 2014, 2017, 2020, 2021 Free Software Foundation, 
Inc. "
-"(translation)"
+"&copy; 2010, 2011, 2013, 2014, 2017, 2020, 2021 Free Software Foundation, "
+"Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/open-source-misses-the-point.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.ru-en.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/po/open-source-misses-the-point.ru-en.html       27 Apr 2021 
12:30:47 -0000      1.48
+++ philosophy/po/open-source-misses-the-point.ru-en.html       16 Jul 2021 
12:02:42 -0000      1.49
@@ -1,16 +1,22 @@
 <!--#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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why Open Source Misses the Point of Free Software - GNU Project - 
 Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/open-source-misses-the-point.translist" 
-->
 <!--#include virtual="/server/banner.html" -->
-<h2>Why Open Source misses the point of Free Software</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Why Open Source Misses the Point of Free Software</h2>
 
 <address class="byline">by Richard Stallman</address>
 
 <div class="article">
-
-<blockquote class="comment"><p>
+<div class="important"><p>
 The terms &ldquo;free software&rdquo; and &ldquo;open
 source&rdquo; stand for almost the same range of programs.  However,
 they say deeply different things about those programs, based on
@@ -19,7 +25,7 @@
 By contrast, the open source idea values mainly practical advantage
 and does not campaign for principles.  This is why we do not agree
 with open source, and do not use that term.
-</p></blockquote>
+</p></div>
 
 <p>When we call software &ldquo;free,&rdquo; we mean that it respects
 the <a href="/philosophy/free-sw.html">users' essential freedoms</a>:
@@ -74,7 +80,7 @@
 of open source have come to it since then, and they make the same
 association.  Most discussion of &ldquo;open source&rdquo; pays no
 attention to right and wrong, only to popularity and success; here's
-a <a 
href="http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>
+a <a 
href="https://linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html";>
 typical example</a>.  A minority of supporters of open source do
 nowadays say freedom is part of the issue, but they are not very visible
 among the many that don't.</p>
@@ -200,8 +206,8 @@
 agreements vary as to what one is allowed to do with that
 code.&rdquo;</p>
 
-<p>The <i>New York
-Times</i> <a 
href="http://www.nytimes.com/external/gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-37415.html";>
+<p>The <cite>New York Times</cite> <a
+href="https://www.nytimes.com/external/gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-37415.html";>
 ran an article that stretched the meaning of the term</a> to refer to
 user beta testing&mdash;letting a few users try an early version and
 give confidential feedback&mdash;which proprietary software developers
@@ -209,7 +215,7 @@
 
 <p>The term has even been stretched to include designs for equipment
 that
-are <a 
href="http://www.theguardian.com/sustainable-business/2015/aug/27/texas-teenager-water-purifier-toxic-e-waste-pollution";>published
+are <a 
href="https://www.theguardian.com/sustainable-business/2015/aug/27/texas-teenager-water-purifier-toxic-e-waste-pollution";>published
 without a patent</a>.  Patent-free equipment designs can be laudable
 contributions to society, but the term &ldquo;source code&rdquo; does
 not pertain to them.</p>
@@ -242,7 +248,7 @@
 people to participate.  They stretch the term so far that it only
 means &ldquo;participatory&rdquo; or &ldquo;transparent&rdquo;, or
 less than that.  At worst, it
-has <a 
href="http://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
+has <a 
href="https://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html";>
 become a vacuous buzzword</a>.</p>
 
 <h3>Different Values Can Lead to Similar Conclusions&mdash;but Not Always</h3>
@@ -305,7 +311,7 @@
 individuals to use is increasingly designed specifically to restrict
 them.  This malicious feature is known as Digital Restrictions
 Management (DRM) (see <a
-href="http://defectivebydesign.org/";>DefectiveByDesign.org</a>) and is
+href="https://defectivebydesign.org";>DefectiveByDesign.org</a>) and is
 the antithesis in spirit of the freedom that free software aims
 to provide.  And not just in spirit: since the goal of DRM is to
 trample your freedom, DRM developers try to make it hard, impossible,
@@ -428,10 +434,10 @@
 free software and it gives you freedom!&rdquo;&mdash;more and louder
 than ever.  Every time you say &ldquo;free software&rdquo; rather than
 &ldquo;open source,&rdquo; you help our cause.</p>
-
+<div class="column-limit"></div>
 </div>
 
-<h4>Note</h4>
+<h3 class="footnote">Note</h3>
 
 <!-- The article is incomplete (#793776) as of 21st January 2013.
 <p>
@@ -441,18 +447,17 @@
 --> 
 <p>
 Lakhani and Wolf's <a 
-href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>
+href="https://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>
 paper on the motivation of free software developers</a> says that a 
 considerable fraction are motivated by the view that software should be 
 free. This is despite the fact that they surveyed the developers on 
 SourceForge, a site that does not support the view that this is an ethical 
 issue.</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 <a
@@ -470,18 +475,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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019, 2020, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2007, 2010, 2012, 2015, 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
@@ -491,10 +496,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/27 12:30:47 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/open-source-misses-the-point.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.ru.po,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- philosophy/po/open-source-misses-the-point.ru.po    16 Jul 2021 11:43:09 
-0000      1.113
+++ philosophy/po/open-source-misses-the-point.ru.po    16 Jul 2021 12:02:42 
-0000      1.114
@@ -19,7 +19,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-11 08:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -33,8 +32,6 @@
 
 # type: Content of: <h2>
 #. type: Content of: <div><h2>
-# | Why Open Source [-m-]{+M+}isses the [-p-]{+P+}oint of Free Software
-#| msgid "Why Open Source misses the point of Free Software"
 msgid "Why Open Source Misses the Point of Free Software"
 msgstr ""
 "Почему &ldquo;открытый исходный текст&rdquo; не 
передает понятия &ldquo;"
@@ -159,42 +156,6 @@
 "отличными от взглядов движения за 
свободное программное обеспечение."
 
 #. type: Content of: <div><div><p>
-# | Some of the supporters of open source considered the term a
-# | &ldquo;marketing campaign for free software,&rdquo; which would appeal to
-# | business executives by highlighting the software's practical benefits,
-# | while not raising issues of right and wrong that they might not like to
-# | hear.  Other supporters flatly rejected the free software movement's
-# | ethical and social values.  Whichever their views, when campaigning for
-# | open source, they neither cited nor advocated those values.  The term
-# | &ldquo;open source&rdquo; quickly became associated with ideas and
-# | arguments based only on practical values, such as making or having
-# | powerful, reliable software.  Most of the supporters of open source have
-# | come to it since then, and they make the same association.  Most
-# | discussion of &ldquo;open source&rdquo; pays no attention to right and
-# | wrong, only to popularity and success; here's a <a
-# | 
[-href=\"http://www.linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html\";>-]
-# | 
{+href=\"https://linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html\";>+}
-# | typical example</a>.  A minority of supporters of open source do nowadays
-# | say freedom is part of the issue, but they are not very visible among the
-# | many that don't.
-#| msgid ""
-#| "Some of the supporters of open source considered the term a &ldquo;"
-#| "marketing campaign for free software,&rdquo; which would appeal to "
-#| "business executives by highlighting the software's practical benefits, "
-#| "while not raising issues of right and wrong that they might not like to "
-#| "hear.  Other supporters flatly rejected the free software movement's "
-#| "ethical and social values.  Whichever their views, when campaigning for "
-#| "open source, they neither cited nor advocated those values.  The term "
-#| "&ldquo;open source&rdquo; quickly became associated with ideas and "
-#| "arguments based only on practical values, such as making or having "
-#| "powerful, reliable software.  Most of the supporters of open source have "
-#| "come to it since then, and they make the same association.  Most "
-#| "discussion of &ldquo;open source&rdquo; pays no attention to right and "
-#| "wrong, only to popularity and success; here's a <a href=\"http://www.";
-#| "linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-"
-#| "Trends-78937.html\"> typical example</a>.  A minority of supporters of "
-#| "open source do nowadays say freedom is part of the issue, but they are "
-#| "not very visible among the many that don't."
 msgid ""
 "Some of the supporters of open source considered the term a &ldquo;marketing "
 "campaign for free software,&rdquo; which would appeal to business executives "
@@ -227,9 +188,9 @@
 "программами. Впоследствии к этому пришло 
большинство сторонников открытого "
 "исходного текста, и они ассоциируются с 
тем же. В большинстве обсуждений "
 "&ldquo;открытого исходного текста&rdquo; не 
обращают внимания на то, что "
-"хорошо и что плохо, а только на 
популярность и успешность; <a "
-"href=\"https://linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-Trends-78937.html\";>типичный
 "
-"пример</a>&nbsp;&mdash; заметка о последних "
+"хорошо и что плохо, а только на 
популярность и успешность; <a href=\"https://";
+"linuxinsider.com/story/Open-Source-Is-Woven-Into-the-Latest-Hottest-"
+"Trends-78937.html\">типичный пример</a>&nbsp;&mdash; 
заметка о последних "
 "тенденциях в LinuxInsider. Небольшая часть 
сторонников открытого исходного "
 "текста действительно говорит, что свобода 
входит в состав проблемы, но их не "
 "очень-то видно за теми многими, кто этого 
не делает."
@@ -515,19 +476,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The [-<i>New-] {+<cite>New+} York [-Times</i>-] {+Times</cite>+} <a
-# | 
href=\"http{+s+}://www.nytimes.com/external/gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-design-37415.html\">
-# | ran an article that stretched the meaning of the term</a> to refer to user
-# | beta testing&mdash;letting a few users try an early version and give
-# | confidential feedback&mdash;which proprietary software developers have
-# | practiced for decades.
-#| msgid ""
-#| "The <i>New York Times</i> <a href=\"http://www.nytimes.com/external/";
-#| "gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-"
-#| "design-37415.html\"> ran an article that stretched the meaning of the "
-#| "term</a> to refer to user beta testing&mdash;letting a few users try an "
-#| "early version and give confidential feedback&mdash;which proprietary "
-#| "software developers have practiced for decades."
 msgid ""
 "The <cite>New York Times</cite> <a href=\"https://www.nytimes.com/external/";
 "gigaom/2009/02/07/07gigaom-the-brave-new-world-of-open-source-game-"
@@ -545,19 +493,6 @@
 "практиковалось разработчиками 
несвободных программ десятилетиями."
 
 #. type: Content of: <div><div><p>
-# | The term has even been stretched to include designs for equipment that are
-# | <a
-# | 
href=\"http{+s+}://www.theguardian.com/sustainable-business/2015/aug/27/texas-teenager-water-purifier-toxic-e-waste-pollution\">published
-# | without a patent</a>.  Patent-free equipment designs can be laudable
-# | contributions to society, but the term &ldquo;source code&rdquo; does not
-# | pertain to them.
-#| msgid ""
-#| "The term has even been stretched to include designs for equipment that "
-#| "are <a href=\"http://www.theguardian.com/sustainable-business/2015/aug/27/";
-#| "texas-teenager-water-purifier-toxic-e-waste-pollution\">published without "
-#| "a patent</a>.  Patent-free equipment designs can be laudable "
-#| "contributions to society, but the term &ldquo;source code&rdquo; does not "
-#| "pertain to them."
 msgid ""
 "The term has even been stretched to include designs for equipment that are "
 "<a href=\"https://www.theguardian.com/sustainable-business/2015/aug/27/texas-";
@@ -618,26 +553,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | The term &ldquo;open source&rdquo; has been further stretched by its
-# | application to other activities, such as government, education, and
-# | science, where there is no such thing as source code, and where criteria
-# | for software licensing are simply not pertinent.  The only thing these
-# | activities have in common is that they somehow invite people to
-# | participate.  They stretch the term so far that it only means
-# | &ldquo;participatory&rdquo; or &ldquo;transparent&rdquo;, or less than
-# | that.  At worst, it has <a
-# | 
href=\"http{+s+}://www.nytimes.com/2013/03/17/opinion/sunday/morozov-open-and-closed.html\">
-# | become a vacuous buzzword</a>.
-#| msgid ""
-#| "The term &ldquo;open source&rdquo; has been further stretched by its "
-#| "application to other activities, such as government, education, and "
-#| "science, where there is no such thing as source code, and where criteria "
-#| "for software licensing are simply not pertinent.  The only thing these "
-#| "activities have in common is that they somehow invite people to "
-#| "participate.  They stretch the term so far that it only means &ldquo;"
-#| "participatory&rdquo; or &ldquo;transparent&rdquo;, or less than that.  At "
-#| "worst, it has <a href=\"http://www.nytimes.com/2013/03/17/opinion/sunday/";
-#| "morozov-open-and-closed.html\"> become a vacuous buzzword</a>."
 msgid ""
 "The term &ldquo;open source&rdquo; has been further stretched by its "
 "application to other activities, such as government, education, and science, "
@@ -804,26 +719,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><div><p>
-# | Under pressure from the movie and record companies, software for
-# | individuals to use is increasingly designed specifically to restrict them.
-# |  This malicious feature is known as Digital Restrictions Management (DRM)
-# | (see <a
-# | [-href=\"http://defectivebydesign.org/\";>DefectiveByDesign.org</a>)-]
-# | {+href=\"https://defectivebydesign.org\";>DefectiveByDesign.org</a>)+} and
-# | is the antithesis in spirit of the freedom that free software aims to
-# | provide.  And not just in spirit: since the goal of DRM is to trample your
-# | freedom, DRM developers try to make it hard, impossible, or even illegal
-# | for you to change the software that implements the DRM.
-#| msgid ""
-#| "Under pressure from the movie and record companies, software for "
-#| "individuals to use is increasingly designed specifically to restrict "
-#| "them.  This malicious feature is known as Digital Restrictions Management "
-#| "(DRM) (see <a href=\"http://defectivebydesign.org/\";>DefectiveByDesign."
-#| "org</a>) and is the antithesis in spirit of the freedom that free "
-#| "software aims to provide.  And not just in spirit: since the goal of DRM "
-#| "is to trample your freedom, DRM developers try to make it hard, "
-#| "impossible, or even illegal for you to change the software that "
-#| "implements the DRM."
 msgid ""
 "Under pressure from the movie and record companies, software for individuals "
 "to use is increasingly designed specifically to restrict them.  This "
@@ -1131,21 +1026,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Lakhani and Wolf's <a
-# | 
href=\"http{+s+}://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf\">
-# | paper on the motivation of free software developers</a> says that a
-# | considerable fraction are motivated by the view that software should be
-# | free. This is despite the fact that they surveyed the developers on
-# | SourceForge, a site that does not support the view that this is an ethical
-# | issue.
-#| msgid ""
-#| "Lakhani and Wolf's <a href=\"http://ocw.mit.edu/courses/sloan-school-of-";
-#| "management/15-352-managing-innovation-emerging-trends-spring-2005/"
-#| "readings/lakhaniwolf.pdf\"> paper on the motivation of free software "
-#| "developers</a> says that a considerable fraction are motivated by the "
-#| "view that software should be free. This is despite the fact that they "
-#| "surveyed the developers on SourceForge, a site that does not support the "
-#| "view that this is an ethical issue."
 msgid ""
 "Lakhani and Wolf's <a href=\"https://ocw.mit.edu/courses/sloan-school-of-";
 "management/15-352-managing-innovation-emerging-trends-spring-2005/readings/"
@@ -1155,11 +1035,11 @@
 "on SourceForge, a site that does not support the view that this is an "
 "ethical issue."
 msgstr ""
-"Работа Лакхани и Вольфа <a 
href=\"https://ocw.mit.edu/courses/sloan-school-of-";
-"management/15-352-managing-innovation-emerging-trends-spring-2005/readings/"
-"lakhaniwolf.pdf\"> о мотивации разработчиков 
свободных программ</a> говорит, "
-"что значительная доля мотивируется 
взглядами, согласно которым программы "
-"должны быть свободными. И это несмотря на 
то, что они опрашивали "
+"Работа Лакхани и Вольфа <a 
href=\"https://ocw.mit.edu/courses/sloan-school-";
+"of-management/15-352-managing-innovation-emerging-trends-spring-2005/"
+"readings/lakhaniwolf.pdf\"> о мотивации разработчиков 
свободных программ</a> "
+"говорит, что значительная доля 
мотивируется взглядами, согласно которым "
+"программы должны быть свободными. И это 
несмотря на то, что они опрашивали "
 "разработчиков на SourceForge&nbsp;&mdash; сайте, 
который не разделяет мнения "
 "о том, что это&nbsp;&mdash; вопрос этики."
 
@@ -1195,11 +1075,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 "
@@ -1213,18 +1088,13 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2007, 2010, 2012, 2015, 2016, [-2019, 2020, 2021-]
-# | {+2019-2021+} Richard Stallman
-#| msgid ""
-#| "Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019, 2020, 2021 Richard "
-#| "Stallman"
 msgid ""
 "Copyright &copy; 2007, 2010, 2012, 2015, 2016, 2019-2021 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2007, 2010, 2012, 2013, 2015, 2016, 2019-2021 "
-"Richard Stallman <br /> Copyright &copy; 2008 jeder (translation) <br /> "
-"Copyright &copy; 2010, 2011, 2012, 2015, 2016, 2019, 2020, 2021 Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 2007, 2010, 2012, 2013, 2015, 2016, 2019-2021 Richard "
+"Stallman <br /> Copyright &copy; 2008 jeder (translation) <br /> Copyright "
+"&copy; 2010, 2011, 2012, 2015, 2016, 2019, 2020, 2021 Free Software "
+"Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/selling.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.ru-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/po/selling.ru-en.html    15 Dec 2018 14:46:42 -0000      1.29
+++ philosophy/po/selling.ru-en.html    16 Jul 2021 12:02:42 -0000      1.30
@@ -1,15 +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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Selling Free Software
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/selling.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>Selling Free Software</h2>
 
 <p><em><a href="/philosophy/selling-exceptions.html">Some views on the
 ideas of selling exceptions to free software licenses, such as the GNU
 GPL</a> are also available.</em></p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Many people believe that the spirit of the GNU Project is that you
 should not charge money for distributing copies of software, or that
@@ -180,10 +189,12 @@
 defending freedom.  When we defend users' freedom, we are not
 distracted by side issues such as how much of a distribution fee is
 charged.  Freedom is the issue, the whole issue, and the only issue.</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
@@ -201,13 +212,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>
 
@@ -228,7 +239,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018
+<p>Copyright &copy; 1996-1998, 2001, 2007, 2015-2018, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -239,7 +250,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:42 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/selling.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.ru.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- philosophy/po/selling.ru.po 16 Jul 2021 11:43:09 -0000      1.38
+++ philosophy/po/selling.ru.po 16 Jul 2021 12:02:42 -0000      1.39
@@ -1,6 +1,5 @@
 # Russian translation for http://www.gnu.org/philosophy/selling.html
-# Copyright (C) 1996-1998, 2001, 2007, 2010, 2011, 2013, 2014, \
-#               2015-2018, 2019, 2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001, 2007, 2010, 2011, 2013, 2014, #               
2015-2018, 2019, 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original page.
 # Ineiev <ineiev@gnu.org>, 2010, 2011, 2013, 2014, 2015, 2016, 2018, 2019, 2021
 # this translation lacks appropriate review
@@ -16,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-11 09:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -428,11 +426,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 "
@@ -447,17 +440,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1996, 1997, 1998,-] {+1996-1998,+} 2001, 2007, [-2015,
-# | 2016, 2017, 2018-] {+2015-2018, 2021+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018 "
-#| "Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996-1998, 2001, 2007, 2015-2018, 2021 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996-1998, 2001, 2007, 2010, 2011, 2013, 2014, "
-"2015-2018, 2019, 2021 Free Software Foundation, Inc."
+"Copyright &copy; 1996-1998, 2001, 2007, 2010, 2011, 2013, 2014, 2015-2018, "
+"2019, 2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/shouldbefree.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.ru-en.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/shouldbefree.ru-en.html       26 Oct 2020 13:34:18 -0000      
1.30
+++ philosophy/po/shouldbefree.ru-en.html       16 Jul 2021 12:02:42 -0000      
1.31
@@ -1,15 +1,23 @@
 <!--#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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why Software Should Be Free
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/shouldbefree.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>Why Software Should Be Free</h2>
 
-<p>
-by <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a></p>
-<h3 id="introduction">Introduction</h3>
-<p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
+
+<div class="article">
+<p  id="introduction">
 The existence of software inevitably raises the question of how
 decisions about its use should be made.  For example, suppose one
 individual who has a copy of a program meets another who would like a
@@ -43,7 +51,7 @@
 <a href="/philosophy/free-sw.html">&ldquo;free&rdquo;
 software</a>.<a href="#f1">(1)</a></p>
 
-<h3 id="owner-justification">How Owners Justify Their Power</h3>
+<h3 id="owner-justification" class="subheader">How Owners Justify Their 
Power</h3>
 <p>
    Those who benefit from the current system where programs are property
 offer two arguments in support of their claims to own programs: the
@@ -91,7 +99,7 @@
 have owners.  To formulate the choice as between proprietary software
 versus no software is begging the question.</p>
 
-<h3 id="against-having-owners">The Argument against Having Owners</h3>
+<h3 id="against-having-owners" class="subheader">The Argument against Having 
Owners</h3>
 <p>
    The question at hand is, &ldquo;Should development of software be linked
 with having owners to restrict the use of it?&rdquo;</p>
@@ -483,7 +491,7 @@
 making proprietary software stands a chance of success in its own narrow
 terms, but it is not what is good for society.</p>
 
-<h3 id="why-develop">Why People Will Develop Software</h3>
+<h3 id="why-develop" class="subheader">Why People Will Develop Software</h3>
 <p>
    If we eliminate copyright as a means of encouraging
 people to develop software, at first less software will be developed,
@@ -629,7 +637,7 @@
 developers without coercion, just as they have learned to support public
 radio and television stations.</p>
 
-<h3 id="productivity">What Is Software Productivity? </h3>
+<h3 id="productivity" class="subheader">What Is Software Productivity? </h3>
 <p>
    If software were free, there would still be programmers, but perhaps
 fewer of them.  Would this be bad for society?</p>
@@ -664,7 +672,7 @@
 productivity&rdquo; focus only on the second, limited, sense of the
 term, where improvement requires difficult technological advances.</p>
 
-<h3 id="competition">Is Competition Inevitable?</h3>
+<h3 id="competition" class="subheader">Is Competition Inevitable?</h3>
 <p>
    Is it inevitable that people will try to compete, to surpass their
 rivals in society?  Perhaps it is.  But competition itself is not
@@ -708,7 +716,7 @@
 prohibited.  Society's resources are squandered on the economic
 equivalent of factional civil war.</p>
 
-<h3 id="communism">&ldquo;Why Don't You Move to Russia?&rdquo;</h3>
+<h3 id="communism" class="subheader">&ldquo;Why Don't You Move to 
Russia?&rdquo;</h3>
 <p>
    In the United States, any advocate of other than the most extreme
 form of laissez-faire selfishness has often heard this accusation.  For
@@ -738,7 +746,7 @@
    Thus, if we are to judge views by their resemblance to Russian
 Communism, it is the software owners who are the Communists.</p>
 
-<h3 id="premises">The Question of Premises</h3>
+<h3 id="premises" class="subheader">The Question of Premises</h3>
 <p>
    I make the assumption in this paper that a user of software is no
 less important than an author, or even an author's employer.  In other
@@ -780,7 +788,7 @@
 awareness that this is a radical right-wing assumption rather than a
 traditionally recognized one will weaken its appeal.</p>
 
-<h3 id="conclusion">Conclusion</h3>
+<h3 id="conclusion" class="subheader">Conclusion</h3>
 <p>
    We like to think that our society encourages helping your neighbor;
 but each time we reward someone for obstructionism, or admire them for
@@ -802,9 +810,10 @@
 others.  I hope that the free software movement will contribute to
 this: at least in one area, we will replace the jungle with a more
 efficient system which encourages and runs on voluntary cooperation.</p>
+<div class="column-limit"></div>
+</div>
 
-
-<h3 id="footnotes">Footnotes</h3>
+<h3 id="footnotes" class="footnote">Footnotes</h3>
 
 <ol>
 <li id="f1">The word &ldquo;free&rdquo; in &ldquo;free software&rdquo;
@@ -831,15 +840,18 @@
 destructive.</li>
 </ol>
 
-<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
@@ -857,16 +869,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; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 
2018, 2020 Free
+<p>Copyright &copy; 1991, 1992, 1998, 2000, 2001, 2006, 2007, 2010, 2017, 
2018, 2020, 2021 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -877,7 +889,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/10/26 13:34:18 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/shouldbefree.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/shouldbefree.ru.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- philosophy/po/shouldbefree.ru.po    16 Jul 2021 11:43:11 -0000      1.32
+++ philosophy/po/shouldbefree.ru.po    16 Jul 2021 12:02:42 -0000      1.33
@@ -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-11 09:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Why Software Should Be Free - GNU Project - Free Software Foundation"
@@ -31,8 +30,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#| msgid "by <a href=\"http://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>"
 
@@ -1849,22 +1846,14 @@
 "которой считается разрушительным."
 
 #. 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 "
 "Essays of Richard M. Stallman</cite></a>."
 msgstr ""
-"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/free-";
-"software-free-society/\">&ldquo;Свободные программы, 
свободное общество: "
-"Избранные очерки Р
ичарда&nbsp;М.&nbsp;Столмена&rdquo;</a>."
+"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/";
+"free-software-free-society/\">&ldquo;Свободные программы, 
свободное "
+"общество: Избранные очерки Р
ичарда&nbsp;М.&nbsp;Столмена&rdquo;</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -1897,11 +1886,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/when-free-depends-on-nonfree.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/when-free-depends-on-nonfree.ru-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/when-free-depends-on-nonfree.ru-en.html       15 Dec 2018 
14:46:43 -0000      1.7
+++ philosophy/po/when-free-depends-on-nonfree.ru-en.html       16 Jul 2021 
12:02:42 -0000      1.8
@@ -1,16 +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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>When Free Software Depends on Nonfree - GNU Project - Free Software 
Foundation</title>
  <!--#include virtual="/philosophy/po/when-free-depends-on-nonfree.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>When Free Software Depends on Nonfree</h2>
 
- <p>by <strong>Richard Stallman</strong></p>
+<address class="byline">by Richard Stallman</address>
 
+<div class="article">
 <p>When a program is free software (free as in freedom), that means it 
-gives users the four freedoms (<a 
-href="/philosophy/free-sw.html">gnu.org/philosophy/free-sw.html</a>) 
+gives users <a 
+href="/philosophy/free-sw.html">the four freedoms</a>,
 so that they control what the program does. In most cases, that is 
 sufficient for the program's distribution to be ethical; but not 
 always. There are additional problems that can arise in specific 
@@ -84,7 +92,7 @@
 it requires the user of GNU Health (a
 clinic) to entrust its own computing and its data to the company
 developer of OpenERP. Rather than bow down, Falcón rewrote GNU Health
-to use <a href="http://www.tryton.org";>Tryton</a> instead.</p>
+to use <a href="https://www.tryton.org";>Tryton</a> instead.</p>
 
 <p>Using SaaSS is inherently equivalent to running a proprietary program
 with snooping functionality and a universal back door. The service
@@ -93,9 +101,9 @@
 show any form of the data to anyone, we can't be sure that it won't be
 accessed by <a href="/philosophy/surveillance-vs-democracy.html">the
 intelligence agencies of various countries</a> or security-breaking
-crackers <a
-href="http://stallman.org/articles/on-hacking.html";>(please don't call
-them &ldquo;hackers&rdquo;)</a>.</p>
+crackers (<a
+href="https://stallman.org/articles/on-hacking.html";>please don't call
+them &ldquo;hackers&rdquo;</a>).</p>
 
 <p>When a program is diachronically trapped, releasing it from the trap
 requires more than a one-time job of programming. Rather, the job has
@@ -111,10 +119,12 @@
 you must steer clear of really using it. Both businesses and
 individuals will find fine free alternatives that don't have such a
 problem; all it takes to avoid the trap is to recognize 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
@@ -132,13 +142,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>
 
@@ -159,7 +169,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2016, 2017, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2016-2018, 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
@@ -169,7 +179,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:46:43 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/when-free-depends-on-nonfree.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/when-free-depends-on-nonfree.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/when-free-depends-on-nonfree.ru.po    16 Jul 2021 11:43:11 
-0000      1.15
+++ philosophy/po/when-free-depends-on-nonfree.ru.po    16 Jul 2021 12:02:42 
-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-11 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -31,29 +30,10 @@
 
 # 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 "Ричард Столмен"
 
 #. type: Content of: <div><div><p>
-# | When a program is free software (free as in freedom), that means it gives
-# | users [-the-] {+<a href=\"/philosophy/free-sw.html\">the+} four [-freedoms
-# | (<a
-# | href=\"/philosophy/free-sw.html\">gnu.org/philosophy/free-sw.html</a>)-]
-# | {+freedoms</a>,+} so that they control what the program does. In most
-# | cases, that is sufficient for the program's distribution to be ethical;
-# | but not always. There are additional problems that can arise in specific
-# | circumstances. This article describes a subtle problem, where upgrading
-# | the free program requires using a nonfree program.
-#| msgid ""
-#| "When a program is free software (free as in freedom), that means it gives "
-#| "users the four freedoms (<a href=\"/philosophy/free-sw.html\">gnu.org/"
-#| "philosophy/free-sw.html</a>)  so that they control what the program does. "
-#| "In most cases, that is sufficient for the program's distribution to be "
-#| "ethical; but not always. There are additional problems that can arise in "
-#| "specific circumstances. This article describes a subtle problem, where "
-#| "upgrading the free program requires using a nonfree program."
 msgid ""
 "When a program is free software (free as in freedom), that means it gives "
 "users <a href=\"/philosophy/free-sw.html\">the four freedoms</a>, so that "
@@ -64,13 +44,13 @@
 "a nonfree program."
 msgstr ""
 "Когда программа свободна (от слова 
&ldquo;свобода&rdquo;<a href=\"#tf1\">[1]"
-"</a>), это значит, что она дает пользователям 
<a href=\"/"
-"philosophy/free-sw.html\">четыре свободы</a>, так что 
они "
-"контролируют, что делает программа. В 
большинстве случаев этого достаточно, "
-"чтобы распространяемая программа была 
этичной; но не всегда. Есть "
-"дополнительные проблемы, которые могут 
возникнуть в специфических "
-"обстоятельствах. В этой статье описана 
неочевидная проблема, возникающая, "
-"когда обновление свободной программы 
требует применения несвободной."
+"</a>), это значит, что она дает пользователям 
<a href=\"/philosophy/free-sw."
+"html\">четыре свободы</a>, так что они 
контролируют, что делает программа. В "
+"большинстве случаев этого достаточно, 
чтобы распространяемая программа была "
+"этичной; но не всегда. Есть дополнительные 
проблемы, которые могут "
+"возникнуть в специфических 
обстоятельствах. В этой статье описана "
+"неочевидная проблема, возникающая, когда 
обновление свободной программы "
+"требует применения несвободной."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -199,27 +179,6 @@
 "западней&rdquo;, заимствуя другой термин 
лингвистики."
 
 #. type: Content of: <div><div><p>
-# | For example, the program OpenERP (since renamed &ldquo;Odoo&rdquo;),
-# | though free, is diachronically trapped. <a href=\"/software/health/\">GNU
-# | Health</a>, our free package for running a medical clinic, initially used
-# | OpenERP. In 2011, GNU Health developer Luis Falcón discovered that
-# | upgrading to the next version of OpenERP required sending the database
-# | (full of patients' medical data) to OpenERP's server for reformatting.
-# | This is SaaSS: it requires the user of GNU Health (a clinic) to entrust
-# | its own computing and its data to the company developer of OpenERP. Rather
-# | than bow down, Falcón rewrote GNU Health to use <a
-# | href=\"http{+s+}://www.tryton.org\">Tryton</a> instead.
-#| msgid ""
-#| "For example, the program OpenERP (since renamed &ldquo;Odoo&rdquo;), "
-#| "though free, is diachronically trapped. <a href=\"/software/health/\">GNU "
-#| "Health</a>, our free package for running a medical clinic, initially used "
-#| "OpenERP. In 2011, GNU Health developer Luis Falcón discovered that "
-#| "upgrading to the next version of OpenERP required sending the database "
-#| "(full of patients' medical data) to OpenERP's server for reformatting. "
-#| "This is SaaSS: it requires the user of GNU Health (a clinic) to entrust "
-#| "its own computing and its data to the company developer of OpenERP. "
-#| "Rather than bow down, Falcón rewrote GNU Health to use <a href=\"http://";
-#| "www.tryton.org\">Tryton</a> instead."
 msgid ""
 "For example, the program OpenERP (since renamed &ldquo;Odoo&rdquo;), though "
 "free, is diachronically trapped. <a href=\"/software/health/\">GNU Health</"
@@ -245,26 +204,6 @@
 "\">Tryton</a>."
 
 #. type: Content of: <div><div><p>
-# | Using SaaSS is inherently equivalent to running a proprietary program with
-# | snooping functionality and a universal back door. The service could keep a
-# | copy of the databases that users reformat. Even if we can trust the
-# | company that runs the service never to intentionally show any form of the
-# | data to anyone, we can't be sure that it won't be accessed by <a
-# | href=\"/philosophy/surveillance-vs-democracy.html\">the intelligence
-# | agencies of various countries</a> or security-breaking crackers [-<a
-# | href=\"http://stallman.org/articles/on-hacking.html\";>(please-] {+(<a
-# | href=\"https://stallman.org/articles/on-hacking.html\";>please+} don't call
-# | them [-&ldquo;hackers&rdquo;)</a>.-] {+&ldquo;hackers&rdquo;</a>).+}
-#| msgid ""
-#| "Using SaaSS is inherently equivalent to running a proprietary program "
-#| "with snooping functionality and a universal back door. The service could "
-#| "keep a copy of the databases that users reformat. Even if we can trust "
-#| "the company that runs the service never to intentionally show any form of "
-#| "the data to anyone, we can't be sure that it won't be accessed by <a href="
-#| "\"/philosophy/surveillance-vs-democracy.html\">the intelligence agencies "
-#| "of various countries</a> or security-breaking crackers <a href=\"http://";
-#| "stallman.org/articles/on-hacking.html\">(please don't call them &ldquo;"
-#| "hackers&rdquo;)</a>."
 msgid ""
 "Using SaaSS is inherently equivalent to running a proprietary program with "
 "snooping functionality and a universal back door. The service could keep a "
@@ -359,11 +298,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 "
@@ -377,9 +311,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2016, 2017, 2018-] {+2016-2018, 2021+} Free Software
-# | Foundation, Inc.
-#| msgid "Copyright &copy; 2016, 2017, 2018 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2016-2018, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2016-2018, 2021 Free Software Foundation, Inc."
 

Index: philosophy/po/when-free-software-isnt-practically-superior.ru-en.html
===================================================================
RCS file: 
/web/www/www/philosophy/po/when-free-software-isnt-practically-superior.ru-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/when-free-software-isnt-practically-superior.ru-en.html       
18 Nov 2016 07:33:04 -0000      1.4
+++ philosophy/po/when-free-software-isnt-practically-superior.ru-en.html       
16 Jul 2021 12:02:42 -0000      1.5
@@ -1,13 +1,21 @@
 <!--#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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title> When Free Software Isn't (Practically) Superior - GNU Project - Free 
Software Foundation</title>
  <!--#include 
virtual="/philosophy/po/when-free-software-isnt-practically-superior.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> When Free Software Isn't (Practically) Superior</h2>
 
-<p>
-by <a href="https://mako.cc/writing/";><strong>Benjamin Mako 
Hill</strong></a></p>
+<address class="byline">
+by <a href="https://mako.cc/writing/";>Benjamin Mako Hill</a></address>
 
+<div class="article">
 <p>The Open Source Initiative's mission statement reads, &ldquo;Open source
 is a development method for software that harnesses the power of
 distributed peer review and transparency of process. The promise of
@@ -74,7 +82,7 @@
 
 <p>Several academic studies of <a href="/software/repo-criteria.html">
 free software hosting sites</a> SourceForge and <a
-href="http://sv.gnu.org";>Savannah</a> have shown what many free
+href="https://sv.gnu.org";>Savannah</a> have shown what many free
 software developers who have put a codebase online already know
 first-hand. The vast majority of free software projects are not
 particularly collaborative. The median number of contributors to a
@@ -122,10 +130,12 @@
 understand, support, and work towards, rather than something to take
 for granted in the face of evidence that refuses to conform to
 ideology.</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
@@ -143,13 +153,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>
 
@@ -180,11 +190,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/11/18 07:33:04 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>
-

Index: philosophy/po/when-free-software-isnt-practically-superior.ru.po
===================================================================
RCS file: 
/web/www/www/philosophy/po/when-free-software-isnt-practically-superior.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/when-free-software-isnt-practically-superior.ru.po    16 Jul 
2021 11:43:12 -0000      1.14
+++ philosophy/po/when-free-software-isnt-practically-superior.ru.po    16 Jul 
2021 12:02:42 -0000      1.15
@@ -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-11 09:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -31,12 +30,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by <a [-href=\"https://mako.cc/writing/\";><strong>Benjamin-]
-# | {+href=\"https://mako.cc/writing/\";>Benjamin+} Mako [-Hill</strong></a>-]
-# | {+Hill</a>+}
-#| msgid ""
-#| "by <a href=\"https://mako.cc/writing/\";><strong>Benjamin Mako Hill</"
-#| "strong></a>"
 msgid "by <a href=\"https://mako.cc/writing/\";>Benjamin Mako Hill</a>"
 msgstr "<a href=\"https://mako.cc/writing/\";>Бенджамин Мейко 
Хилл</a>"
 
@@ -185,30 +178,6 @@
 "текстом&rdquo;)."
 
 #. type: Content of: <div><div><p>
-# | Several academic studies of <a href=\"/software/repo-criteria.html\"> free
-# | software hosting sites</a> SourceForge and <a
-# | href=\"http{+s+}://sv.gnu.org\">Savannah</a> have shown what many free
-# | software developers who have put a codebase online already know
-# | first-hand. The vast majority of free software projects are not
-# | particularly collaborative. The median number of contributors to a free
-# | software project on SourceForge? One. A lone developer. SourceForge
-# | projects at the ninety-fifth percentile by participant size have only five
-# | contributors. More than half of these free software projects&mdash;and
-# | even most projects that have made several successful releases and been
-# | downloaded frequently, are the work of a single developer with little
-# | outside help.
-#| msgid ""
-#| "Several academic studies of <a href=\"/software/repo-criteria.html\"> "
-#| "free software hosting sites</a> SourceForge and <a href=\"http://sv.gnu.";
-#| "org\">Savannah</a> have shown what many free software developers who have "
-#| "put a codebase online already know first-hand. The vast majority of free "
-#| "software projects are not particularly collaborative. The median number "
-#| "of contributors to a free software project on SourceForge? One. A lone "
-#| "developer. SourceForge projects at the ninety-fifth percentile by "
-#| "participant size have only five contributors. More than half of these "
-#| "free software projects&mdash;and even most projects that have made "
-#| "several successful releases and been downloaded frequently, are the work "
-#| "of a single developer with little outside help."
 msgid ""
 "Several academic studies of <a href=\"/software/repo-criteria.html\"> free "
 "software hosting sites</a> SourceForge and <a href=\"https://sv.gnu.org";
@@ -354,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 "
@@ -375,8 +339,8 @@
 msgid "Copyright &copy; 1999-2011 Benjamin Mako Hill"
 msgstr ""
 "Copyright &copy; 1999-2011 Benjamin Mako Hill<br />\n"
-"Copyright &copy; 2013, 2015, 2016, 2021 "
-"Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 2013, 2015, 2016, 2021 Free Software Foundation, Inc. "
+"(translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/why-free.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/why-free.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/why-free.ru-en.html   26 Oct 2020 13:34:18 -0000      1.23
+++ philosophy/po/why-free.ru-en.html   16 Jul 2021 12:02:42 -0000      1.24
@@ -1,5 +1,8 @@
 <!--#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="aboutfs" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why Software Should Not Have Owners
 - GNU Project - Free Software Foundation</title>
 
@@ -7,12 +10,16 @@
 
 <!--#include virtual="/philosophy/po/why-free.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>Why Software Should Not Have Owners</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>
 
+<div class="article">
 <p>
 Digital information technology contributes to the world by making it
 easier to copy and modify information.  Computers promise to make this
@@ -297,21 +304,26 @@
 
 <p>
 You deserve free software.</p>
+<div class="column-limit"></div>
+</div>
 
-<h3>Footnotes</h3>
+<h3 class="footnote">Footnote</h3>
 <ol>
 <li id="footnote1">The charges were subsequently dismissed.</li>
 </ol>
 
-<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
@@ -329,13 +341,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>
 
@@ -356,7 +368,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1994, 2009, 2020 Richard Stallman</p>
+<p>Copyright &copy; 1994, 2009, 2020, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -366,10 +378,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/10/26 13:34:18 $
+$Date: 2021/07/16 12:02:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/why-free.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/why-free.ru.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/why-free.ru.po        16 Jul 2021 11:43:09 -0000      1.23
+++ philosophy/po/why-free.ru.po        16 Jul 2021 12:02:42 -0000      1.24
@@ -1,7 +1,6 @@
 # Russian translation for http://www.gnu.org/philosophy/why-free.html
 # Copyright (C) 1994, 2009, 2020, 2021 Richard Stallman
-# Copyright (C) 2010, 2011, 2013, 2015, 2019, 2021, \
-#               2021 Free Software Foundation, Inc. (Russian translation)
+# Copyright (C) 2010, 2011, 2013, 2015, 2019, 2021, #               2021 Free 
Software Foundation, Inc. (Russian translation)
 # This file is distributed under the same license as the original page.
 # Ineiev <ineiev@gnu.org>, 2010, 2011, 2013, 2015, 2019, 2020, 2021
 # this translation lacks appropriate review
@@ -17,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-11 09:56+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -43,8 +41,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><address>
-# | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#| msgid "by <a href=\"http://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>"
 
@@ -660,8 +656,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <div><h3>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Footnote"
 msgid "Footnote"
 msgstr "Примечание"
 
@@ -672,14 +666,6 @@
 
 # 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 "
@@ -721,11 +707,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: po/planetfeeds.ru.po
===================================================================
RCS file: /web/www/www/po/planetfeeds.ru.po,v
retrieving revision 1.1867
retrieving revision 1.1868
diff -u -b -r1.1867 -r1.1868
--- po/planetfeeds.ru.po        16 Jul 2021 11:43:13 -0000      1.1867
+++ po/planetfeeds.ru.po        16 Jul 2021 12:02:43 -0000      1.1868
@@ -14,12 +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-12 12:57+0000\n"
 
 #. type: Content of: <p>
-# | [-FSF board frequently asked questions-]{+New! Contributor&#39;s
-# | Frequently Asked Questions+} (FAQ) {+guide+}
-#| msgid "FSF board frequently asked questions (FAQ)"
 msgid "New! Contributor&#39;s Frequently Asked Questions (FAQ) guide"
 msgstr "Новое! Руководство для работы над 
&ldquo;вопросами и ответами&rdquo;"
 
@@ -30,7 +26,8 @@
 #. type: Content of: <p>
 msgid "&quot;Freedom ladder&quot; IRC discussion and brainstorming: July 15"
 msgstr ""
-"&ldquo;Лестница свободы&rdquo;&nbsp;&mdash; 
обсуждение и мозговой штурм на IRC 15 июля"
+"&ldquo;Лестница свободы&rdquo;&nbsp;&mdash; 
обсуждение и мозговой штурм на "
+"IRC 15 июля"
 
 #.  TRANSLATORS: 
 #. http://www.fsf.org/events/freedomladder-20210715-irc 

Index: proprietary/all.ru.html
===================================================================
RCS file: /web/www/www/proprietary/all.ru.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- proprietary/all.ru.html     5 Jul 2021 10:00:42 -0000       1.17
+++ proprietary/all.ru.html     16 Jul 2021 12:02:43 -0000      1.18
@@ -49,6 +49,40 @@
 <div class="column-limit" id="all-malware"></div>
 
 <ul class="blurbs">
+<!--#set var='ADD' value='2021-07-15' -->
+<!--#set var='PUB' value='2021-07-09' -->
+<li><small class='date-tag'>Добавлено: <!--#echo encoding='none' 
var='ADD' -->
+ &mdash; Последняя ссылка: <!--#echo encoding='none' var='PUB' 
-->
+</small>
+    <p>Недавно обнаруженная уязвимость Microsoft 
Windows <a
+href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+может позволять взломщикам получать 
удаленный доступ к операционной
+системе</a> и устанавливать программы, 
просматривать и удалять данные и даже
+создавать новые учетные записи с полными 
пользовательскими правами.</p>
+
+    <p>Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла
+утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи
+Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще
+это сделают.</p>
+
+    <p><small>Заметьте, что в статье термин <a
+href="/philosophy/words-to-avoid.html#Hacker">&ldquo;хакеры&rdquo;</a>
+неверно используется для обозначения 
взломщиков.</small></p>
+  </li>
+
+<!--#set var='ADD' value='2021-07-15' -->
+<!--#set var='PUB' value='2021-07-05' -->
+<li><small class='date-tag'>Добавлено: <!--#echo encoding='none' 
var='ADD' -->
+ &mdash; Последняя ссылка: <!--#echo encoding='none' var='PUB' 
-->
+</small>
+    <p><a
+href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+Рекламные компании проводят опыты по 
манипуляциям сознанием людей</a>, чтобы
+навязывать новый способ рекламы, изменяя 
их мечты. Эта &ldquo;инкубация
+целевой мечты&rdquo; привела бы к 
&ldquo;освежающей мечте&rdquo; о продукте,
+по заявлениям компании.</p>
+  </li>
+
 <!--#set var='ADD' value='2021-07-04' -->
 <!--#set var='PUB' value='2021-06-22' -->
 <li><small class='date-tag'>Добавлено: <!--#echo encoding='none' 
var='ADD' -->
@@ -3097,7 +3131,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/05 10:00:42 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/malware-microsoft.ru.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.ru.html,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- proprietary/malware-microsoft.ru.html       13 Jun 2021 15:59:18 -0000      
1.103
+++ proprietary/malware-microsoft.ru.html       16 Jul 2021 12:02:43 -0000      
1.104
@@ -231,6 +231,28 @@
 предположение, что в престижных 
несвободных программах нет серьезных 
ошибок.</p>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p>Недавно обнаруженная уязвимость Microsoft 
Windows <a
+href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+может позволять взломщикам получать 
удаленный доступ к операционной
+системе</a> и устанавливать программы, 
просматривать и удалять данные и даже
+создавать новые учетные записи с полными 
пользовательскими правами.</p>
+
+    <p>Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла
+утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи
+Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще
+это сделают.</p>
+
+    <p><small>Заметьте, что в статье термин <a
+href="/philosophy/words-to-avoid.html#Hacker">&ldquo;хакеры&rdquo;</a>
+неверно используется для обозначения 
взломщиков.</small></p>
+  </li>
+
   <li id="M202103050">
     
     <!--#set var="DATE" value='<small class="date-tag">
@@ -1167,7 +1189,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/06/13 15:59:18 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/potential-malware.ru.html
===================================================================
RCS file: /web/www/www/proprietary/potential-malware.ru.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- proprietary/potential-malware.ru.html       1 Jun 2021 09:43:54 -0000       
1.23
+++ proprietary/potential-malware.ru.html       16 Jul 2021 12:02:43 -0000      
1.24
@@ -60,6 +60,20 @@
 <div class="column-limit" id="potential-malware"></div>
 
 <ul class="blurbs">
+  <li id="M202107050">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p><a
+href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+Рекламные компании проводят опыты по 
манипуляциям сознанием людей</a>, чтобы
+навязывать новый способ рекламы, изменяя 
их мечты. Эта &ldquo;инкубация
+целевой мечты&rdquo; привела бы к 
&ldquo;освежающей мечте&rdquo; о продукте,
+по заявлениям компании.</p>
+  </li>
+
   <li id="M201903280">
     
     <!--#set var="DATE" value='<small class="date-tag">
@@ -237,7 +251,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/06/01 09:43:54 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-censorship.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-censorship.ru.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- proprietary/proprietary-censorship.ru.html  1 Jun 2021 09:43:55 -0000       
1.37
+++ proprietary/proprietary-censorship.ru.html  16 Jul 2021 12:02:43 -0000      
1.38
@@ -56,9 +56,9 @@
 <div class="article">
 <p>Один из видов вредоносных функций&nbsp;&mdash; 
цензура доступа
 пользователей.Вот примеры программ, 
которые это делают. У нас есть <a
-href="/proprietary/proprietary-jails.html#about-page"> отдельный 
список
-несвободных систем, которые подвергают 
цензуре установку</a> прикладных
-программ (мы называем это 
&ldquo;тюрьмами&rdquo;).</p>
+href="/proprietary/proprietary-jails.html"> отдельный список 
несвободных
+систем, которые подвергают цензуре 
установку</a> прикладных программ (мы
+называем это &ldquo;тюрьмами&rdquo;).</p>
 
 <p>Продажа продуктов, спроектированных как 
платформа для наложения компанией
 цензуры, должна быть запрещена законом, но 
это не запрещено.</p>
@@ -249,7 +249,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/06/01 09:43:55 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-insecurity.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-insecurity.ru.html,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- proprietary/proprietary-insecurity.ru.html  28 Jun 2021 15:59:23 -0000      
1.119
+++ proprietary/proprietary-insecurity.ru.html  16 Jul 2021 12:02:43 -0000      
1.120
@@ -77,6 +77,28 @@
 <div class="column-limit" id="proprietary-insecurity"></div>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p>Недавно обнаруженная уязвимость Microsoft 
Windows <a
+href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+может позволять взломщикам получать 
удаленный доступ к операционной
+системе</a> и устанавливать программы, 
просматривать и удалять данные и даже
+создавать новые учетные записи с полными 
пользовательскими правами.</p>
+
+    <p>Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла
+утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи
+Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще
+это сделают.</p>
+
+    <p><small>Заметьте, что в статье термин <a
+href="/philosophy/words-to-avoid.html#Hacker">&ldquo;хакеры&rdquo;</a>
+неверно используется для обозначения 
взломщиков.</small></p>
+  </li>
+
   <li id="M202106030">
     
     <!--#set var="DATE" value='<small class="date-tag">
@@ -1428,7 +1450,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/06/28 15:59:23 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-manipulation.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-manipulation.ru.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- proprietary/proprietary-manipulation.ru.html        5 Jul 2021 10:00:42 
-0000       1.18
+++ proprietary/proprietary-manipulation.ru.html        16 Jul 2021 12:02:43 
-0000      1.19
@@ -73,6 +73,20 @@
 <div class="column-limit" id="proprietary-manipulation"></div>
 
 <ul class="blurbs">
+  <li id="M202107050">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p><a
+href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+Рекламные компании проводят опыты по 
манипуляциям сознанием людей</a>, чтобы
+навязывать новый способ рекламы, изменяя 
их мечты. Эта &ldquo;инкубация
+целевой мечты&rdquo; привела бы к 
&ldquo;освежающей мечте&rdquo; о продукте,
+по заявлениям компании.</p>
+  </li>
+
   <li id="M202106220">
     
     <!--#set var="DATE" value='<small class="date-tag">
@@ -285,7 +299,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/05 10:00:42 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.ru.html,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- proprietary/proprietary.ru.html     5 Jul 2021 10:00:42 -0000       1.229
+++ proprietary/proprietary.ru.html     16 Jul 2021 12:02:43 -0000      1.230
@@ -104,8 +104,8 @@
 <hr class="thin" />
 </div>
 
-<p>На июнь 2021&nbsp;года на страницах этого 
каталога перечислено около 500
-примеров вредоносных функций (и более 600 
ссылок, подкрепляющих их), но
+<p>На июль 2021&nbsp;года на страницах этого 
каталога перечислено около 500
+примеров вредоносных функций (и более 610 
ссылок, подкрепляющих их), но
 есть, бесспорно, тысячи других, о которых 
мы не знаем.</p>
 
 <p>Если вы хотите получать уведомления о 
новых пунктах и других изменениях,
@@ -201,6 +201,42 @@
 <h3 id="latest">Последние добавления</h3>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p>Недавно обнаруженная уязвимость Microsoft 
Windows <a
+href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+может позволять взломщикам получать 
удаленный доступ к операционной
+системе</a> и устанавливать программы, 
просматривать и удалять данные и даже
+создавать новые учетные записи с полными 
пользовательскими правами.</p>
+
+    <p>Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла
+утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи
+Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще
+это сделают.</p>
+
+    <p><small>Заметьте, что в статье термин <a
+href="/philosophy/words-to-avoid.html#Hacker">&ldquo;хакеры&rdquo;</a>
+неверно используется для обозначения 
взломщиков.</small></p>
+  </li>
+
+  <li id="M202107050">
+    
+    <!--#set var="DATE" value='<small class="date-tag">
+2021-07</small>'
+    -->
+<!--#echo encoding="none" var="DATE" -->
+<p><a
+href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+Рекламные компании проводят опыты по 
манипуляциям сознанием людей</a>, чтобы
+навязывать новый способ рекламы, изменяя 
их мечты. Эта &ldquo;инкубация
+целевой мечты&rdquo; привела бы к 
&ldquo;освежающей мечте&rdquo; о продукте,
+по заявлениям компании.</p>
+  </li>
+
   <li id="M202106220">
     
     <!--#set var="DATE" value='<small class="date-tag">
@@ -254,33 +290,6 @@
 пользователя. Некоторые из этих 
приложений отслеживают пользователей 
сразу
 на нескольких платформах.</p>
   </li>
-
-  <li id="M202106030">
-    
-    <!--#set var="DATE" value='<small class="date-tag">
-2021-06</small>'
-    -->
-<!--#echo encoding="none" var="DATE" -->
-<p><a
-href="https://techcrunch.com/2021/06/03/tiktok-just-gave-itself-permission-to-collect-biometric-data-on-u-s-users-including-faceprints-and-voiceprints/";>Приложения
-TikTok собирают биометрические 
идентификаторы и биометрическую 
информацию из
-смартфонов пользователей</a>. Компания, 
выпускающая приложения, делает, что
-хочет, и собирает все данные, какие может.</p>
-  </li>
-
-  <li id="M202004131">
-    
-    <!--#set var="DATE" value='<small class="date-tag">
-2020-04</small>'
-    -->
-<!--#echo encoding="none" var="DATE" -->
-<p>Google, Apple и Microsoft (а вероятно, и некоторые 
другие компании)  <a
-href="https://www.lifewire.com/wifi-positioning-system-1683343";>собирают
-точки доступа и координаты GPS людей (что 
определяет точное местоположение
-людей), даже если их GPS отключен</a>, без 
согласия человека с помощью
-несвободных программ, реализованных в его 
смартфоне. Хотя если бы они просто
-спрашивали бы согласия, это не обязательно 
делало бы это правомерным.</p>
-  </li>
 </ul>
 <p class="button right-align">
 <a href="/proprietary/all.html">Далее...</a></p>
@@ -362,7 +371,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/05 10:00:42 $
+$Date: 2021/07/16 12:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/all.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/all.ru-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- proprietary/po/all.ru-en.html       5 Jul 2021 10:00:43 -0000       1.17
+++ proprietary/po/all.ru-en.html       16 Jul 2021 12:02:44 -0000      1.18
@@ -42,6 +42,32 @@
 <div class="column-limit" id="all-malware"></div>
 
 <ul class="blurbs">
+<!--#set var='ADD' value='2021-07-15' --><!--#set var='PUB' value='2021-07-09' 
--><li><small class='date-tag'>Added: <span class="gnun-split"></span><!--#echo 
encoding='none' var='ADD' --><span class="gnun-split"></span> &mdash; Latest 
reference: <span class="gnun-split"></span><!--#echo encoding='none' var='PUB' 
--></small>
+    <p>A newly found Microsoft Windows vulnerability <a
+    
href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+    can allow crackers to remotely gain access to the operating system</a>
+    and install programs, view and delete data, or even create new user
+    accounts with full user rights.</p>
+
+    <p>The security research firm accidentally leaked instructions on
+    how the flaw could be exploited but Windows users should still wait
+    for Microsoft to fix the flaw, if they fix it.</p>
+
+    <p><small>Please note that the article
+    wrongly refers to crackers as &ldquo;<a
+    
href="/philosophy/words-to-avoid.html#Hacker">hackers</a>&rdquo;.</small></p>
+  </li>
+
+<!--#set var='ADD' value='2021-07-15' --><!--#set var='PUB' value='2021-07-05' 
--><li><small class='date-tag'>Added: <span class="gnun-split"></span><!--#echo 
encoding='none' var='ADD' --><span class="gnun-split"></span> &mdash; Latest 
reference: <span class="gnun-split"></span><!--#echo encoding='none' var='PUB' 
--></small>
+    <p><a
+    
href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+    Advertising companies are experimenting to manipulate people's
+    minds</a>, and impose a new way of advertising by altering their
+    dreams. This &ldquo;targeted dream incubation&rdquo; would trigger
+    &ldquo;refreshing dreams&rdquo; of the product, according to the
+    companies.</p>
+  </li>
+
 <!--#set var='ADD' value='2021-07-04' --><!--#set var='PUB' value='2021-06-22' 
--><li><small class='date-tag'>Added: <span class="gnun-split"></span><!--#echo 
encoding='none' var='ADD' --><span class="gnun-split"></span> &mdash; Latest 
reference: <span class="gnun-split"></span><!--#echo encoding='none' var='PUB' 
--></small>
     <p>Peloton company which produces treadmills recently <a
     
href="https://www.bleepingcomputer.com/news/technology/peloton-tread-owners-now-forced-into-monthly-subscription-after-recall/";>locked
@@ -2289,7 +2315,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/05 10:00:43 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/all.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/all.ru.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- proprietary/po/all.ru.po    15 Jul 2021 07:33:48 -0000      1.35
+++ proprietary/po/all.ru.po    16 Jul 2021 12:02:44 -0000      1.36
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -92,6 +91,11 @@
 "programs, view and delete data, or even create new user accounts with full "
 "user rights."
 msgstr ""
+"Недавно обнаруженная уязвимость Microsoft 
Windows <a href=\"https://edition.";
+"cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/\"> может "
+"позволять взломщикам получать удаленный 
доступ к операционной системе</a> и "
+"устанавливать программы, просматривать и 
удалять данные и даже создавать "
+"новые учетные записи с полными 
пользовательскими правами."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""
@@ -99,6 +103,10 @@
 "could be exploited but Windows users should still wait for Microsoft to fix "
 "the flaw, if they fix it."
 msgstr ""
+"Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла "
+"утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи "
+"Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще "
+"это сделают."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""
@@ -117,6 +125,11 @@
 "dreams. This &ldquo;targeted dream incubation&rdquo; would trigger &ldquo;"
 "refreshing dreams&rdquo; of the product, according to the companies."
 msgstr ""
+"<a href=\"https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-";
+"dream-incubation\"> Рекламные компании проводят 
опыты по манипуляциям "
+"сознанием людей</a>, чтобы навязывать новый 
способ рекламы, изменяя их "
+"мечты. Эта &ldquo;инкубация целевой мечты&rdquo; 
привела бы к &ldquo;"
+"освежающей мечте&rdquo; о продукте, по 
заявлениям компании."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""

Index: proprietary/po/malware-microsoft.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ru-en.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- proprietary/po/malware-microsoft.ru-en.html 13 Jun 2021 15:59:19 -0000      
1.102
+++ proprietary/po/malware-microsoft.ru-en.html 16 Jul 2021 12:02:44 -0000      
1.103
@@ -200,6 +200,24 @@
   bugs.</p>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p>A newly found Microsoft Windows vulnerability <a
+    
href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+    can allow crackers to remotely gain access to the operating system</a>
+    and install programs, view and delete data, or even create new user
+    accounts with full user rights.</p>
+
+    <p>The security research firm accidentally leaked instructions on
+    how the flaw could be exploited but Windows users should still wait
+    for Microsoft to fix the flaw, if they fix it.</p>
+
+    <p><small>Please note that the article
+    wrongly refers to crackers as &ldquo;<a
+    
href="/philosophy/words-to-avoid.html#Hacker">hackers</a>&rdquo;.</small></p>
+  </li>
+
   <li id="M202103050">
     <!--#set var="DATE" value='<small class="date-tag">2021-03</small>'
     --><!--#echo encoding="none" var="DATE" -->
@@ -953,7 +971,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/13 15:59:19 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/malware-microsoft.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ru.po,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- proprietary/po/malware-microsoft.ru.po      15 Jul 2021 07:33:50 -0000      
1.269
+++ proprietary/po/malware-microsoft.ru.po      16 Jul 2021 12:02:44 -0000      
1.270
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -343,6 +342,11 @@
 "programs, view and delete data, or even create new user accounts with full "
 "user rights."
 msgstr ""
+"Недавно обнаруженная уязвимость Microsoft 
Windows <a href=\"https://edition.";
+"cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/\"> может "
+"позволять взломщикам получать удаленный 
доступ к операционной системе</a> и "
+"устанавливать программы, просматривать и 
удалять данные и даже создавать "
+"новые учетные записи с полными 
пользовательскими правами."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""
@@ -350,6 +354,10 @@
 "could be exploited but Windows users should still wait for Microsoft to fix "
 "the flaw, if they fix it."
 msgstr ""
+"Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла "
+"утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи "
+"Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще "
+"это сделают."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""

Index: proprietary/po/potential-malware.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/potential-malware.ru-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- proprietary/po/potential-malware.ru-en.html 1 Jun 2021 09:44:00 -0000       
1.22
+++ proprietary/po/potential-malware.ru-en.html 16 Jul 2021 12:02:44 -0000      
1.23
@@ -54,6 +54,18 @@
 <div class="column-limit" id="potential-malware"></div>
 
 <ul class="blurbs">
+  <li id="M202107050">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p><a
+    
href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+    Advertising companies are experimenting to manipulate people's
+    minds</a>, and impose a new way of advertising by altering their
+    dreams. This &ldquo;targeted dream incubation&rdquo; would trigger
+    &ldquo;refreshing dreams&rdquo; of the product, according to the
+    companies.</p>
+  </li>
+
   <li id="M201903280">
     <!--#set var="DATE" value='<small class="date-tag">2019-03</small>'
     --><!--#echo encoding="none" var="DATE" -->
@@ -193,7 +205,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/01 09:44:00 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/potential-malware.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/potential-malware.ru.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- proprietary/po/potential-malware.ru.po      15 Jul 2021 07:33:50 -0000      
1.34
+++ proprietary/po/potential-malware.ru.po      16 Jul 2021 12:02:44 -0000      
1.35
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Potential Malware - GNU Project - Free Software Foundation"
@@ -98,6 +97,11 @@
 "dreams. This &ldquo;targeted dream incubation&rdquo; would trigger &ldquo;"
 "refreshing dreams&rdquo; of the product, according to the companies."
 msgstr ""
+"<a href=\"https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-";
+"dream-incubation\"> Рекламные компании проводят 
опыты по манипуляциям "
+"сознанием людей</a>, чтобы навязывать новый 
способ рекламы, изменяя их "
+"мечты. Эта &ldquo;инкубация целевой мечты&rdquo; 
привела бы к &ldquo;"
+"освежающей мечте&rdquo; о продукте, по 
заявлениям компании."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""

Index: proprietary/po/proprietary-censorship.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-censorship.ru-en.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- proprietary/po/proprietary-censorship.ru-en.html    1 Jun 2021 09:44:00 
-0000       1.37
+++ proprietary/po/proprietary-censorship.ru-en.html    16 Jul 2021 12:02:44 
-0000      1.38
@@ -50,7 +50,7 @@
 <p>One kind of malicious functionality is censorship of what
 users can access.  Here are examples of programs which do this.
 We have a <a
-href="/proprietary/proprietary-jails.html#about-page">separate
+href="/proprietary/proprietary-jails.html">separate
 list of proprietary systems that censor installation</a> of
 application programs (we call them &ldquo;jails&rdquo;).</p>
 
@@ -212,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/01 09:44:00 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-censorship.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-censorship.ru.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- proprietary/po/proprietary-censorship.ru.po 15 Jul 2021 07:33:50 -0000      
1.77
+++ proprietary/po/proprietary-censorship.ru.po 16 Jul 2021 12:02:44 -0000      
1.78
@@ -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-15 07:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Censorship - GNU Project - Free Software Foundation"
@@ -81,19 +80,6 @@
 msgstr "Как правило, это принимает форму 
вредоносных функций."
 
 #. type: Content of: <div><div><p>
-# | One kind of malicious functionality is censorship of what users can
-# | access.  Here are examples of programs which do this.  We have a <a
-# | [-href=\"/proprietary/proprietary-jails.html#about-page\">separate-]
-# | {+href=\"/proprietary/proprietary-jails.html\">separate+} list of
-# | proprietary systems that censor installation</a> of application programs
-# | (we call them &ldquo;jails&rdquo;).
-#, fuzzy
-#| msgid ""
-#| "One kind of malicious functionality is censorship of what users can "
-#| "access.  Here are examples of programs which do this.  We have a <a href="
-#| "\"/proprietary/proprietary-jails.html#about-page\">separate list of "
-#| "proprietary systems that censor installation</a> of application programs "
-#| "(we call them &ldquo;jails&rdquo;)."
 msgid ""
 "One kind of malicious functionality is censorship of what users can access.  "
 "Here are examples of programs which do this.  We have a <a href=\"/"
@@ -103,9 +89,9 @@
 msgstr ""
 "Один из видов вредоносных функций&nbsp;&mdash; 
цензура доступа пользователей."
 "Вот примеры программ, которые это делают. 
У нас есть <a href=\"/proprietary/"
-"proprietary-jails.html#about-page\"> отдельный список 
несвободных систем, "
-"которые подвергают цензуре установку</a> 
прикладных программ (мы называем "
-"это &ldquo;тюрьмами&rdquo;)."
+"proprietary-jails.html\"> отдельный список 
несвободных систем, которые "
+"подвергают цензуре установку</a> 
прикладных программ (мы называем это &ldquo;"
+"тюрьмами&rdquo;)."
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: proprietary/po/proprietary-insecurity.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-insecurity.ru-en.html,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- proprietary/po/proprietary-insecurity.ru-en.html    28 Jun 2021 15:59:24 
-0000      1.118
+++ proprietary/po/proprietary-insecurity.ru-en.html    16 Jul 2021 12:02:44 
-0000      1.119
@@ -71,6 +71,24 @@
 <div class="column-limit" id="proprietary-insecurity"></div>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p>A newly found Microsoft Windows vulnerability <a
+    
href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+    can allow crackers to remotely gain access to the operating system</a>
+    and install programs, view and delete data, or even create new user
+    accounts with full user rights.</p>
+
+    <p>The security research firm accidentally leaked instructions on
+    how the flaw could be exploited but Windows users should still wait
+    for Microsoft to fix the flaw, if they fix it.</p>
+
+    <p><small>Please note that the article
+    wrongly refers to crackers as &ldquo;<a
+    
href="/philosophy/words-to-avoid.html#Hacker">hackers</a>&rdquo;.</small></p>
+  </li>
+
   <li id="M202106030">
     <!--#set var="DATE" value='<small class="date-tag">2021-06</small>'
     --><!--#echo encoding="none" var="DATE" -->
@@ -1140,7 +1158,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/28 15:59:24 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-insecurity.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-insecurity.ru.po,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -b -r1.307 -r1.308
--- proprietary/po/proprietary-insecurity.ru.po 15 Jul 2021 07:33:50 -0000      
1.307
+++ proprietary/po/proprietary-insecurity.ru.po 16 Jul 2021 12:02:44 -0000      
1.308
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Insecurity - GNU Project - Free Software Foundation"
@@ -128,6 +127,11 @@
 "programs, view and delete data, or even create new user accounts with full "
 "user rights."
 msgstr ""
+"Недавно обнаруженная уязвимость Microsoft 
Windows <a href=\"https://edition.";
+"cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/\"> может "
+"позволять взломщикам получать удаленный 
доступ к операционной системе</a> и "
+"устанавливать программы, просматривать и 
удалять данные и даже создавать "
+"новые учетные записи с полными 
пользовательскими правами."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""
@@ -135,6 +139,10 @@
 "could be exploited but Windows users should still wait for Microsoft to fix "
 "the flaw, if they fix it."
 msgstr ""
+"Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла "
+"утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи "
+"Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще "
+"это сделают."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""

Index: proprietary/po/proprietary-manipulation.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-manipulation.ru-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- proprietary/po/proprietary-manipulation.ru-en.html  5 Jul 2021 10:00:43 
-0000       1.17
+++ proprietary/po/proprietary-manipulation.ru-en.html  16 Jul 2021 12:02:44 
-0000      1.18
@@ -68,6 +68,18 @@
 <div class="column-limit" id="proprietary-manipulation"></div>
 
 <ul class="blurbs">
+  <li id="M202107050">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p><a
+    
href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+    Advertising companies are experimenting to manipulate people's
+    minds</a>, and impose a new way of advertising by altering their
+    dreams. This &ldquo;targeted dream incubation&rdquo; would trigger
+    &ldquo;refreshing dreams&rdquo; of the product, according to the
+    companies.</p>
+  </li>
+
   <li id="M202106220">
     <!--#set var="DATE" value='<small class="date-tag">2021-06</small>'
     --><!--#echo encoding="none" var="DATE" -->
@@ -236,7 +248,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/05 10:00:43 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-manipulation.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-manipulation.ru.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- proprietary/po/proprietary-manipulation.ru.po       15 Jul 2021 07:33:50 
-0000      1.27
+++ proprietary/po/proprietary-manipulation.ru.po       16 Jul 2021 12:02:44 
-0000      1.28
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Manipulation - GNU Project - Free Software Foundation"
@@ -120,6 +119,11 @@
 "dreams. This &ldquo;targeted dream incubation&rdquo; would trigger &ldquo;"
 "refreshing dreams&rdquo; of the product, according to the companies."
 msgstr ""
+"<a href=\"https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-";
+"dream-incubation\"> Рекламные компании проводят 
опыты по манипуляциям "
+"сознанием людей</a>, чтобы навязывать новый 
способ рекламы, изменяя их "
+"мечты. Эта &ldquo;инкубация целевой мечты&rdquo; 
привела бы к &ldquo;"
+"освежающей мечте&rdquo; о продукте, по 
заявлениям компании."
 
 #. type: Content of: <div><div><ul><li><p>
 msgid ""

Index: proprietary/po/proprietary.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.ru-en.html,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- proprietary/po/proprietary.ru-en.html       5 Jul 2021 10:00:43 -0000       
1.226
+++ proprietary/po/proprietary.ru-en.html       16 Jul 2021 12:02:44 -0000      
1.227
@@ -96,8 +96,8 @@
 <hr class="thin" />
 </div>
 
-<p>As of June, 2021, the pages in this directory list around 500
-instances of malicious functionalities (with more than 600 references to
+<p>As of July, 2021, the pages in this directory list around 500
+instances of malicious functionalities (with more than 610 references to
 back them up), but there are surely thousands more we don't know about.</p>
 
 <p>If you want to be notified when we add new items or make other changes,
@@ -186,6 +186,36 @@
 <h3 id="latest">Latest additions</h3>
 
 <ul class="blurbs">
+  <li id="M202107090">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p>A newly found Microsoft Windows vulnerability <a
+    
href="https://edition.cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/";>
+    can allow crackers to remotely gain access to the operating system</a>
+    and install programs, view and delete data, or even create new user
+    accounts with full user rights.</p>
+
+    <p>The security research firm accidentally leaked instructions on
+    how the flaw could be exploited but Windows users should still wait
+    for Microsoft to fix the flaw, if they fix it.</p>
+
+    <p><small>Please note that the article
+    wrongly refers to crackers as &ldquo;<a
+    
href="/philosophy/words-to-avoid.html#Hacker">hackers</a>&rdquo;.</small></p>
+  </li>
+
+  <li id="M202107050">
+    <!--#set var="DATE" value='<small class="date-tag">2021-07</small>'
+    --><!--#echo encoding="none" var="DATE" -->
+    <p><a
+    
href="https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-dream-incubation";>
+    Advertising companies are experimenting to manipulate people's
+    minds</a>, and impose a new way of advertising by altering their
+    dreams. This &ldquo;targeted dream incubation&rdquo; would trigger
+    &ldquo;refreshing dreams&rdquo; of the product, according to the
+    companies.</p>
+  </li>
+
   <li id="M202106220">
     <!--#set var="DATE" value='<small class="date-tag">2021-06</small>'
     --><!--#echo encoding="none" var="DATE" -->
@@ -230,28 +260,6 @@
     track user activities. Some of these applications are tracking users
     across different platforms.</p>
   </li>
-
-  <li id="M202106030">
-    <!--#set var="DATE" value='<small class="date-tag">2021-06</small>'
-    --><!--#echo encoding="none" var="DATE" -->
-    <p><a
-    
href="https://techcrunch.com/2021/06/03/tiktok-just-gave-itself-permission-to-collect-biometric-data-on-u-s-users-including-faceprints-and-voiceprints/";>TikTok
-    apps collect biometric identifiers and biometric information from
-    users' smartphones</a>. The company behind it does whatever it wants
-    and collects whatever data it can.</p>
-  </li>
-
-  <li id="M202004131">
-    <!--#set var="DATE" value='<small class="date-tag">2020-04</small>'
-    --><!--#echo encoding="none" var="DATE" -->
-    <p>Google, Apple, and Microsoft (and probably some other companies)
-    <a href="https://www.lifewire.com/wifi-positioning-system-1683343";>are
-    collecting people's access points and GPS coordinates (which can
-    identify people's precise location) even if their GPS is turned
-    off</a>, without the person's consent, using proprietary software
-    implemented in person's smartphone. Though merely asking for permission
-    would not necessarily legitimize this.</p>
-  </li>
 </ul>
 <p class="button right-align">
 <a href="/proprietary/all.html">More items&hellip;</a></p>
@@ -314,7 +322,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/05 10:00:43 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.ru.po,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -b -r1.534 -r1.535
--- proprietary/po/proprietary.ru.po    15 Jul 2021 07:33:51 -0000      1.534
+++ proprietary/po/proprietary.ru.po    16 Jul 2021 12:02:44 -0000      1.535
@@ -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-15 06:25+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Software - GNU Project - Free Software Foundation"
@@ -102,22 +101,13 @@
 "способ дать себя одурачить."
 
 #. type: Content of: <div><p>
-# | As of [-June,-] {+July,+} 2021, the pages in this directory list around
-# | 500 instances of malicious functionalities (with more than 6[-0-]{+1+}0
-# | references to back them up), but there are surely thousands more we don't
-# | know about.
-#, fuzzy
-#| msgid ""
-#| "As of June, 2021, the pages in this directory list around 500 instances "
-#| "of malicious functionalities (with more than 600 references to back them "
-#| "up), but there are surely thousands more we don't know about."
 msgid ""
 "As of July, 2021, the pages in this directory list around 500 instances of "
 "malicious functionalities (with more than 610 references to back them up), "
 "but there are surely thousands more we don't know about."
 msgstr ""
-"На июнь 2021&nbsp;года на страницах этого 
каталога перечислено около 500 "
-"примеров вредоносных функций (и более 600 
ссылок, подкрепляющих их), но "
+"На июль 2021&nbsp;года на страницах этого 
каталога перечислено около 500 "
+"примеров вредоносных функций (и более 610 
ссылок, подкрепляющих их), но "
 "есть, бесспорно, тысячи других, о которых 
мы не знаем."
 
 #. type: Content of: <div><p>
@@ -356,6 +346,11 @@
 "programs, view and delete data, or even create new user accounts with full "
 "user rights."
 msgstr ""
+"Недавно обнаруженная уязвимость Microsoft 
Windows <a href=\"https://edition.";
+"cnn.com/2021/07/08/tech/microsoft-windows-10-printnightmare/\"> может "
+"позволять взломщикам получать удаленный 
доступ к операционной системе</a> и "
+"устанавливать программы, просматривать и 
удалять данные и даже создавать "
+"новые учетные записи с полными 
пользовательскими правами."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""
@@ -363,6 +358,10 @@
 "could be exploited but Windows users should still wait for Microsoft to fix "
 "the flaw, if they fix it."
 msgstr ""
+"Из фирмы, занимающейся исследованиями 
безопасности, случайно произошла "
+"утечка инструкций о том, как можно 
воспользоваться прорехой, но пользователи "
+"Windows все равно должны ждать, пока Microsoft ее 
устранит, если они вообще "
+"это сделают."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""
@@ -381,6 +380,11 @@
 "dreams. This &ldquo;targeted dream incubation&rdquo; would trigger &ldquo;"
 "refreshing dreams&rdquo; of the product, according to the companies."
 msgstr ""
+"<a href=\"https://www.theguardian.com/media/2021/jul/05/advertisers-targeted-";
+"dream-incubation\"> Рекламные компании проводят 
опыты по манипуляциям "
+"сознанием людей</a>, чтобы навязывать новый 
способ рекламы, изменяя их "
+"мечты. Эта &ldquo;инкубация целевой мечты&rdquo; 
привела бы к &ldquo;"
+"освежающей мечте&rdquo; о продукте, по 
заявлениям компании."
 
 #. type: Content of: <div><ul><li><p>
 msgid ""

Index: server/body-include-1.ru.html
===================================================================
RCS file: /web/www/www/server/body-include-1.ru.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/body-include-1.ru.html       15 Jul 2021 07:02:49 -0000      1.46
+++ server/body-include-1.ru.html       16 Jul 2021 12:02:44 -0000      1.47
@@ -13,10 +13,11 @@
   <div class="message">
     <p>
       <!--#echo encoding='none' var='fr_link' -->
-Your donation helps us lead the journey to freedom for all computer
-users. Help us maximize our summer fundraising goal by donating before July
-19 &mdash; Every contribution will be matched dollar for dollar by generous
-donors up to USD 11,000.  <span class="highlight">Read more &gt;</span>
+Ваши пожертвования помогают нам быть 
проводником в путешествии к свободе для
+всех пользователей компьютеров. Помогите 
нам собрать как можно больше,
+пожертвовав до 19 июля&nbsp;&mdash; каждый вклад 
будет удвоен нашими
+великодушными благотворителями вплоть до 
11&nbsp;000&nbsp;$. <span
+class="highlight">Далее &gt;</span>
     <!--#echo
       encoding='none' var='a_close' -->
 </p>
@@ -50,7 +51,7 @@
 <!--#echo encoding="none" var="a_close" -->
 <!--#echo encoding='none' var="d_val" -->
 </div>
-      <span class="goal">USD 11,000</span>
+      <span class="goal">11&nbsp;000&nbsp;$</span>
     </div>
   </div>
 <!-- .progresswidget -->

Index: server/sitemap.ru.html
===================================================================
RCS file: /web/www/www/server/sitemap.ru.html,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -b -r1.494 -r1.495
--- server/sitemap.ru.html      15 Jul 2021 17:02:49 -0000      1.494
+++ server/sitemap.ru.html      16 Jul 2021 12:02:44 -0000      1.495
@@ -429,13 +429,13 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Сообщения об ошибках в Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame</dd>
+  <dd>Вечный пламень</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Почему вирусы на GNU/Linux довольно редки</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
   <dd>Филки</dd>
   <dt><a href="/fun/jokes/freesoftware.html">freesoftware.html</a></dt>
-  <dd>Tribute to Free Software</dd>
+  <dd>Дань свободным программам</dd>
   <dt><a href="/fun/jokes/fsf-in-german.html">fsf-in-german.html</a></dt>
   <dd>ФСПО по-немецки</dd>
   <dt><a href="/fun/jokes/fundefinitions1.html">fundefinitions1.html</a></dt>
@@ -464,24 +464,24 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>Если бы &ldquo;Битлз&rdquo; были хакерами...</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom</dd>
+  <dd>Хакеры за свободу</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>The Song of Hakawatha</dd>
+  <dd>Песнь Хакаваты</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a Bash Prompt</dd>
+  <dd>Счастье в приглашении Bash</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
-  <dd>Happy New Year in four languages</dd>
+  <dd>С новым годом на четырех языках</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
   <dd>Патент на &ldquo;Hello, world!&rdquo;</dd>
   <dt><a href="/fun/jokes/helloworld.html">helloworld.html</a></dt>
   <dd>Hello, world!</dd>
   <dt><a 
href="/fun/jokes/know.your.sysadmin.html">know.your.sysadmin.html</a></dt>
   <dd>Узнай своего системного 
администратора<br />
-<small>A Field Guide</small></dd>
+<small>Руководство к действию</small></dd>
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>Последний глюк</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUs Just Wanna Have Fun</dd>
+  <dd>GNU просто хотят поразвлечься</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Длинные ключи?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -489,7 +489,7 @@
   <dt><a href="/fun/jokes/luser-vs-rms.html">luser-vs-rms.html</a></dt>
   <dd>Неискушенный пользователь и rms</dd>
   <dt><a href="/fun/jokes/merry-xmas.html">merry-xmas.html</a></dt>
-  <dd>Merry Christmas in four languages</dd>
+  <dd>С рождеством на четырех языках</dd>
   <dt><a href="/fun/jokes/microsoft-church.html">microsoft-church.html</a></dt>
   <dd>Microsoft и церковь</dd>
   <dt><a href="/fun/jokes/midnight.dreary.html">midnight.dreary.html</a></dt>
@@ -497,11 +497,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Музыкальная импровизация</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A Networkologist's Christmas <small>(v3.1)</small></dd>
+  <dd>Рождество сетевика <small>(3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Эта песня не принадлежит никому</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only GNU (And GNU Alone)</dd>
+  <dd>Только GNU (и лишь GNU)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Десять главных причин, по которым в Intel 
задержали объявление о P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -515,7 +515,7 @@
   <dt><a href="/fun/jokes/physics.html">physics.html</a></dt>
   <dd>Физический магазин</dd>
   <dt><a href="/fun/jokes/power.users.html">power.users.html</a></dt>
-  <dd>The Power User's Guide To Power Users</dd>
+  <dd>Руководство опытного пользователя для 
опытных пользователей</dd>
   <dt><a 
href="/fun/jokes/purchase.agreement.html">purchase.agreement.html</a></dt>
   <dd>Предупреждение</dd>
   <dt><a href="/fun/jokes/quotations.html">quotations.html</a></dt>
@@ -545,15 +545,15 @@
   <dt><a href="/fun/jokes/users-lightbulb.html">users-lightbulb.html</a></dt>
   <dd>Сколько нужно пользователей GNU/Linux, 
чтобы заменить лампочку?</dd>
   <dt><a href="/fun/jokes/vaxorcist.html">vaxorcist.html</a></dt>
-  <dd>The VAXorcist</dd>
+  <dd>VAXорцист</dd>
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Приверженец <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>Vim, Send Me an Angel!</dd>
+  <dd>Vim, пошли мне ангела!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Предупреждение о вирусе</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>Welcome to GNU Emacs</dd>
+  <dd>Добро пожаловать в GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>Эмблема волка</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1154,7 +1154,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>Блюз программиста</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs Vi</dd>
+  <dd>Emacs и Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>Свободная песня на день рождения</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2271,7 +2271,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/07/15 17:02:49 $
+$Date: 2021/07/16 12:02:44 $
 
 <!-- timestamp end -->
 </p>

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.ru.po      15 Jul 2021 16:02:04 -0000      
1.130
+++ server/gnun/compendia/compendium.ru.po      16 Jul 2021 12:02:44 -0000      
1.131
@@ -190,6 +190,8 @@
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">Шутки GNU</a>&nbsp;/ <a 
href="
+"\"/fun/humor.html#Software\">Программы</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>

Index: server/po/body-include-1.ru.po
===================================================================
RCS file: /web/www/www/server/po/body-include-1.ru.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/po/body-include-1.ru.po      16 Jul 2021 11:43:14 -0000      1.55
+++ server/po/body-include-1.ru.po      16 Jul 2021 12:02:44 -0000      1.56
@@ -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-15 06:55+0000\n"
 
 #. type: Content of: <div>
 msgid "<a class=\"skip\" href=\"#content\"><b>Skip to main text</b></a>"
@@ -24,17 +23,6 @@
 
 #. #echo encoding='none' var='fr_link' 
 #. type: Content of: <div><div><p>
-# | Your donation helps us lead the journey to freedom for all computer users.
-# | Help us [-reach-] {+maximize+} our {+summer fundraising+} goal [-of USD
-# | 50,000-] {+by donating+} before July [-16,-] {+19 &mdash; Every
-# | contribution will be matched dollar for dollar by generous donors up+} to
-# | [-fuel free software advocacy and development.-] {+USD 11,000.+}  <span
-# | class=\"highlight\">Read more &gt;</span>
-#| msgid ""
-#| "Your donation helps us lead the journey to freedom for all computer "
-#| "users.  Help us reach our goal of USD 50,000 before July 16, to fuel free "
-#| "software advocacy and development.  <span class=\"highlight\">Read more "
-#| "&gt;</span>"
 msgid ""
 "Your donation helps us lead the journey to freedom for all computer users. "
 "Help us maximize our summer fundraising goal by donating before July 19 "
@@ -43,13 +31,11 @@
 msgstr ""
 "Ваши пожертвования помогают нам быть 
проводником в путешествии к свободе для "
 "всех пользователей компьютеров. Помогите 
нам собрать как можно больше, "
-"пожертвовав до 19 июля&nbsp;&mdash; каждый вклад 
будет удвоен нашими великодушными "
-"благотворителями вплоть до 11&nbsp;000&nbsp;$. "
-"<span class=\"highlight\">Далее &gt;</span>"
+"пожертвовав до 19 июля&nbsp;&mdash; каждый вклад 
будет удвоен нашими "
+"великодушными благотворителями вплоть до 
11&nbsp;000&nbsp;$. <span class="
+"\"highlight\">Далее &gt;</span>"
 
 #. type: Content of: <div><div>
-# | <span class=\"goal\">USD [-50,000</span>-] {+11,000</span>+}
-#| msgid "<span class=\"goal\">USD 50,000</span>"
 msgid "<span class=\"goal\">USD 11,000</span>"
 msgstr "<span class=\"goal\">11&nbsp;000&nbsp;$</span>"
 

Index: server/po/sitemap.ru-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru-en.html,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -b -r1.289 -r1.290
--- server/po/sitemap.ru-en.html        11 Jul 2021 17:02:12 -0000      1.289
+++ server/po/sitemap.ru-en.html        16 Jul 2021 12:02:44 -0000      1.290
@@ -415,13 +415,13 @@
   <dt><a href="/fun/jokes/error-haiku.html">error-haiku.html</a></dt>
   <dd>Error messages in Haiku?</dd>
   <dt><a href="/fun/jokes/eternal-flame.html">eternal-flame.html</a></dt>
-  <dd>Eternal Flame (song parody)</dd>
+  <dd>Eternal Flame</dd>
   <dt><a href="/fun/jokes/evilmalware.html">evilmalware.html</a></dt>
   <dd>Why GNU/Linux Viruses are fairly uncommon</dd>
   <dt><a href="/fun/jokes/filks.html">filks.html</a></dt>
   <dd>Filks</dd>
   <dt><a href="/fun/jokes/freesoftware.html">freesoftware.html</a></dt>
-  <dd>Free Software</dd>
+  <dd>Tribute to Free Software</dd>
   <dt><a href="/fun/jokes/fsf-in-german.html">fsf-in-german.html</a></dt>
   <dd>FSF in German</dd>
   <dt><a href="/fun/jokes/fundefinitions1.html">fundefinitions1.html</a></dt>
@@ -450,23 +450,24 @@
   <dt><a href="/fun/jokes/hackersong.html">hackersong.html</a></dt>
   <dd>If the Beatles were hackers&hellip;</dd>
   <dt><a href="/fun/jokes/hackforfreedom.html">hackforfreedom.html</a></dt>
-  <dd>Hack For Freedom Song</dd>
+  <dd>Hack For Freedom</dd>
   <dt><a href="/fun/jokes/hakawatha.html">hakawatha.html</a></dt>
-  <dd>HAKAWATHA</dd>
+  <dd>The Song of Hakawatha</dd>
   <dt><a href="/fun/jokes/hap-bash.html">hap-bash.html</a></dt>
-  <dd>Happiness is a bash prompt</dd>
+  <dd>Happiness is a Bash Prompt</dd>
   <dt><a href="/fun/jokes/happy-new-year.html">happy-new-year.html</a></dt>
-  <dd>Happy New Year in 4 languages</dd>
+  <dd>Happy New Year in four languages</dd>
   <dt><a 
href="/fun/jokes/hello_world_patent.html">hello_world_patent.html</a></dt>
   <dd>The YAAS Foundation Patent Suit</dd>
   <dt><a href="/fun/jokes/helloworld.html">helloworld.html</a></dt>
   <dd>Hello World!</dd>
   <dt><a 
href="/fun/jokes/know.your.sysadmin.html">know.your.sysadmin.html</a></dt>
-  <dd>Know your System Administrator</dd>
+  <dd>Know your System Administrator<br />
+<small>A Field Guide</small></dd>
   <dt><a href="/fun/jokes/last.bug.html">last.bug.html</a></dt>
   <dd>The Last Bug</dd>
   <dt><a href="/fun/jokes/lauper.html">lauper.html</a></dt>
-  <dd>GNUS JUST WANNA HAVE FUN</dd>
+  <dd>GNUs Just Wanna Have Fun</dd>
   <dt><a href="/fun/jokes/long-options.html">long-options.html</a></dt>
   <dd>Long options?</dd>
   <dt><a href="/fun/jokes/look-and-feel.html">look-and-feel.html</a></dt>
@@ -474,7 +475,7 @@
   <dt><a href="/fun/jokes/luser-vs-rms.html">luser-vs-rms.html</a></dt>
   <dd>Luser vs RMS</dd>
   <dt><a href="/fun/jokes/merry-xmas.html">merry-xmas.html</a></dt>
-  <dd>Merry Christmas in 4 languages</dd>
+  <dd>Merry Christmas in four languages</dd>
   <dt><a href="/fun/jokes/microsoft-church.html">microsoft-church.html</a></dt>
   <dd>Microsoft and the Church</dd>
   <dt><a href="/fun/jokes/midnight.dreary.html">midnight.dreary.html</a></dt>
@@ -482,11 +483,11 @@
   <dt><a href="/fun/jokes/musical-pickup.html">musical-pickup.html</a></dt>
   <dd>Musical pick-up!</dd>
   <dt><a href="/fun/jokes/networkologist.html">networkologist.html</a></dt>
-  <dd>A  Networkologist's Christmas (v3.1)</dd>
+  <dd>A  Networkologist's Christmas <small>(v3.1)</small></dd>
   <dt><a href="/fun/jokes/nobody-owns.html">nobody-owns.html</a></dt>
   <dd>Nobody owns this song</dd>
   <dt><a href="/fun/jokes/only-gnu.html">only-gnu.html</a></dt>
-  <dd>Only G.N.U. (And G.N.U. Alone)</dd>
+  <dd>Only GNU (And GNU Alone)</dd>
   <dt><a href="/fun/jokes/p5.delay.html">p5.delay.html</a></dt>
   <dd>Top Ten Reasons Why Intel Delayed Announcing the P5</dd>
   <dt><a href="/fun/jokes/paging.game.html">paging.game.html</a></dt>
@@ -500,7 +501,7 @@
   <dt><a href="/fun/jokes/physics.html">physics.html</a></dt>
   <dd>The Physics Store!</dd>
   <dt><a href="/fun/jokes/power.users.html">power.users.html</a></dt>
-  <dd>Power Users Guide</dd>
+  <dd>The Power User's Guide To Power Users</dd>
   <dt><a 
href="/fun/jokes/purchase.agreement.html">purchase.agreement.html</a></dt>
   <dd>Disclaimer!</dd>
   <dt><a href="/fun/jokes/quotations.html">quotations.html</a></dt>
@@ -530,15 +531,15 @@
   <dt><a href="/fun/jokes/users-lightbulb.html">users-lightbulb.html</a></dt>
   <dd>How many GNU/Linux users are needed to change a light bulb?</dd>
   <dt><a href="/fun/jokes/vaxorcist.html">vaxorcist.html</a></dt>
-  <dd>THE VAXORCIST</dd>
+  <dd>The VAXorcist</dd>
   <dt><a href="/fun/jokes/vi.song.html">vi.song.html</a></dt>
   <dd>Addicted to <code>vi</code></dd>
   <dt><a href="/fun/jokes/vim-songs.html">vim-songs.html</a></dt>
-  <dd>VIM Songs . . .</dd>
+  <dd>Vim, Send Me an Angel!</dd>
   <dt><a href="/fun/jokes/virus-warning.html">virus-warning.html</a></dt>
   <dd>Virus Warning</dd>
   <dt><a 
href="/fun/jokes/welcome-to-gnu-emacs.html">welcome-to-gnu-emacs.html</a></dt>
-  <dd>GNU Emacs Song</dd>
+  <dd>Welcome to GNU Emacs</dd>
   <dt><a href="/fun/jokes/wolf-logo.html">wolf-logo.html</a></dt>
   <dd>The Wolf Logo</dd>
   <dt><a href="/fun/jokes/wonderful-code.html">wonderful-code.html</a></dt>
@@ -1101,7 +1102,7 @@
   <dt><a href="/music/blues-song.html">blues-song.html</a></dt>
   <dd>The Programmer's Blues</dd>
   <dt><a href="/music/emacsvsvi.html">emacsvsvi.html</a></dt>
-  <dd>Emacs vs VI</dd>
+  <dd>Emacs vs Vi</dd>
   <dt><a href="/music/free-birthday-song.html">free-birthday-song.html</a></dt>
   <dd>The Free Birthday Song</dd>
   <dt><a href="/music/free-firmware-song.html">free-firmware-song.html</a></dt>
@@ -2090,7 +2091,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/07/11 17:02:12 $
+$Date: 2021/07/16 12:02:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.ru.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru.po,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -b -r1.654 -r1.655
--- server/po/sitemap.ru.po     16 Jul 2021 11:43:14 -0000      1.654
+++ server/po/sitemap.ru.po     16 Jul 2021 12:02:44 -0000      1.655
@@ -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-12 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Site map of www.gnu.org - GNU Project - Free Software Foundation"
@@ -1100,8 +1099,6 @@
 
 # type: Attribute 'title' of: <link>
 #. type: Content of: <div><dl><dd><div><dl><dd><dl><dd>
-# | [-New-]{+Tribute to+} Free Software
-#| msgid "New Free Software"
 msgid "Tribute to Free Software"
 msgstr "Дань свободным программам"
 

Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.2213
retrieving revision 1.2214
diff -u -b -r1.2213 -r1.2214
--- software/recent-releases-include.ru.html    14 Jul 2021 01:00:03 -0000      
1.2213
+++ software/recent-releases-include.ru.html    16 Jul 2021 12:02:45 -0000      
1.2214
@@ -1,26 +1,26 @@
 
 <!--#set var="LINK_CLOSE" value="</a>, <i>" -->
 <ul>
-<li><strong>July 13, 2021</strong>
+<li><strong>13 июля 2021</strong>
 <ul>
 <li><!--#set var="LINK" 
 value='<a href="//lists.gnu.org/archive/html/info-gnu/2021-07/msg00005.html">' 
-->
 <!--#echo 
 encoding="none" var="LINK" -->
-GNU Chess 6.2.9 released<!--#echo 
+Выпущен GNU Chess 6.2.9<!--#echo 
 encoding="none" var="LINK_CLOSE" -->
 Антонио Чебаллос<!--#set 
 var="TIME" value="</i>, 20:45" -->
 <!--#echo encoding="none" var="TIME" -->
 </li>
 </ul></li>
-<li><strong>July 10, 2021</strong>
+<li><strong>10 июля 2021</strong>
 <ul>
 <li><!--#set var="LINK" 
 value='<a href="//lists.gnu.org/archive/html/info-gnu/2021-07/msg00004.html">' 
-->
 <!--#echo 
 encoding="none" var="LINK" -->
-GNU mtools 4.0.32 released<!--#echo 
+Выпущен GNU mtools 4.0.32<!--#echo 
 encoding="none" var="LINK_CLOSE" -->
 Ален Кнафф<!--#set 
 var="TIME" value="</i>, 10:01" -->

Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.3132
retrieving revision 1.3133
diff -u -b -r1.3132 -r1.3133
--- software/po/recent-releases-include.ru.po   16 Jul 2021 11:43:14 -0000      
1.3132
+++ software/po/recent-releases-include.ru.po   16 Jul 2021 12:02:45 -0000      
1.3133
@@ -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-10 14:27+0000\n"
 
 #. type: Content of: <ul><li>
-# | <strong>July [-10, 2020</strong>-] {+13, 2021</strong>+}
-#| msgid "<strong>July 10, 2020</strong>"
 msgid "<strong>July 13, 2021</strong>"
 msgstr "<strong>13 июля 2021</strong>"
 
@@ -27,8 +24,6 @@
 #. #echo 
 #. encoding="none" var="LINK" 
 #. type: Content of: <ul><li><ul><li>
-# | GNU Chess 6.2.[-8-]{+9+} released
-#| msgid "GNU Chess 6.2.8 released"
 msgid "GNU Chess 6.2.9 released"
 msgstr "Выпущен GNU Chess 6.2.9"
 
@@ -39,8 +34,6 @@
 msgstr "Антонио Чебаллос"
 
 #. type: Content of: <ul><li>
-# | <strong>July 10, 202[-0-]{+1+}</strong>
-#| msgid "<strong>July 10, 2020</strong>"
 msgid "<strong>July 10, 2021</strong>"
 msgstr "<strong>10 июля 2021</strong>"
 
@@ -49,8 +42,6 @@
 #. #echo 
 #. encoding="none" var="LINK" 
 #. type: Content of: <ul><li><ul><li>
-# | GNU mtools 4.0.3[-1-]{+2+} released
-#| msgid "GNU mtools 4.0.31 released"
 msgid "GNU mtools 4.0.32 released"
 msgstr "Выпущен GNU mtools 4.0.32"
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]