www-commits
[Top][All Lists]
Advanced

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

www/fun/jokes echo-msg.ru.html gospel.ru.html h...


From: GNUN
Subject: www/fun/jokes echo-msg.ru.html gospel.ru.html h...
Date: Fri, 16 Jul 2021 09:30:48 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/16 09:30:48

Modified files:
        fun/jokes      : echo-msg.ru.html gospel.ru.html 
                         hello_world_patent.ru.html 
                         users-lightbulb.ru.html 
        fun/jokes/po   : echo-msg.ru-en.html echo-msg.ru.po 
                         gospel.ru-en.html gospel.ru.po 
                         hello_world_patent.ru-en.html 
                         hello_world_patent.ru.po 
                         users-lightbulb.ru-en.html 
                         users-lightbulb.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/echo-msg.ru.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/gospel.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/hello_world_patent.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/users-lightbulb.ru.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/echo-msg.ru-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/echo-msg.ru.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gospel.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gospel.ru.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hello_world_patent.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/hello_world_patent.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/users-lightbulb.ru.po?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: echo-msg.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/echo-msg.ru.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- echo-msg.ru.html    17 Dec 2020 09:31:25 -0000      1.4
+++ echo-msg.ru.html    16 Jul 2021 13:30:48 -0000      1.5
@@ -1,41 +1,64 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/echo-msg.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: Revision: 1.94 -->
+<!-- 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 Echo - Проект GNU - Фонд свободного 
программного обеспечения</title>
 <style type="text/css" media="screen, print">
+p.infobox { margin-bottom: 2em; }
 table { width: 100%; }
-th { text-align: left; vertical-align: top; }
 td, th { padding: 1em; }
+th { text-align: left; vertical-align: top; }
+.col1 { border-right: 0; }
+.col2 { text-align: center; border-left: 0; border-right: 0; }
+.col3 { text-align: right; border-left: 0; }
+.col1, .col3 { width: 20%; }
 td p { margin-bottom: 0; }
 td p:first-child { margin-top: 0; }
 </style>
 
 <!--#include virtual="/fun/jokes/po/echo-msg.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="Домашняя страница GNU" title="Домашняя 
страница GNU" /></a>&nbsp;/ <a 
href="/fun/humor.html#content">Шутки&nbsp;GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Documentation">Документация</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>GNU Echo?</h2>
 
-<pre>
+<address class="byline">Роберт Герндон</address>
+
+<p class="infobox">
+От кого: herndon@umn-cs.UUCP<br />
+Тема: GNU Echo, выпуск 1<br />
+Дата: 28 окт 85 18:23:00 GMT<br />
+Принято: 10 ноя 85 05:29:10 GMT <em>[так]</em></p>
+
+<pre class="c">
 /* Написано в 12:22 28 окт 1985 пользователем 
umn-cs!herndon в umn-cs:net.jokes */
 /* ---------- "GNU Echo, Выпуск 1" ---------- */
 </pre>
 
-<table>
-<tr><td>GNUecho(1)</td> <td>Руководство программиста 
Unix</td> <td>GNUecho(1)</td></tr>
-</table>
+<table class="echo">
+<tr><td class="col1">GNUecho(1)</td>
+    <td class="col2">Руководство программиста Unix</td>
+    <td class="col3">GNUecho(1)</td></tr>
 
-<table>
 <tr><th>ИМЯ</th>
-<td>echo - вывести аргументы</td></tr>
+<td colspan="2">echo - вывести аргументы</td></tr>
 
 <tr><th>ВЫЗОВ</th>
-<td>echo [ параметры ] &hellip;</td></tr>
+<td colspan="2">echo [ параметры ] &hellip;</td></tr>
 
 <tr><th>ОПИСАНИЕ</th>
-     <td><p>Echo выводит свои аргументы, 
разделенные пробелами и завершенные 
переводом
+     <td colspan="2"><p>Echo выводит свои аргументы, 
разделенные пробелами и завершенные 
переводом
 строки, в стандартный поток вывода. 
Параметры для перенаправления и
 фильтрации вывода:</p>
 
@@ -139,28 +162,19 @@
 диагностику в файл стандартного потока 
вывода, введите &lsquo;echo &hellip;
 1&gt;2&rsquo;.</p></td></tr>
 
-<tr><th>АВТОР</th>
-<td>Роберт Герндон</td></tr>
+<tr id="Licensing"><th>АВТОР</th>
+<td colspan="2">Роберт Герндон</td></tr>
 
 <tr><th>ЛИЦЕНЗИЯ</th>
-<td>GNU GPL, версия 2 или более поздняя.</td></tr>
-</table>
+<td colspan="2">GNU GPL, версия 2 или более 
поздняя.</td></tr>
 
-<table>
-<tr><td>Распечатано 28/10/85</td> <td>18 января 1983</td></tr>
+<tr><td class="col1"><small>Распечатано 28/10/85</small></td>
+    <td class="col2"><small>18 января 1983</small></td>
+    <td class="col3"><small>3</small></td></tr>
 </table>
 
-<p>Оригинал этой шутки есть также в <a 
href="/fun/jokes/echo-msg.txt"> простом
-тексте</a>.</p>
-
-<p style="margin-top: 2em">
-<a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
-
-<h3 id="Disclaimer" class="footnote">Предупреждение</h3>
-<p>Эта шутка извлечена из <a 
href="https://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
+<p class="button right-align"><a 
href="/fun/jokes/echo-msg.txt">Первоначальное 
сообщение</a></p>
+</div>
 
 <div class="translators-notes">
 
@@ -168,8 +182,9 @@
  </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
@@ -202,6 +217,8 @@
 переводам&rdquo;</a>.</p>
 </div>
 
+<p><a href="#Licensing">Информация о 
лицензировании</a></p>
+
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
 
@@ -215,7 +232,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/12/17 09:31:25 $
+$Date: 2021/07/16 13:30:48 $
 
 <!-- timestamp end -->
 </p>

Index: gospel.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/gospel.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gospel.ru.html      30 Jan 2020 18:30:40 -0000      1.1
+++ gospel.ru.html      16 Jul 2021 13:30:48 -0000      1.2
@@ -1,11 +1,24 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/gospel.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/gospel.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#Unclassified">Прочее</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Правила, грехи, добродетели, боги и так 
далее Церкви EMACS по Евангелию
 пророка Антония</h2>
 
@@ -72,42 +85,54 @@
 <p>Предупреждение: Принимать Церковь EMACS 
всерьез опасно для вашего здоровья;
 в особенности ДУШЕВНОГО ЗДОРОВЬЯ.</p>
 
-<p><a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
-
-<h4 id="Disclaimer">Предупреждение</h4>
-<p>Эта шутка извлечена из <a 
href="http://lists.gnu.org/";>архивов почты</a>
-проекта GNU ФСПО.</p>
-<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
-шутку.</p>
-
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Предупреждение</h3>
+<p>Эта шутка извлечена из архивов почты 
проекта GNU ФСПО. Фонд свободного
+программного обеспечения не заявляет 
авторских прав на нее.</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">
@@ -119,16 +144,15 @@
 href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
 gnu.org</a>.</em></div>
 
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/01/30 18:30:40 $
+$Date: 2021/07/16 13:30:48 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: hello_world_patent.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/hello_world_patent.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hello_world_patent.ru.html  24 Sep 2015 05:57:49 -0000      1.1
+++ hello_world_patent.ru.html  16 Jul 2021 13:30:48 -0000      1.2
@@ -1,17 +1,32 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/hello_world_patent.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>Патентный иск фонда YAAS</title>
+<title>Патентный иск фонда YAAS - Проект GNU - Фонд 
свободного программного
+обеспечения</title>
 
 <!--#include virtual="/fun/jokes/po/hello_world_patent.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h3>Патентный иск фонда YAAS</h3>
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="Домашняя страница GNU" title="Домашняя 
страница GNU" /></a>&nbsp;/ <a 
href="/fun/humor.html#content">Шутки&nbsp;GNU</a>&nbsp;/ <a
+href="/fun/humor.html#Philosophy">Философия</a>&nbsp;/
+</div>
 
-<blockquote><pre>Дата: среда, 6 авг. 2003 16:46:55 +0200
-От кого: Стефан Миджич &lt;stefan@ivan.nu&gt;
-Кому: Ричард Столмен &lt;rms@stallman.org&gt;
-Subject: Относительно "Здравствуй, мир"</pre>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
+<h2>Патентный иск фонда YAAS</h2>
+
+<p class="infobox">
+От кого: Стефан Миджич &lt;stefan@ivan.nu&gt;<br />
+Кому: Ричард Столмен &lt;rms@stallman.org&gt;<br />
+Тема: Отностельно Здравствуй, мир<br />
+Дата: срд, 6 авг 2003 16:46:55 +0200</p>
 
 <p>Здравствуйте, г-н Столмен!</p>
 
@@ -31,37 +46,56 @@
 г-н&nbsp;Столмен, что Вы отнесетесь к этому 
так же серьезно, как и мы, и
 желаем вам хорошего дня.</p>
 
-<p>&mdash;Стефан из YAAS</p></blockquote>
+<address>&mdash;Стефан из YAAS</address>
 
-<p><a href="/fun/humor.html">Другой юмор</a> из коллекции 
GNU.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Предупреждение</h3>
+<p>Фонд свободного программного 
обеспечения не заявляет авторских прав на 
эту
+шутку.</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">
@@ -69,16 +103,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:49 $
+$Date: 2021/07/16 13:30:48 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: users-lightbulb.ru.html
===================================================================
RCS file: /web/www/www/fun/jokes/users-lightbulb.ru.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- users-lightbulb.ru.html     28 Jul 2019 10:31:25 -0000      1.2
+++ users-lightbulb.ru.html     16 Jul 2021 13:30:48 -0000      1.3
@@ -1,7 +1,9 @@
 <!--#set var="ENGLISH_PAGE" value="/fun/jokes/users-lightbulb.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="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Сколько нужно пользователей GNU/Linux, 
чтобы заменить лампочку? — Проект GNU
@@ -9,8 +11,19 @@
 
 <!--#include virtual="/fun/jokes/po/users-lightbulb.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#Unclassified">Прочее</a>&nbsp;/
+</div>
+
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="reduced-width">
 <h2>Сколько нужно пользователей GNU/Linux, чтобы 
заменить лампочку?</h2>
 
+<address class="byline">Андре Феррейра Махадо</address>
+
 <ul>
 <li>Один, чтобы сообщить в список рассылки, 
что лампочка сгорела.</li>
 <li>Один, чтобы посоветовать попробовать 
включить лампу через командную строку.</li>
@@ -73,11 +86,7 @@
 <li>Отец первого пользователя, который, пока 
все дискутировали, сходил в магазин
 и купил самую дешевую лампочку.</li>
 </ul>
-
-<h3 id="Disclaimer">Уведомление</h3>
-<p>Шутка с этой страницы прислана в ФСПО ее 
автором, Андре Машаду.</p>
-<p>Фонд свободного программного 
обеспечения не претендует на авторство 
этой
-шутки.</p>
+</div>
 
 <div class="translators-notes">
 
@@ -87,7 +96,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
@@ -107,7 +116,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>. -->
@@ -120,26 +129,10 @@
 переводам&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. -->
 <p>Copyright &copy; 2014 Andre Machado<br />Copyright &copy; 2015 Dmitry
 Alexandrov (translation)</p>
 
-<p>Это произведение доступно по <a rel="license"
+<p>Шутка на этой странице доступна по <a 
rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
 производных произведений</em>) 4.0 
Всемирная</a>.</p>
@@ -153,11 +146,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2019/07/28 10:31:25 $
+$Date: 2021/07/16 13:30:48 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/echo-msg.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/echo-msg.ru-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/echo-msg.ru-en.html      17 Dec 2020 09:31:25 -0000      1.4
+++ po/echo-msg.ru-en.html      16 Jul 2021 13:30:48 -0000      1.5
@@ -1,37 +1,59 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: Revision: 1.94 -->
+<!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>GNU Echo - GNU Project - Free Software Foundation</title>
 <style type="text/css" media="screen, print">
+p.infobox { margin-bottom: 2em; }
 table { width: 100%; }
-th { text-align: left; vertical-align: top; }
 td, th { padding: 1em; }
+th { text-align: left; vertical-align: top; }
+.col1 { border-right: 0; }
+.col2 { text-align: center; border-left: 0; border-right: 0; }
+.col3 { text-align: right; border-left: 0; }
+.col1, .col3 { width: 20%; }
 td p { margin-bottom: 0; }
 td p:first-child { margin-top: 0; }
 </style>
 <!--#include virtual="/fun/jokes/po/echo-msg.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/fun/humor.html#Documentation">Documentation</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>GNU Echo?</h2>
 
-<pre>
+<address class="byline">by Robert Herndon</address>
+
+<p class="infobox">
+From: herndon@umn-cs.UUCP<br />
+Subject: GNU Echo, Release 1<br />
+Date: 28 Oct 85 18:23:00 GMT<br />
+Date-Received: 10 Nov 85 05:29:10 GMT <em>[sic]</em></p>
+
+<pre class="c">
 /* Written 12:22 pm  Oct 28, 1985 by umn-cs!herndon in umn-cs:net.jokes */
 /* ---------- "GNU Echo, Release 1" ---------- */
 </pre>
 
-<table>
-<tr><td>GNUecho(1)</td> <td>Unix Programmer's
-Manual</td> <td>GNUecho(1)</td></tr>
-</table>
+<table class="echo">
+<tr><td class="col1">GNUecho(1)</td>
+    <td class="col2">Unix Programmer's Manual</td>
+    <td class="col3">GNUecho(1)</td></tr>
 
-<table>
 <tr><th>NAME</th>
-<td>echo - echo arguments</td></tr>
+<td colspan="2">echo - echo arguments</td></tr>
 
 <tr><th>SYNOPSIS</th>
-<td>echo [ options ] &hellip;</td></tr>
+<td colspan="2">echo [ options ] &hellip;</td></tr>
 
 <tr><th>DESCRIPTION</th>
-     <td><p>Echo writes its arguments separated by blanks and terminated
+     <td colspan="2"><p>Echo writes its arguments separated by blanks and 
terminated
      by        a newline on the standard output.  Options to filter and
      redirect the output are as        follows:</p>
 
@@ -67,7 +89,7 @@
 
      <p><b>-g</b> generate pseudo-revolutionary        marxist 
catch-phrases</p>
 
-     <p><b>-G</b> prepend GNU manifesto</p>
+     <p><b>-G</b> prepend GNU Manifesto</p>
 
      <p><b>-h</b> halt system (reboot suppressed on Suns, Apollos, and
      VAXen, not supported on NOS-2)</p>
@@ -120,9 +142,9 @@
 
      <p><b>-T</b> emulate TCP/IP handler</p>
 
-     <p><b>-t</b> issue        troff output</p>
+     <p><b>-t</b> issue Troff output</p>
 
-     <p><b>-u</b> issue        unix philosophy essay</p>
+     <p><b>-u</b> issue Unix philosophy essay</p>
 
      <p><b>-v</b> generate reverberating echo</p>
 
@@ -136,34 +158,24 @@
      diagnostics to the standard error file, do &lsquo;echo &hellip;
      1&gt;2&rsquo;.</p></td></tr>
 
-<tr><th>AUTHOR</th>
-<td>Robert Herndon</td></tr>
+<tr id="Licensing"><th>AUTHOR</th>
+<td colspan="2">Robert Herndon</td></tr>
 
 <tr><th>LICENSE</th>
-<td>GNU GPL, version 2 or later.</td></tr>
-</table>
+<td colspan="2">GNU GPL, version 2 or later.</td></tr>
 
-<table>
-<tr><td>Printed 10/28/85</td> <td>18 January 1983</td></tr>
+<tr><td class="col1"><small>Printed 10/28/85</small></td>
+    <td class="col2"><small>18 January 1983</small></td>
+    <td class="col3"><small>3</small></td></tr>
 </table>
 
-<p>This joke is also available in <a href="/fun/jokes/echo-msg.txt">
-plain text</a>.</p>
-
-<p style="margin-top: 2em">
-<a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h3 id="Disclaimer" class="footnote">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 class="button right-align"><a href="/fun/jokes/echo-msg.txt">Original
+email</a></p>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -191,11 +203,13 @@
 of this article.</p>
 </div>
 
+<p><a href="#Licensing">Licensing information</a></p>
+
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/12/17 09:31:25 $
+$Date: 2021/07/16 13:30:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/echo-msg.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/echo-msg.ru.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/echo-msg.ru.po   16 Jul 2021 13:19:27 -0000      1.9
+++ po/echo-msg.ru.po   16 Jul 2021 13:30:48 -0000      1.10
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-15 15:55+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU Echo - GNU Project - Free Software Foundation"
@@ -47,14 +46,10 @@
 "td p:first-child { margin-top: 0; }\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"
 
@@ -71,8 +66,6 @@
 msgstr "GNU Echo?"
 
 #. type: Content of: <div><address>
-# | {+by+} Robert Herndon
-#| msgid "Robert Herndon"
 msgid "by Robert Herndon"
 msgstr "Роберт Герндон"
 
@@ -130,13 +123,6 @@
 msgstr "ОПИСАНИЕ"
 
 #. type: Content of: <div><table><tr><td><p>
-# | Echo writes its arguments separated by blanks and terminated [-by\ta-]
-# | {+by a+} newline on the standard output.  Options to filter and redirect
-# | the output are [-as\tfollows:-] {+as follows:+}
-#| msgid ""
-#| "Echo writes its arguments separated by blanks and terminated by\ta "
-#| "newline on the standard output.  Options to filter and redirect the "
-#| "output are as\tfollows:"
 msgid ""
 "Echo writes its arguments separated by blanks and terminated by a newline on "
 "the standard output.  Options to filter and redirect the output are as "
@@ -159,14 +145,10 @@
 msgstr "<b>-5</b> генерировать лимерик из ключевых
 слов"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-a</b> convert [-ASCII\tto-] {+ASCII to+} ASCII
-#| msgid "<b>-a</b> convert ASCII\tto ASCII"
 msgid "<b>-a</b> convert ASCII to ASCII"
 msgstr "<b>-a</b> конвертировать ASCII в ASCII"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-A</b> disambiguate [-sentence\tstructure-] {+sentence structure+}
-#| msgid "<b>-A</b> disambiguate sentence\tstructure"
 msgid "<b>-A</b> disambiguate sentence structure"
 msgstr "<b>-A</b> показывать структуру 
предложения"
 
@@ -175,16 +157,11 @@
 msgstr "<b>-b</b> генерировать канцелярский 
эквивалент (см. <b>-x</b>)"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-B</b> [-issue\tequivalent-] {+issue equivalent+} C code with bugs fixed
-#| msgid "<b>-B</b> issue\tequivalent C code with bugs fixed"
 msgid "<b>-B</b> issue equivalent C code with bugs fixed"
 msgstr ""
 "<b>-B</b> выдавать эквивалентную программу на 
Си с исправленными ошибками"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-c</b> simplify/calculate [-arithmetic\texpression(s)-] {+arithmetic
-# | expression(s)+}
-#| msgid "<b>-c</b> simplify/calculate arithmetic\texpression(s)"
 msgid "<b>-c</b> simplify/calculate arithmetic expression(s)"
 msgstr "<b>-c</b> упрощать/вычислять 
арифметические выражения"
 
@@ -197,21 +174,14 @@
 msgstr "<b>-d</b> определить новую карту 
переключений echo"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-D</b> delete all ownership information [-from\tsystem-] {+from
-# | system+} files
-#| msgid "<b>-D</b> delete all ownership information from\tsystem files"
 msgid "<b>-D</b> delete all ownership information from system files"
 msgstr "<b>-D</b> снять всю информацию о 
владельцах с системных файлов"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-e</b> evaluate [-lisp\texpression(s)-] {+lisp expression(s)+}
-#| msgid "<b>-e</b> evaluate lisp\texpression(s)"
 msgid "<b>-e</b> evaluate lisp expression(s)"
 msgstr "<b>-e</b> оценить выражения Lisp"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-E</b> convert [-ASCII\tto-] {+ASCII to+} Navajo
-#| msgid "<b>-E</b> convert ASCII\tto Navajo"
 msgid "<b>-E</b> convert ASCII to Navajo"
 msgstr "<b>-E</b> конвертировать ASCII в навахо"
 
@@ -220,21 +190,14 @@
 msgstr "<b>-f</b> читать ввод из файла"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-F</b> [-transliterate\tto-] {+transliterate to+} french
-#| msgid "<b>-F</b> transliterate\tto french"
 msgid "<b>-F</b> transliterate to french"
 msgstr "<b>-F</b> транслитерировать на 
французский"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-g</b> generate [-pseudo-revolutionary\tmarxist\tcatch-phrases-]
-# | {+pseudo-revolutionary marxist catch-phrases+}
-#| msgid "<b>-g</b> generate pseudo-revolutionary\tmarxist\tcatch-phrases"
 msgid "<b>-g</b> generate pseudo-revolutionary marxist catch-phrases"
 msgstr "<b>-g</b> генерировать 
псевдо-революционные марксистские лозунги"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-G</b> prepend GNU [-m-]{+M+}anifesto
-#| msgid "<b>-G</b> prepend GNU manifesto"
 msgid "<b>-G</b> prepend GNU Manifesto"
 msgstr "<b>-G</b> предварять Манифестом GNU"
 
@@ -260,8 +223,6 @@
 "поддерживаются с ограничениями, 
документированными для IBM VTOS)"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-J</b> generate [-junk\tmail-] {+junk mail+}
-#| msgid "<b>-J</b> generate junk\tmail"
 msgid "<b>-J</b> generate junk mail"
 msgstr "<b>-J</b> генерировать удаляемую почту"
 
@@ -298,8 +259,6 @@
 "параметрами <b>-J</b>, <b>-K</b>, <b>-h</b>)"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-n</b> do not add newline [-to\tthe-] {+to the+} output
-#| msgid "<b>-n</b> do not add newline to\tthe output"
 msgid "<b>-n</b> do not add newline to the output"
 msgstr "<b>-n</b> не добавлять новую строку в 
вывод"
 
@@ -308,8 +267,6 @@
 msgstr "<b>-o</b> генерировать нецензурную брань"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-O</b> [-clean\tup-] {+clean up+} dirty language
-#| msgid "<b>-O</b> clean\tup dirty language"
 msgid "<b>-O</b> clean up dirty language"
 msgstr "<b>-O</b> смягчать крепкие выражения"
 
@@ -326,8 +283,6 @@
 msgstr "<b>-P1</b> oolcay itay"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-q</b> [-query\tstandard-] {+query standard+} input for arguments
-#| msgid "<b>-q</b> query\tstandard input for arguments"
 msgid "<b>-q</b> query standard input for arguments"
 msgstr "<b>-q</b> запрашивать аргументы в 
стандартном потоке ввода"
 
@@ -356,14 +311,10 @@
 msgstr "<b>-T</b> эмулировать обработчик TCP/IP"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-t</b> [-issue\ttroff-] {+issue Troff+} output
-#| msgid "<b>-t</b> issue\ttroff output"
 msgid "<b>-t</b> issue Troff output"
 msgstr "<b>-t</b> выдавать вывод troff"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-u</b> [-issue\tunix philosophy\tessay-] {+issue Unix philosophy essay+}
-#| msgid "<b>-u</b> issue\tunix philosophy\tessay"
 msgid "<b>-u</b> issue Unix philosophy essay"
 msgstr "<b>-u</b> выдавать очерк философии Unix"
 
@@ -372,8 +323,6 @@
 msgstr "<b>-v</b> генерировать многократное эхо"
 
 #. type: Content of: <div><table><tr><td><p>
-# | <b>-V</b> [-print\tdebugging-] {+print debugging+} information
-#| msgid "<b>-V</b> print\tdebugging information"
 msgid "<b>-V</b> print debugging information"
 msgstr "<b>-V</b> печатать отладочную информацию"
 
@@ -413,14 +362,10 @@
 msgstr "GNU GPL, версия 2 или более поздняя."
 
 #. type: Content of: <div><table><tr><td>
-# | [-Printed 10/28/85-]{+<small>Printed 10/28/85</small>+}
-#| msgid "Printed 10/28/85"
 msgid "<small>Printed 10/28/85</small>"
 msgstr "<small>Распечатано 28/10/85</small>"
 
 #. type: Content of: <div><table><tr><td>
-# | [-18-]{+<small>18+} January [-1983-] {+1983</small>+}
-#| msgid "18 January 1983"
 msgid "<small>18 January 1983</small>"
 msgstr "<small>18 января 1983</small>"
 
@@ -429,14 +374,8 @@
 msgstr "<small>3</small>"
 
 #. type: Content of: <div><p>
-# | [-This joke is also available in-]<a [-href=\"/fun/jokes/echo-msg.txt\">
-# | plain text</a>.-] {+href=\"/fun/jokes/echo-msg.txt\">Original email</a>+}
-#| msgid ""
-#| "This joke is also available in <a href=\"/fun/jokes/echo-msg.txt\"> plain "
-#| "text</a>."
 msgid "<a href=\"/fun/jokes/echo-msg.txt\">Original email</a>"
-msgstr ""
-"<a href=\"/fun/jokes/echo-msg.txt\">Первоначальное 
сообщение</a>"
+msgstr "<a href=\"/fun/jokes/echo-msg.txt\">Первоначальное 
сообщение</a>"
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.

Index: po/gospel.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/gospel.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/gospel.ru-en.html        30 Jan 2020 18:31:02 -0000      1.1
+++ po/gospel.ru-en.html        16 Jul 2021 13:30:48 -0000      1.2
@@ -1,7 +1,19 @@
 <!--#include virtual="/server/header.html" -->
-<title>Gospel - 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>Gospel - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/fun/jokes/po/gospel.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#Unclassified">Unclassified</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Rules, Sins, Virtues, Gods and more of The Church of EMACS according to The
 Gospel of Prophet Antony</h2>
 
@@ -68,45 +80,52 @@
 <p>Warning: Taking THE CHURCH OF EMACS seriously is hazardous to your
 health; especially MENTAL HEALTH.</p>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The joke on this page was obtained from the
-FSF's <a href="http://lists.gnu.org/";>email archives</a> of the GNU
-Project.</p>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
-
+<div 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/01/30 18:31:02 $
+$Date: 2021/07/16 13:30:48 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/gospel.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/gospel.ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/gospel.ru.po     16 Jul 2021 13:19:27 -0000      1.3
+++ po/gospel.ru.po     16 Jul 2021 13:30:48 -0000      1.4
@@ -15,23 +15,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
-# | Gospel - GNU Project - Free Software Foundation [-(FSF)-]
-#| msgid "Gospel - GNU Project - Free Software Foundation (FSF)"
 msgid "Gospel - 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"
 
@@ -223,19 +216,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.
@@ -269,11 +255,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/hello_world_patent.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/hello_world_patent.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/hello_world_patent.ru-en.html    24 Sep 2015 05:57:50 -0000      1.1
+++ po/hello_world_patent.ru-en.html    16 Jul 2021 13:30:48 -0000      1.2
@@ -1,13 +1,26 @@
 <!--#include virtual="/server/header.html" -->
-<title>YAAS Foundation Patent Suit</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>YAAS Foundation Patent Suit - GNU Project - Free Software 
Foundation</title>
 <!--#include virtual="/fun/jokes/po/hello_world_patent.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h3>The YAAS Foundation Patent Suit</h3>
-
-<blockquote><pre>Date: Wed,  6 Aug 2003 16:46:55 +0200
-From: Stefan Midjich &lt;stefan@ivan.nu&gt;
-To: Richard Stallman &lt;rms@stallman.org&gt;
-Subject: Regarding Hello World</pre>
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/fun/humor.html#Philosophy">Philosophy</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>The YAAS Foundation Patent Suit</h2>
+
+<p class="infobox">
+From: Stefan Midjich &lt;stefan@ivan.nu&gt;<br />
+To: Richard Stallman &lt;rms@stallman.org&gt;<br />
+Subject: Regarding Hello World<br />
+Date: Wed,  6 Aug 2003 16:46:55 +0200</p>
 
 <p>Hello Mr.Stallman</p>
 
@@ -26,39 +39,53 @@
 your sleep and cloning you for fun.  We hope that you take upon this
 as seriously as we do Mr.Stallman and we wish you a good day.</p>
 
-<p>&mdash;Stefan at YAAS</p></blockquote>
+<address>&mdash;Stefan at YAAS</address>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The Free Software Foundation claims no copyright on this joke.</p>
+</div>
 </div>
-<!--#include virtual="/server/footer.html" -->
 
-<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>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<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 13:30:48 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/hello_world_patent.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/hello_world_patent.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/hello_world_patent.ru.po 16 Jul 2021 13:19:27 -0000      1.4
+++ po/hello_world_patent.ru.po 16 Jul 2021 13:30:48 -0000      1.5
@@ -15,21 +15,18 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid "YAAS Foundation Patent Suit - GNU Project - Free Software Foundation"
-msgstr "Патентный иск фонда YAAS - Проект GNU - 
Фонд свободного программного обеспечения"
+msgstr ""
+"Патентный иск фонда YAAS - Проект 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"
 
@@ -103,14 +100,10 @@
 msgstr "&mdash;Стефан из YAAS"
 
 #. type: Content of: <div><div><h3>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Disclaimer"
 msgid "Disclaimer"
 msgstr "Предупреждение"
 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "The Free Software Foundation claims no copyright on this joke."
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 "Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
@@ -148,11 +141,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/users-lightbulb.ru-en.html
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/users-lightbulb.ru-en.html       28 Jul 2019 10:31:26 -0000      1.2
+++ po/users-lightbulb.ru-en.html       16 Jul 2021 13:30:48 -0000      1.3
@@ -1,11 +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="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>How many GNU/Linux users are needed to change a light bulb?
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/fun/jokes/po/users-lightbulb.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#Unclassified">Unclassified</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>How many GNU/Linux users are needed to change a light bulb?</h2>
 
+<address class="byline">by Andr&eacute; Ferreira Machado</address>
+
 <ul>
 <li>1 to post a thread in a mailing list telling the bulb has
 burnt.</li>
@@ -74,15 +87,11 @@
 <li>The father of the first user, who while everyone was discussing,
 went to the shop and bought the cheapest lightbulb.</li>
 </ul>
-
-<h3 id="Disclaimer">Disclaimer</h3>
-<p>The joke on this page was
-mailed to the FSF by its author Andre Machado.</p>
-<p>The Free Software Foundation claims no copyright on this joke.</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
@@ -100,36 +109,19 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
-<!-- Regarding copyright, in general, standalone pages (as opposed to
-     files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 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).
+<p>Copyright &copy; 2013 Andre Machado</p>
      
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<p>Copyright &copy; 2014 Andre Machado</p>
-
-<p>This page is licensed under a <a rel="license"
+<p>The joke on this page is licensed under the <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
 Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
@@ -137,10 +129,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/07/28 10:31:26 $
+$Date: 2021/07/16 13:30:48 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: po/users-lightbulb.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/users-lightbulb.ru.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/users-lightbulb.ru.po    16 Jul 2021 13:19:27 -0000      1.6
+++ po/users-lightbulb.ru.po    16 Jul 2021 13:30:48 -0000      1.7
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-07-15 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -27,14 +26,10 @@
 "— Фонд свободного программного 
обеспечения"
 
 #. 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"
 
@@ -297,11 +292,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 "
@@ -315,22 +305,12 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 201[-4-]{+3+} Andre Machado
-#| msgid "Copyright &copy; 2014 Andre Machado"
 msgid "Copyright &copy; 2013 Andre Machado"
 msgstr ""
 "Copyright &copy; 2014 Andre Machado<br />Copyright &copy; 2015 Dmitry "
 "Alexandrov (translation)"
 
 #. type: Content of: <div><p>
-# | [-This-]{+The joke on this+} page is licensed under [-a-] {+the+} <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-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "The joke on this page is licensed under the <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"



reply via email to

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