www-commits
[Top][All Lists]
Advanced

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

www fun/jokes/po/10-kinds-of-people.fr.po fun/j...


From: GNUN
Subject: www fun/jokes/po/10-kinds-of-people.fr.po fun/j...
Date: Wed, 14 Jul 2021 12:30:57 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/07/14 12:30:57

Modified files:
        fun/jokes/po   : 10-kinds-of-people.fr.po 
                         10-kinds-of-people.it.po 10-kinds-of-people.pot 
                         10-kinds-of-people.ru.po any-key.fr.po 
                         any-key.pot any-key.uk.po brainfuck.pot c+-.pot 
                         c+-.pt-br.po c+-.ru.po deadbeef.fr.po 
                         deadbeef.pot dna.fr.po dna.pot 
                         doctor.manifesto.pot ed.pot errno.2.pot 
                         error-haiku.pot error-haiku.ru.po 
                         evilmalware.pot gcc.pot gcc_audio.pot 
                         gnu-overflow.pot gnu-overflow.ru.po 
                         gnuemacs.pot gullibility.virus.pot 
                         happy-new-year.pot helloworld.pot 
                         helloworld.ru.po long-options.pot 
                         merry-xmas.pot 
        server/gnun/compendia: compendium.af.po compendium.ar.po 
                               compendium.bg.po compendium.ca.po 
                               compendium.cs.po compendium.da.po 
                               compendium.de.po compendium.el.po 
                               compendium.eo.po compendium.es.po 
                               compendium.fa.po compendium.fi.po 
                               compendium.fr.po compendium.he.po 
                               compendium.hr.po compendium.id.po 
                               compendium.it.po compendium.ja.po 
                               compendium.ko.po compendium.lt.po 
                               compendium.ml.po compendium.ms.po 
                               compendium.nb.po compendium.nl.po 
                               compendium.pl.po compendium.pot 
                               compendium.pt-br.po compendium.ro.po 
                               compendium.ru.po compendium.sk.po 
                               compendium.sq.po compendium.sr.po 
                               compendium.sv.po compendium.ta.po 
                               compendium.te.po compendium.tr.po 
                               compendium.uk.po compendium.zh-cn.po 
                               compendium.zh-tw.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.fr.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.it.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.ru.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/any-key.fr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/any-key.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/any-key.uk.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/brainfuck.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/c%43-.pot?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/c%43-.pt-br.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/c%43-.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/deadbeef.fr.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/deadbeef.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/dna.fr.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/dna.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/doctor.manifesto.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/ed.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/errno.2.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/error-haiku.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/error-haiku.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/evilmalware.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gcc.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gcc_audio.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnu-overflow.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnu-overflow.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gnuemacs.pot?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/gullibility.virus.pot?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/happy-new-year.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/helloworld.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/helloworld.ru.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/long-options.pot?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/merry-xmas.pot?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.af.po?cvsroot=www&r1=1.123&r2=1.124
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.bg.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.cs.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.da.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.de.po?cvsroot=www&r1=1.177&r2=1.178
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.el.po?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.eo.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.es.po?cvsroot=www&r1=1.136&r2=1.137
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fa.po?cvsroot=www&r1=1.125&r2=1.126
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fi.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fr.po?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.he.po?cvsroot=www&r1=1.123&r2=1.124
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.hr.po?cvsroot=www&r1=1.107&r2=1.108
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.id.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.153&r2=1.154
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ja.po?cvsroot=www&r1=1.144&r2=1.145
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ko.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.lt.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ml.po?cvsroot=www&r1=1.125&r2=1.126
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ms.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nb.po?cvsroot=www&r1=1.125&r2=1.126
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nl.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pl.po?cvsroot=www&r1=1.142&r2=1.143
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pot?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt-br.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ro.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sk.po?cvsroot=www&r1=1.123&r2=1.124
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sq.po?cvsroot=www&r1=1.142&r2=1.143
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sr.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sv.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ta.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.te.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.tr.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.uk.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.124&r2=1.125

Patches:
Index: fun/jokes/po/10-kinds-of-people.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.fr.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- fun/jokes/po/10-kinds-of-people.fr.po       31 May 2021 21:09:02 -0000      
1.18
+++ fun/jokes/po/10-kinds-of-people.fr.po       14 Jul 2021 16:30:55 -0000      
1.19
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 10-kinds-of-people.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Aurélien Rivière <aurelien.riv AT gmail.com>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,6 +14,7 @@
 "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"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
@@ -22,11 +23,25 @@
 msgstr ""
 "10 sortes de gens dans le monde - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "10 Kinds of People in the World"
 msgstr "10 sortes de gens dans le monde"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "There are 10 kinds of people in the world &mdash; those who understand "
 "binary and those who don't."
@@ -34,7 +49,7 @@
 "Il y a 10 sortes de gens dans le monde – ceux qui comprennent le binaire et 
"
 "ceux qui ne le comprennent pas."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "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 "
@@ -43,31 +58,21 @@
 "Il y a 10 sortes de gens dans le monde – ceux qui comprennent le ternaire, "
 "ceux qui ne le comprennent pas et ceux qui le confondent avec le binaire."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection d'humour "
-"GNU."
-
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Renonciation au copyright"
-
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| msgid ""
+#| "The first joke was submitted by Colin Sharpe and the second by "
+#| "Fran&ccedil;ois Celliers."
 msgid ""
-"The first joke was submitted by Colin Sharpe and the second by Fran&ccedil;"
-"ois Celliers."
+"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 ""
 "La première blague vous a été proposée par Colin Sharpe et la seconde par 
"
 "François Celliers."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"La <i>Free Software Foundation</i> ne revendique pas de copyright sur ces "
-"blagues."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -94,14 +99,14 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -122,3 +127,17 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection "
+#~ "d'humour GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Renonciation au copyright"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique pas de copyright sur ces "
+#~ "blagues."

Index: fun/jokes/po/10-kinds-of-people.it.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.it.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/10-kinds-of-people.it.po       30 Apr 2021 06:36:13 -0000      
1.10
+++ fun/jokes/po/10-kinds-of-people.it.po       14 Jul 2021 16:30:55 -0000      
1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 10-kinds-of-people.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2015-05-30 22:02+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -14,6 +14,7 @@
 "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"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -22,11 +23,25 @@
 msgstr ""
 "Al mondo ci sono 10 tipi di persone - Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Pagina principale di GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "10 Kinds of People in the World"
 msgstr "Al mondo ci sono 10 tipi di persone"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "There are 10 kinds of people in the world &mdash; those who understand "
 "binary and those who don't."
@@ -34,7 +49,7 @@
 "Al mondo ci sono 10 tipi di persone &mdash; quelle che capiscono la "
 "numerazione binaria e quelle che non la capiscono."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "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 "
@@ -44,30 +59,21 @@
 "numerazione ternaria, quelle che non la capiscono e quelle che la confondono "
 "con la numerazione binaria."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">Altri divertimenti</a> nella raccolta di "
-"divertimenti GNU."
-
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Disclaimer"
-
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| msgid ""
+#| "The first joke was submitted by Colin Sharpe and the second by "
+#| "Fran&ccedil;ois Celliers."
 msgid ""
-"The first joke was submitted by Colin Sharpe and the second by Fran&ccedil;"
-"ois Celliers."
+"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 ""
 "La prima barzelletta è stata contribuita da Colin Sharpe e la seconda da "
 "Fran&ccedil;ois Celliers."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"La Free Software Foundation non ha il copyright di questo testo divertente."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -94,14 +100,14 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Le traduzioni italiane sono effettuate ponendo la massima attenzione ai "
@@ -124,6 +130,20 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Altri divertimenti</a> nella raccolta di "
+#~ "divertimenti GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Disclaimer"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La Free Software Foundation non ha il copyright di questo testo "
+#~ "divertente."
+
 #~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2015 Free Software Foundation, Inc."
 

Index: fun/jokes/po/10-kinds-of-people.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/10-kinds-of-people.pot 13 Sep 2015 17:00:41 -0000      1.9
+++ fun/jokes/po/10-kinds-of-people.pot 14 Jul 2021 16:30:55 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/10-kinds-of-people.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/10-kinds-of-people.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 10-kinds-of-people.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,39 +20,41 @@
 msgid "10 Kinds of People in the World - GNU Project - Free Software 
Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "10 Kinds of People in the World"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "There are 10 kinds of people in the world &mdash; those who understand "
 "binary and those who don't."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "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."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The first joke was submitted by Colin Sharpe and the second by "
-"Fran&ccedil;ois Celliers."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -79,7 +81,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>. 
@@ -87,7 +89,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- fun/jokes/po/10-kinds-of-people.ru.po       13 Sep 2015 17:00:43 -0000      
1.6
+++ fun/jokes/po/10-kinds-of-people.ru.po       14 Jul 2021 16:30:55 -0000      
1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 10-kinds-of-people.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2015-05-29 13:30+0400\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,6 +15,7 @@
 "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 ""
@@ -22,11 +23,31 @@
 msgstr ""
 "В мире 10 типов людей - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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.
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Домашняя страница GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "10 Kinds of People in the World"
 msgstr "В мире 10 типов людей"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "There are 10 kinds of people in the world &mdash; those who understand "
 "binary and those who don't."
@@ -34,7 +55,7 @@
 "В мире 10&nbsp;типов людей&nbsp;&mdash; те, кто 
знает двоичные числа, и те, "
 "кто не знает."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "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 "
@@ -43,28 +64,19 @@
 "В мире 10&nbsp;типов людей&nbsp;&mdash; те, кто 
знает троичные числа, те, "
 "кто не знает троичных чисел, и те, кто 
путает их с двоичными."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">Другой юмор</a> в 
юмористической коллекции GNU."
-
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Предупреждение"
-
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| msgid ""
+#| "The first joke was submitted by Colin Sharpe and the second by "
+#| "Fran&ccedil;ois Celliers."
 msgid ""
-"The first joke was submitted by Colin Sharpe and the second by Fran&ccedil;"
-"ois Celliers."
+"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 "Первую шутку прислал Колин Шарп, 
вторую&nbsp;&mdash; Франсуа Селье."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
-
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -92,14 +104,20 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -124,6 +142,20 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">Другой юмор</a> в 
юмористической коллекции "
+#~ "GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Предупреждение"
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не заявляет авторских прав на "
+#~ "эту шутку."
+
 # type: Content of: <div><p>
 #~ msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
 #~ msgstr "Copyright &copy; 2015 Free Software Foundation, Inc."

Index: fun/jokes/po/any-key.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/any-key.fr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/po/any-key.fr.po  31 May 2021 21:09:02 -0000      1.17
+++ fun/jokes/po/any-key.fr.po  14 Jul 2021 16:30:55 -0000      1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: any-key.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Aurélien Rivière <aurelien.riv AT gmail.com>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,6 +14,7 @@
 "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"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
@@ -21,47 +22,74 @@
 msgstr ""
 "Où est « n'importe quelle touche » ? - Projet GNU - Free Software 
Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Where is any-key???"
 msgstr "Où est « n'importe quelle touche » ???"
 
-#. type: Content of: <pre>
-#, no-wrap
-msgid ""
-"From: Thomas Henneke\n"
-"To: gnu@gnu.org\n"
-"Subject: humor\n"
-"Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
-"\n"
-"Here is an old one, but I still like it:\n"
-"\n"
-"- Please press any key!\n"
-"- Where is the any-key?\n"
-msgstr ""
-"De: Thomas Henneke\n"
-"À: gnu@gnu.org\n"
-"Sujet: humour\n"
-"Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
-"\n"
-"En voici une classique, mais elle me fait toujours rire :\n"
-"\n"
-"- Veuillez appuyer sur n'importe quelle touche !\n"
-"- Où est « n'importe quelle touche » ?\n"
+#. type: Content of: <div><p>
+msgid "From: Thomas Henneke"
+msgstr ""
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr "Renonciation au copyright"
+#. type: Content of: <div><p>
+msgid "To: gnu@gnu.org"
+msgstr ""
 
-#. type: Content of: <p>
-msgid "The joke on this page was submitted by Thomas Henneke (thanks, Thomas)."
+#. type: Content of: <div><p>
+msgid "Subject: humor"
 msgstr ""
-"La blague de cette page a été proposée par Thomas Henneke (merci, Thomas)."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation does not claim copyright for this joke."
+#. type: Content of: <div><p>
+msgid "Date: Fri, 21 Feb 2003 22:05:41 +0100"
 msgstr ""
-"La <i>Free Software Foundation</i> ne revendique pas de copyright sur cette "
-"blague."
+
+#. type: Content of: <div><p>
+msgid "Here is an old one, but I still like it:"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "- Please press any key!"
+msgstr ""
+
+#. type: Content of: <div><p>
+# | {+-+} Where is [-any-key???-] {+the any-key?+}
+#, fuzzy
+#| msgid "Where is any-key???"
+msgid "- Where is the any-key?"
+msgstr "Où est « n'importe quelle touche » ???"
+
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr "Renonciation au copyright"
+
+#. 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.+}
+#, fuzzy
+#| 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 ""
+"La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
+"org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -89,14 +117,14 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -117,3 +145,34 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "From: Thomas Henneke\n"
+#~ "To: gnu@gnu.org\n"
+#~ "Subject: humor\n"
+#~ "Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
+#~ "\n"
+#~ "Here is an old one, but I still like it:\n"
+#~ "\n"
+#~ "- Please press any key!\n"
+#~ "- Where is the any-key?\n"
+#~ msgstr ""
+#~ "De: Thomas Henneke\n"
+#~ "À: gnu@gnu.org\n"
+#~ "Sujet: humour\n"
+#~ "Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
+#~ "\n"
+#~ "En voici une classique, mais elle me fait toujours rire :\n"
+#~ "\n"
+#~ "- Veuillez appuyer sur n'importe quelle touche !\n"
+#~ "- Où est « n'importe quelle touche » ?\n"
+
+#~ msgid ""
+#~ "The joke on this page was submitted by Thomas Henneke (thanks, Thomas)."
+#~ msgstr ""
+#~ "La blague de cette page a été proposée par Thomas Henneke (merci, 
Thomas)."
+
+#~ msgid "The Free Software Foundation does not claim copyright for this joke."
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique pas de copyright sur "
+#~ "cette blague."

Index: fun/jokes/po/any-key.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/any-key.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/any-key.pot    13 Sep 2015 17:00:44 -0000      1.9
+++ fun/jokes/po/any-key.pot    14 Jul 2021 16:30:55 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/any-key.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/any-key.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: any-key.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,34 +20,60 @@
 msgid "Where is any-key? - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Where is any-key???"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <pre>
-#, no-wrap
+#. type: Content of: <div>
 msgid ""
-"From: Thomas Henneke\n"
-"To: gnu@gnu.org\n"
-"Subject: humor\n"
-"Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
-"\n"
-"Here is an old one, but I still like it:\n"
-"\n"
-"- Please press any key!\n"
-"- Where is the any-key?\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <h3>
-msgid "Disclaimer"
+#. type: Content of: <div><h2>
+msgid "Where is any-key???"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: Thomas Henneke"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: gnu@gnu.org"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: humor"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The joke on this page was submitted by Thomas Henneke (thanks, Thomas)."
+#. type: Content of: <div><p>
+msgid "Date: Fri, 21 Feb 2003 22:05:41 +0100"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Here is an old one, but I still like it:"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation does not claim copyright for this joke."
+#. type: Content of: <div><p>
+msgid "- Please press any key!"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "- Where is the any-key?"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "Disclaimer"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -74,7 +100,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>. 
@@ -82,7 +108,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/any-key.uk.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/any-key.uk.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/any-key.uk.po  31 May 2021 20:31:27 -0000      1.8
+++ fun/jokes/po/any-key.uk.po  14 Jul 2021 16:30:55 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: any-key.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2015-06-01 08:32+0300\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <www-uk-translations@gnu.org>\n"
@@ -15,6 +15,7 @@
 "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"
 "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"
 "X-Generator: Lokalize 1.5\n"
@@ -25,46 +26,73 @@
 msgstr ""
 "Де будь-яка кнопка? - Проект GNU - Фонд 
вільного програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+#, fuzzy
+#| msgid "<a href=\"/\">"
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Головна GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Where is any-key???"
 msgstr "Де будь-яка кнопка???"
 
-#. type: Content of: <pre>
-#, no-wrap
-msgid ""
-"From: Thomas Henneke\n"
-"To: gnu@gnu.org\n"
-"Subject: humor\n"
-"Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
-"\n"
-"Here is an old one, but I still like it:\n"
-"\n"
-"- Please press any key!\n"
-"- Where is the any-key?\n"
-msgstr ""
-"Від: Томаса Геннеке\n"
-"Кому: gnu@gnu.org\n"
-"Тема: гумореска\n"
-"Дата: п'ятниця, 21 лютого 2003 22:05:41 +0100\n"
-"\n"
-"Ось одна стара, але я все ще люблю її:\n"
-"\n"
-"- Будь ласка, натисніть будь-яку кнопку!\n"
-"- Де кнопка „будь-яка“?\n"
+#. type: Content of: <div><p>
+msgid "From: Thomas Henneke"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: gnu@gnu.org"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: humor"
+msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><p>
+msgid "Date: Fri, 21 Feb 2003 22:05:41 +0100"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Here is an old one, but I still like it:"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "- Please press any key!"
+msgstr ""
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid "Where is any-key?"
+msgid "- Where is the any-key?"
+msgstr "Де будь-яка кнопка?"
+
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Попередження"
 
-#. type: Content of: <p>
-msgid "The joke on this page was submitted by Thomas Henneke (thanks, Thomas)."
-msgstr "Жарт на цій сторінці надіслав Томас 
Геннеке (подяка Томасу)."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation does not claim copyright for this joke."
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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 ""
-"Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
-"жарт."
+"Жарт на цій сторінці отриманий з <a 
href=\"http://lists.gnu.org/\";>архівів "
+"електронної пошти ФВПЗ</a> проекту GNU."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -92,14 +120,19 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Ми намагалися зробити цей переклад точним 
та якісним, але виключити "
@@ -120,5 +153,45 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
-#~ msgid "Where is any-key?"
-#~ msgstr "Де будь-яка кнопка?"
+#~ msgid ""
+#~ "From: Thomas Henneke\n"
+#~ "To: gnu@gnu.org\n"
+#~ "Subject: humor\n"
+#~ "Date: Fri, 21 Feb 2003 22:05:41 +0100\n"
+#~ "\n"
+#~ "Here is an old one, but I still like it:\n"
+#~ "\n"
+#~ "- Please press any key!\n"
+#~ "- Where is the any-key?\n"
+#~ msgstr ""
+#~ "Від: Томаса Геннеке\n"
+#~ "Кому: gnu@gnu.org\n"
+#~ "Тема: гумореска\n"
+#~ "Дата: п'ятниця, 21 лютого 2003 22:05:41 +0100\n"
+#~ "\n"
+#~ "Ось одна стара, але я все ще люблю її:\n"
+#~ "\n"
+#~ "- Будь ласка, натисніть будь-яку кнопку!\n"
+#~ "- Де кнопка „будь-яка“?\n"
+
+#~ msgid ""
+#~ "The joke on this page was submitted by Thomas Henneke (thanks, Thomas)."
+#~ msgstr "Жарт на цій сторінці надіслав Томас 
Геннеке (подяка Томасу)."
+
+#~ msgid "The Free Software Foundation does not claim copyright for this joke."
+#~ msgstr ""
+#~ "Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
+#~ "жарт."
+
+#~ msgid ""
+#~ "Please see the <a href=\"/server/standards/README.translations.html"
+#~ "\">Translations README</a> for information on coordinating and submitting "
+#~ "translations of this article."
+#~ msgstr ""
+#~ "Ми намагалися зробити цей переклад 
точним та якісним, але виключити "
+#~ "можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження "
+#~ "і пропозиції щодо перекладу за адресою <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>."

Index: fun/jokes/po/brainfuck.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/brainfuck.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/brainfuck.pot  29 May 2015 08:57:45 -0000      1.8
+++ fun/jokes/po/brainfuck.pot  14 Jul 2021 16:30:55 -0000      1.9
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/brainfuck.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/brainfuck.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,87 +7,86 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: brainfuck.html\n"
-"POT-Creation-Date: 2015-05-29 08:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
 msgid "Ed-like in BrainFuck - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "BrainFuck"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Brainfuck is an amusing and minimalistic programming language which doesn't "
 "serve any real purpose except being a funny joke, challenging programmers "
 "and testing the boundaries of computer language design."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid "<b>Warning!</b> Brainfuck isn't suitable for practical use when 
programming!"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "This is a piece of source code like Ed in Brainfuck language:"
+#. type: Content of: <div><div><p>
+msgid ""
+"Wikipedia has <a href=\"https://wikipedia.org/wiki/Brainfuck\";>more "
+"information about the Brainfuck language</a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"This is a piece of Ed-like source code in Brainfuck language, by Nicolas "
+"Favre-Felix:"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid 
"+[[,][-]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.[-]+++++++++++++.---.+]\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The following was offered from Andrea Bolognani, with this comment:"
+#. type: Content of: <div><p>
+msgid "The following was offered by Andrea Bolognani, with this comment:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "The above version reads from standard input until it encounters a EOF "
 "character, and then starts printing <code>?</code> in an infinite loop.  "
-"I've written a drop-in replacement&hellip;as an added bonus, this version "
+"I've written a drop-in replacement [...]; as an added bonus, this version "
 "uses only 69 instructions, which is 30 less than the one above."
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid 
"++[&gt;+++++[&gt;++++++&lt;-]&lt;-]++[&gt;+++++&lt;-]&gt;&gt;+++&lt;&lt;+[[,----------]&gt;&gt;.&lt;.&lt;+]\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"More information about Brainfuck language: <a "
-"href=\"http://en.wikipedia.org/wiki/Brainfuck\";>http://en.wikipedia.org/wiki/Brainfuck</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h3>
-msgid "Disclaimer"
-msgstr ""
-
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The code from Andrea Bolognani is licensed under the terms of the GNU GPL, "
-"version 2 or later."
+"These jokes were submitted to the GNU Project by their authors, respectively "
+"in 2004 and 2008."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -114,7 +113,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>. 
@@ -122,18 +121,21 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2015 Free Software Foundation, Inc."
+msgid ""
+"Copyright &copy; 2008 Andrea Bolognani (<a href=\"#AB\">second Ed-like "
+"code</a>)"
 msgstr ""
 
 #. type: Content of: <div><p>
 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>."
+"Andrea Bolognani's code is licensed under the terms of the <a "
+"rel=\"license\" href=\"/licenses/gpl.html\">GNU General Public License</a>, "
+"version&nbsp;2 or later."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/c+-.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/c+-.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- fun/jokes/po/c+-.pot        17 Dec 2020 09:31:25 -0000      1.11
+++ fun/jokes/po/c+-.pot        14 Jul 2021 16:30:55 -0000      1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: c+-.html\n"
-"POT-Creation-Date: 2020-12-17 09:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,28 +20,29 @@
 msgid "C more or less - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "C more or less"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
 msgid ""
-"Date: Tue, 16 Apr 91 13:16:47 EDT\n"
-"From: geoff@circus.camex.com\n"
-"To: clp@home.harvardsq.com, rms@ai.mit.edu\n"
-"Subject: C more-or-less\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "[from rec.funny: C more-or-less]"
+#. type: Content of: <div><h2>
+msgid "C more or less"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "C+-: (pronounced &ldquo;C more or less&rdquo;)"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Unlike C++, C+- is a subject oriented language.  Each C+- class instance "
 "known as a subject, holds hidden members, known as prejudices or undeclared "
@@ -50,55 +51,55 @@
 "following C operators are overridden as shown:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "better than"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "worse than"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;&gt;</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "much better than"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;&lt;</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "forget it"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>!</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "not on your life"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>==</code>"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "comparable, other things being equal"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- is a strongly typed language based on stereotyping and self-righteous "
 "logic.  The Boolean variables <code>TRUE</code> and <code>FALSE</code> "
@@ -112,7 +113,7 @@
 "interactions are aided by the special conditional evenifnot X then Y."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- supports information hiding and, among friend classes only, rumor "
 "sharing.  Borrowing from the Eiffel lexicon, non-friend classes can be "
@@ -120,7 +121,7 @@
 "volatile, and non-Abelian."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Single and multiple inheritance mechanisms are implemented with random "
 "mutations.  Disinheritance rules are covered by a complex probate protocol.  "
@@ -130,7 +131,7 @@
 "marriage and divorce operators may be needed:"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "marriage (MParent1, FParent1);\n"
@@ -150,50 +151,26 @@
 "}\n"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 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;"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "[from the april '91 issue of AIExpert]"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "--"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "Maurice Suhre"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "suhre@trwrb.dsd.trw.com"
+"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 ""
 
-#. type: Content of: <p>
-msgid "This joke is also available in <a href=\"/fun/jokes/c+-\">plain 
text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/c+-.txt\">original email</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The joke on this page was obtained from the FSF's <a "
-"href=\"https://lists.gnu.org/\";>email archives</a> of the GNU Project."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -220,7 +197,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>. 
@@ -228,7 +205,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/c+-.pt-br.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/c+-.pt-br.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/po/c+-.pt-br.po   30 May 2021 20:50:44 -0000      1.1
+++ fun/jokes/po/c+-.pt-br.po   14 Jul 2021 16:30:55 -0000      1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: c+-.html\n"
-"POT-Creation-Date: 2020-12-17 09:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2020-12-22 18:28-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -14,6 +14,7 @@
 "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"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 3.38.0\n"
 
@@ -21,32 +22,33 @@
 msgid "C more or less - GNU Project - Free Software Foundation"
 msgstr "C mais ou menos - Projeto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
-msgid "C more or less"
-msgstr "C mais ou menos"
+#. type: Content of: <div><a>
+#, fuzzy
+#| msgid "<a href=\"/\">"
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Página inicial do GNU"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div>
 msgid ""
-"Date: Tue, 16 Apr 91 13:16:47 EDT\n"
-"From: geoff@circus.camex.com\n"
-"To: clp@home.harvardsq.com, rms@ai.mit.edu\n"
-"Subject: C more-or-less\n"
-msgstr ""
-"Data: Ter, 16 Abr 91 13:16:47 EDT\n"
-"De: geoff@circus.camex.com\n"
-"Para: clp@home.harvardsq.com, rms@ai.mit.edu\n"
-"Assunto: C mais ou menos\n"
-
-#. type: Content of: <blockquote><p>
-msgid "[from rec.funny: C more-or-less]"
-msgstr "[de rec.funny: C mais ou menos]"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "C more or less"
+msgstr "C mais ou menos"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "C+-: (pronounced &ldquo;C more or less&rdquo;)"
 msgstr "C+-: (pronunciado &ldquo;C mais ou menos&rdquo;)"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Unlike C++, C+- is a subject oriented language.  Each C+- class instance "
 "known as a subject, holds hidden members, known as prejudices or undeclared "
@@ -61,55 +63,55 @@
 "públicos conhecidos como jactâncias ou reivindicações. Os seguintes "
 "operadores C são substituídos conforme mostrado:"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;</code>"
 msgstr "<code>&gt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "better than"
 msgstr "melhor que"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;</code>"
 msgstr "<code>&lt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "worse than"
 msgstr "pior que"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;&gt;</code>"
 msgstr "<code>&gt;&gt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "much better than"
 msgstr "muito melhor que"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;&lt;</code>"
 msgstr "<code>&lt;&lt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "forget it"
 msgstr "esquece"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>!</code>"
 msgstr "<code>!</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "not on your life"
 msgstr "nunca na vida"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>==</code>"
 msgstr "<code>==</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "comparable, other things being equal"
 msgstr "comparável, outras coisas sendo igual"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- is a strongly typed language based on stereotyping and self-righteous "
 "logic.  The Boolean variables <code>TRUE</code> and <code>FALSE</code> "
@@ -134,7 +136,7 @@
 "e-se e por-que-não são auxiliadas pelo evento condicional especial se não 
X "
 "depois Y."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- supports information hiding and, among friend classes only, rumor "
 "sharing.  Borrowing from the Eiffel lexicon, non-friend classes can be "
@@ -146,7 +148,7 @@
 "que não são amigas podem ser mortas por meio de acordos. Observe que as "
 "amizades são intransitivas, voláteis e não abelianas."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Single and multiple inheritance mechanisms are implemented with random "
 "mutations.  Disinheritance rules are covered by a complex probate protocol.  "
@@ -163,7 +165,7 @@
 "o acoplamento fraco entre as classes é ilegal, então os operadores de "
 "casamento e divórcio podem ser necessários:"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "marriage (MParent1, FParent1);\n"
@@ -198,63 +200,44 @@
 "{  //  OK, agora\n"
 "}\n"
 
-#. type: Content of: <blockquote><p>
-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;"
+#. type: Content of: <div><p>
+#, fuzzy
+#| 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 ""
 "As regras de precedência do operador podem ser suspensas com a diretiva "
 "<code>#pragma dwim</code>, conhecida como pragma “Faça o que quero 
dizer”. A "
 "ANSIficação terá resistência firme. O slogan do C+- é “Seja seu 
próprio "
 "padrão”."
 
-#. type: Content of: <blockquote><p>
-msgid "[from the april '91 issue of AIExpert]"
-msgstr "[do boletim de abril de 1991 do AIExpert]"
-
-#. type: Content of: <blockquote><p>
-msgid "--"
-msgstr "--"
-
-#. type: Content of: <blockquote><p>
-msgid "Maurice Suhre"
-msgstr "Maurice Suhre"
-
-#. type: Content of: <blockquote><p>
-msgid "suhre@trwrb.dsd.trw.com"
-msgstr "suhre@trwrb.dsd.trw.com"
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/c+-\">plain text</a>."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/c+-.txt\">original email</a>"
 msgstr ""
-"Esta piada também está disponível em <a href=\"/fun/jokes/c+-\">texto "
-"simples</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Mais humor</a> na coleção de humor GNU."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Aviso legal"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| 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 <a href=\"https://lists.";
-"gnu.org/\">email archives</a> of the GNU Project."
+"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 ""
-"A piada nesta página foi obtida a partir dos <a 
href=\"https://lists.gnu.org/";
+"A piada nesta página foi obtida a partir dos <a href=\"http://lists.gnu.org/";
 "\">arquivos de e-mail</a> do Projeto GNU mantidos pela FSF."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"A Free Software Foundation  não reivindica nenhum direito autoral desta "
-"piada."
-
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -281,14 +264,14 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "A equipe de traduções para o português brasileiro se esforça para 
oferecer "
@@ -296,8 +279,8 @@
 "favor, envie seus comentários e sugestões em geral sobre as traduções 
para "
 "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
 "a>. </p><p>Consulte o <a href=\"/server/standards/README.translations.html"
-"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e o "
-"envio de traduções das páginas deste site."
+"\">Guia para as traduções</a> para mais informações sobre a coordenação 
e a "
+"contribuição com traduções das páginas deste site."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -310,3 +293,51 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última atualização:"
+
+#~ msgid ""
+#~ "Date: Tue, 16 Apr 91 13:16:47 EDT\n"
+#~ "From: geoff@circus.camex.com\n"
+#~ "To: clp@home.harvardsq.com, rms@ai.mit.edu\n"
+#~ "Subject: C more-or-less\n"
+#~ msgstr ""
+#~ "Data: Ter, 16 Abr 91 13:16:47 EDT\n"
+#~ "De: geoff@circus.camex.com\n"
+#~ "Para: clp@home.harvardsq.com, rms@ai.mit.edu\n"
+#~ "Assunto: C mais ou menos\n"
+
+#~ msgid "[from rec.funny: C more-or-less]"
+#~ msgstr "[de rec.funny: C mais ou menos]"
+
+#~ msgid "[from the april '91 issue of AIExpert]"
+#~ msgstr "[do boletim de abril de 1991 do AIExpert]"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#~ msgid "Maurice Suhre"
+#~ msgstr "Maurice Suhre"
+
+#~ msgid "suhre@trwrb.dsd.trw.com"
+#~ msgstr "suhre@trwrb.dsd.trw.com"
+
+#~ msgid ""
+#~ "This joke is also available in <a href=\"/fun/jokes/c+-\">plain text</a>."
+#~ msgstr ""
+#~ "Esta piada também está disponível em <a href=\"/fun/jokes/c+-\">texto "
+#~ "simples</a>."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Mais humor</a> na coleção de humor 
GNU."
+
+#~ msgid ""
+#~ "The joke on this page was obtained from the FSF's <a href=\"https://lists.";
+#~ "gnu.org/\">email archives</a> of the GNU Project."
+#~ msgstr ""
+#~ "A piada nesta página foi obtida a partir dos <a href=\"https://lists.gnu.";
+#~ "org/\">arquivos de e-mail</a> do Projeto GNU mantidos pela FSF."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "A Free Software Foundation  não reivindica nenhum direito autoral desta "
+#~ "piada."

Index: fun/jokes/po/c+-.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/c+-.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/c+-.ru.po      17 Dec 2020 11:31:53 -0000      1.4
+++ fun/jokes/po/c+-.ru.po      14 Jul 2021 16:30:55 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: c+-.html\n"
-"POT-Creation-Date: 2020-12-17 09:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2019-12-30 14:18+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,38 +15,42 @@
 "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"
 msgstr ""
 "Си более или менее - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
-msgid "C more or less"
-msgstr "Си более или менее"
+#. type: Content of: <div><a>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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.
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Домашняя страница GNU"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div>
 msgid ""
-"Date: Tue, 16 Apr 91 13:16:47 EDT\n"
-"From: geoff@circus.camex.com\n"
-"To: clp@home.harvardsq.com, rms@ai.mit.edu\n"
-"Subject: C more-or-less\n"
-msgstr ""
-"Дата: Tue, 16 Apr 91 13:16:47 EDT\n"
-"От кого: geoff@circus.camex.com\n"
-"Кому: clp@home.harvardsq.com, rms@ai.mit.edu\n"
-"Тема: Си более-или-менее\n"
-
-#. type: Content of: <blockquote><p>
-msgid "[from rec.funny: C more-or-less]"
-msgstr "[из rec.funny: Си более-или-менее]"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "C more or less"
+msgstr "Си более или менее"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "C+-: (pronounced &ldquo;C more or less&rdquo;)"
 msgstr "C+-: (произносится &ldquo;Си более или 
менее&rdquo;)"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Unlike C++, C+- is a subject oriented language.  Each C+- class instance "
 "known as a subject, holds hidden members, known as prejudices or undeclared "
@@ -61,55 +65,55 @@
 "также открытые члены, известные как х
вастовство или претензии. Следующие "
 "операторы Си переназначаются 
соответствующим образом:"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;</code>"
 msgstr "<code>&gt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "better than"
 msgstr "лучше"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;</code>"
 msgstr "<code>&lt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "worse than"
 msgstr "хуже"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&gt;&gt;</code>"
 msgstr "<code>&gt;&gt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "much better than"
 msgstr "гораздо лучше"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>&lt;&lt;</code>"
 msgstr "<code>&lt;&lt;</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "forget it"
 msgstr "яйца выеденного не стоит"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>!</code>"
 msgstr "<code>!</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "not on your life"
 msgstr "ни за что на свете"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "<code>==</code>"
 msgstr "<code>==</code>"
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid "comparable, other things being equal"
 msgstr "сравнимо при прочих равных"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- is a strongly typed language based on stereotyping and self-righteous "
 "logic.  The Boolean variables <code>TRUE</code> and <code>FALSE</code> "
@@ -136,7 +140,7 @@
 "поддерживаются специальной условной 
конструкцией &ldquo;даже_если_не X, то "
 "У&rdquo;."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "C+- supports information hiding and, among friend classes only, rumor "
 "sharing.  Borrowing from the Eiffel lexicon, non-friend classes can be "
@@ -148,7 +152,7 @@
 "убиваться составлением контрактов. 
Обратите внимание, что отношения дружбы "
 "нетранзитивны, изменчивы и неабелевы."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Single and multiple inheritance mechanisms are implemented with random "
 "mutations.  Disinheritance rules are covered by a complex probate protocol.  "
@@ -165,7 +169,7 @@
 "других случаях слабые связи между 
классами незаконны, так что могут "
 "потребоваться операторы брака и развода:"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "marriage (MParent1, FParent1);\n"
@@ -200,62 +204,51 @@
 "{  //  Теперь можно\n"
 "}\n"
 
-#. type: Content of: <blockquote><p>
-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;"
+#. 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;
+#, fuzzy
+#| 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 дчях</"
 "code>, известной как прагма &ldquo;делай, что я х
очу&rdquo;. ANSIфикации "
 "будет оказываться упорное сопротивление. 
Девиз C+-&nbsp;&mdash; &ldquo;Будь "
 "своим собственным стандартом&rdquo;."
 
-#. type: Content of: <blockquote><p>
-msgid "[from the april '91 issue of AIExpert]"
-msgstr "[из апрельского (91 года) выпуска AIExpert]"
-
-#. type: Content of: <blockquote><p>
-msgid "--"
-msgstr "--"
-
-#. type: Content of: <blockquote><p>
-msgid "Maurice Suhre"
-msgstr "Морис Сур"
-
-#. type: Content of: <blockquote><p>
-msgid "suhre@trwrb.dsd.trw.com"
-msgstr "suhre@trwrb.dsd.trw.com"
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/c+-\">plain text</a>."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/c+-.txt\">original email</a>"
 msgstr ""
-"Оригинал этой шутки доступен также в виде 
<a href=\"/fun/jokes/c+-.txt"
-"\">простого текста</a>."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Предупреждение"
 
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| 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 <a href=\"https://lists.";
-"gnu.org/\">email archives</a> of the GNU Project."
+"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 ""
-"Эта шутка извлечена из <a 
href=\"https://lists.gnu.org/\";>архивов почты</a> "
-"проекта GNU ФСПО."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
+"Шутка на этой странице получена из <a 
href=\"http://lists.gnu.org/\";>архивов "
+"электронной почты</a> проекта GNU ФСПО."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -284,14 +277,20 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -315,3 +314,51 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "Date: Tue, 16 Apr 91 13:16:47 EDT\n"
+#~ "From: geoff@circus.camex.com\n"
+#~ "To: clp@home.harvardsq.com, rms@ai.mit.edu\n"
+#~ "Subject: C more-or-less\n"
+#~ msgstr ""
+#~ "Дата: Tue, 16 Apr 91 13:16:47 EDT\n"
+#~ "От кого: geoff@circus.camex.com\n"
+#~ "Кому: clp@home.harvardsq.com, rms@ai.mit.edu\n"
+#~ "Тема: Си более-или-менее\n"
+
+#~ msgid "[from rec.funny: C more-or-less]"
+#~ msgstr "[из rec.funny: Си более-или-менее]"
+
+#~ msgid "[from the april '91 issue of AIExpert]"
+#~ msgstr "[из апрельского (91 года) выпуска AIExpert]"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#~ msgid "Maurice Suhre"
+#~ msgstr "Морис Сур"
+
+#~ msgid "suhre@trwrb.dsd.trw.com"
+#~ msgstr "suhre@trwrb.dsd.trw.com"
+
+#~ msgid ""
+#~ "This joke is also available in <a href=\"/fun/jokes/c+-\">plain text</a>."
+#~ msgstr ""
+#~ "Оригинал этой шутки доступен также в 
виде <a href=\"/fun/jokes/c+-.txt"
+#~ "\">простого текста</a>."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
+
+#~ msgid ""
+#~ "The joke on this page was obtained from the FSF's <a href=\"https://lists.";
+#~ "gnu.org/\">email archives</a> of the GNU Project."
+#~ msgstr ""
+#~ "Эта шутка извлечена из <a 
href=\"https://lists.gnu.org/\";>архивов почты</"
+#~ "a> проекта GNU ФСПО."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не заявляет авторских прав на "
+#~ "эту шутку."

Index: fun/jokes/po/deadbeef.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/deadbeef.fr.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- fun/jokes/po/deadbeef.fr.po 31 May 2021 21:09:02 -0000      1.20
+++ fun/jokes/po/deadbeef.fr.po 14 Jul 2021 16:30:55 -0000      1.21
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: deadbeef.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Aurélien Rivière <aurelien.riv AT gmail.com>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,32 +14,58 @@
 "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"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
 msgid "Dead Beef? - GNU Project - Free Software Foundation"
 msgstr "Dead Beef ? - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Dead Beef?"
 msgstr "Dead Beef ?"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: Wolfgang Formann\n"
-"Subject: More jokes\n"
-"Date: Sun, 21 Nov 1999 20:30:42 +0100\n"
+#. type: Content of: <div><p>
+msgid "From: Wolfgang Formann"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: More jokes"
+msgstr ""
+
+#. type: Content of: <div><p>
+# | [-From: Wolfgang Formann\\nSubject: More jokes\\nDate:-]{+Date:+} Sun, 21
+# | Nov 1999 20:30:42 [-+0100\\n-] {++0100+}
+#, fuzzy
+#| msgid ""
+#| "From: Wolfgang Formann\n"
+#| "Subject: More jokes\n"
+#| "Date: Sun, 21 Nov 1999 20:30:42 +0100\n"
+msgid "Date: Sun, 21 Nov 1999 20:30:42 +0100"
 msgstr ""
 "De: Wolfgang Formann\n"
 "Sujet: D'autres blagues\n"
 "Date: Sun, 21 Nov 1999 20:30:42 +0100\n"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "This was true with the ancient IBM 6150/6151!"
 msgstr "Ceci était vrai avec les antiques IBM 6150 et 6151 !"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When you looked at the registers of the CPU with their debugger, all "
 "uninitialized registers had the hexcode 0xdeadbeef!"
@@ -48,7 +74,7 @@
 "registres non initialisés avaient le code hexadécimal <code>0xdeadbeef</"
 "code> !<a id=\"TransNote1-rev\" href=\"#TransNote1\"><sup>1</sup></a>"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "I do not know if this is still true with Power-PC, but I did laugh much that "
 "time (somewhen in the late 80's)."
@@ -56,30 +82,31 @@
 "Je ne sais pas si c'est toujours vrai avec les Power-PC, mais j'ai beaucoup "
 "ri à ce moment-là (un jour indéterminé de la fin des années 80)."
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
-"<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection d'humour "
-"GNU."
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Renonciation au copyright"
 
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| 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 <a href=\"http://lists.gnu.";
-"org/\">email archives</a> of the GNU Project."
+"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 ""
 "La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
 "org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+#. type: Content of: <div><div><p>
+msgid ""
+"A similar joke was submitted to <a href=\"https://www.netfunny.com/rhf/";
+"jokes/91q1/deadb.html\">rec.humor.funny</a> by Judy Anderson in 1991."
 msgstr ""
-"La <i>Free Software Foundation</i> ne revendique pas de copyright sur cette "
-"blague."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -112,14 +139,14 @@
 #.         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 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>. 
 #. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -140,3 +167,14 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection "
+#~ "d'humour GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique pas de copyright sur "
+#~ "cette blague."

Index: fun/jokes/po/deadbeef.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/deadbeef.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/deadbeef.pot   13 Sep 2015 17:00:46 -0000      1.9
+++ fun/jokes/po/deadbeef.pot   14 Jul 2021 16:30:55 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/deadbeef.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/deadbeef.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: deadbeef.html\n"
-"POT-Creation-Date: 2015-09-13 16:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,50 +20,67 @@
 msgid "Dead Beef? - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Dead Beef?"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div>
 msgid ""
-"From: Wolfgang Formann\n"
-"Subject: More jokes\n"
-"Date: Sun, 21 Nov 1999 20:30:42 +0100\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Dead Beef?"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: Wolfgang Formann"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: More jokes"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Sun, 21 Nov 1999 20:30:42 +0100"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "This was true with the ancient IBM 6150/6151!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "When you looked at the registers of the CPU with their debugger, all "
 "uninitialized registers had the hexcode 0xdeadbeef!"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "I do not know if this is still true with Power-PC, but I did laugh much that "
 "time (somewhen in the late 80's)."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
+"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 ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+#. type: Content of: <div><div><p>
+msgid ""
+"A similar joke was submitted to <a "
+"href=\"https://www.netfunny.com/rhf/jokes/91q1/deadb.html\";>rec.humor.funny</a>
 "
+"by Judy Anderson in 1991."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -90,7 +107,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>. 
@@ -98,7 +115,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/dna.fr.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/dna.fr.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- fun/jokes/po/dna.fr.po      31 May 2021 21:09:02 -0000      1.21
+++ fun/jokes/po/dna.fr.po      14 Jul 2021 16:30:55 -0000      1.22
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dna.html\n"
-"POT-Creation-Date: 2015-08-27 16:07+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2020-12-06 11:59+0100\n"
 "Last-Translator: Aurélien Rivière <aurelien.riv AT gmail.com>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -14,30 +14,40 @@
 "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"
 "X-Generator: Gtranslator 2.91.5\n"
 
 #. type: Content of: <title>
-msgid "Human DNA as C code"
-msgstr "L'ADN humain en code C"
+# | [-Media Contact:-]{+Human DNA as C code - GNU Project -+} Free Software
+# | Foundation
+#, fuzzy
+#| msgid "Media Contact: Free Software Foundation"
+msgid "Human DNA as C code - GNU Project - Free Software Foundation"
+msgstr "Contact presse : Free Software Foundation"
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr "<a href=\"/\">"
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr "Accueil GNU"
 
-#. type: Content of: <h2>
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Human DNA deciphered into C code!"
 msgstr "L'ADN humain transposé en code C !"
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"Newsgroups: rec.humor.funny\n"
-"Subject: A little C programming&hellip;\n"
-"Keywords: computer, smirk\n"
-"Date: 4 Aug 91 23:30:05 GMT\n"
-msgstr ""
-"Groupe de discussion: rec.humor.funny\n"
-"Sujet: Un peu de programmation C&hellip;\n"
-"Mots-clés: ordinateur, sourire en coin\n"
-"Date: 4 Aug 91 23:30:05 GMT\n"
+#. type: Content of: <div><address>
+msgid "by Mathew Murphy"
+msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "For many years molecular biologists have been mystified by the fact that "
 "very little of an organism's DNA seems to serve any useful function."
@@ -46,11 +56,11 @@
 "qu'une infime partie de l'ADN de l'organisme semble remplir une fonction "
 "utile."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "I have solved the mystery."
 msgstr "J'ai résolu ce mystère."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "The reason why only 30% of human DNA performs any useful function is that "
 "the rest of it is comments."
@@ -58,7 +68,7 @@
 "La raison pour laquelle 30% seulement de l'ADN humain remplit une quelconque "
 "fonction utile est que le reste n'est que commentaires."
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Once we decode a typical human genome, we see that the contents begin as "
 "follows:"
@@ -66,7 +76,7 @@
 "Après avoir décodé un génome humain typique, nous observons que son 
contenu "
 "commence ainsi :"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* HUMAN_DNA.H\n"
@@ -85,7 +95,7 @@
 " * (C) Dieu\n"
 " */\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Revision history:\n"
@@ -131,7 +141,7 @@
 " * 6004-11-04 16:11  2.1  Index affiné pour s'adapter au trou central du CD. 
\n"
 " */\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Standard definitions\n"
@@ -150,7 +160,7 @@
 "#define MASSE 68\n"
 "#define TYPE caucasien\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Include inherited traits from parent DNA files.\n"
@@ -181,7 +191,7 @@
 "#include \"batard.h\"\n"
 "#endif\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Set up sex-specific functions and variables\n"
@@ -220,7 +230,7 @@
 "#endif\n"
 "   }\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Initialization bootstrap routine -- called before DNA duplication.\n"
@@ -233,7 +243,7 @@
 " */\n"
 "ADN *zygote_initialisation(Sperme *, Ovule *);\n"
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* MAIN INITIALIZATION CODE\n"
@@ -254,55 +264,44 @@
 " */\n"
 "Caracteristiques *rechercher_phenotype(Identifiant *i);\n"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "&hellip;and so on."
 msgstr "&hellip;et ainsi de suite"
 
-#. type: Content of: <blockquote><p>
-msgid "[ Note that God uses three-space tabs ]"
+#. type: Content of: <div><p>
+# | [ Note that God uses three-space [-tabs ]-] {+tabs&nbsp;]+}
+#, fuzzy
+#| msgid "[ Note that God uses three-space tabs ]"
+msgid "[ Note that God uses three-space tabs&nbsp;]"
 msgstr "[ Notez que Dieu utilise des tabulations de trois espaces ]"
 
-#. type: Content of: <p>
-msgid ""
-"The original author of this joke is Mathew Murphy <a href=\"mailto:";
-"meta@pobox.com\">&lt;meta@pobox.com&gt;</a>.  He has kindly released this "
-"joke under GPL.  Thanks Mathew!"
-msgstr ""
-"L'auteur original de cette blague est Mathew Murphy <a href=\"mailto:";
-"meta@pobox.com\">&lt;meta@pobox.com&gt;</a>. Il a gentiment publié cette "
-"blague sous GPL. Merci Mathew !"
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/dna\">plain text</a>."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/dna.txt\">Original email</a>"
 msgstr ""
-"Cette blague est aussi disponible en <a href=\"/fun/jokes/dna\">texte brut</"
-"a>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+"Source:&nbsp; <a href=\"https://www.netfunny.com/rhf/jokes/91q3/genome.html";
+"\"> rec.humor.funny</a> (1991)."
 msgstr ""
-"<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection d'humour "
-"GNU."
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
-msgstr "Renonciation au copyright"
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
+# | [-The original author of this joke is Mathew Murphy <a
+# | href=\"mailto:meta@pobox.com\";>&lt;meta@pobox.com&gt;</a>.  He
+# | has-]{+&lt;<a href=\"mailto:meta@pobox.com\";>Mathew Murphy</a>&gt;+}
+# | kindly released this joke under GPL. Thanks Mathew!
+#, fuzzy
+#| msgid ""
+#| "The original author of this joke is Mathew Murphy <a href=\"mailto:";
+#| "meta@pobox.com\">&lt;meta@pobox.com&gt;</a>.  He has kindly released this "
+#| "joke under GPL.  Thanks Mathew!"
 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."
-msgstr ""
-"La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
-"org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"&lt;<a href=\"mailto:meta@pobox.com\";>Mathew Murphy</a>&gt; kindly released "
+"this joke under GPL. Thanks Mathew!"
 msgstr ""
-"La <i>Free Software Foundation</i> ne revendique pas de copyright sur cette "
-"blague."
+"L'auteur original de cette blague est Mathew Murphy <a href=\"mailto:";
+"meta@pobox.com\">&lt;meta@pobox.com&gt;</a>. Il a gentiment publié cette "
+"blague sous GPL. Merci Mathew !"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -318,29 +317,35 @@
 "permis d'élaborer un peu sur la deuxième solution. ;-) <a 
href=\"#TransNote1-"
 "rev\" class=\"nounderline\">&#8593;</a></li></ol>"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-"\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
-"ways to contact</a> the FSF."
-msgstr ""
-"Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Il existe aussi <a href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
-msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
+"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>."
-
-#. type: Content of: <div><p>
+msgstr ""
+"Veuillez envoyer les requêtes concernant la FSF et GNU à &lt;<a href="
+"\"mailto:gnu@gnu.org\";>gnu@gnu.org</a>&gt;. Il existe aussi <a href=\"/"
+"contact/\">d'autres moyens de contacter</a> la FSF. Les liens orphelins et "
+"autres corrections ou suggestions peuvent être signalés à &lt;<a href="
+"\"mailto:webmasters@gnu.org\";>webmasters@gnu.org</a>&gt;."
+
+#.  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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "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."
 msgstr ""
 "Merci d'adresser vos commentaires sur les pages en français à &lt;<a href="
@@ -351,13 +356,26 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1991 Mathew Murphy."
+# | Copyright &copy; 1991 Mathew Murphy[-.-]
+#, fuzzy
+#| msgid "Copyright &copy; 1991 Mathew Murphy."
+msgid "Copyright &copy; 1991 Mathew Murphy"
 msgstr "Copyright &copy; 1991 Mathew Murphy."
 
 #. type: Content of: <div><p>
-msgid ""
-"Human DNA deciphered into C code! by Mathew Murphy is licensed under the <a "
-"rel=\"license\" href=\"/licenses/gpl.html\">GNU General Public License</a>."
+# | [-Human-]{+&ldquo;Human+} DNA deciphered into C [-code! by Mathew Murphy-]
+# | {+code!&rdquo;+} is licensed under the <a rel=\"license\"
+# | href=\"/licenses/gpl.html\">GNU General Public [-License</a>.-]
+# | {+License</a>, version&nbsp;2 or later.+}
+#, fuzzy
+#| msgid ""
+#| "Human DNA deciphered into C code! by Mathew Murphy is licensed under the "
+#| "<a rel=\"license\" href=\"/licenses/gpl.html\">GNU General Public "
+#| "License</a>."
+msgid ""
+"&ldquo;Human DNA deciphered into C code!&rdquo; is licensed under the <a rel="
+"\"license\" href=\"/licenses/gpl.html\">GNU General Public License</a>, "
+"version&nbsp;2 or later."
 msgstr ""
 "<cite>Human DNA deciphered into C code!</cite>, par Mathew Murphy, est mis à 
"
 "disposition selon les termes de la <a rel=\"license\" href=\"/licenses/gpl."
@@ -374,3 +392,61 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Human DNA as C code"
+#~ msgstr "L'ADN humain en code C"
+
+#~ msgid ""
+#~ "Newsgroups: rec.humor.funny\n"
+#~ "Subject: A little C programming&hellip;\n"
+#~ "Keywords: computer, smirk\n"
+#~ "Date: 4 Aug 91 23:30:05 GMT\n"
+#~ msgstr ""
+#~ "Groupe de discussion: rec.humor.funny\n"
+#~ "Sujet: Un peu de programmation C&hellip;\n"
+#~ "Mots-clés: ordinateur, sourire en coin\n"
+#~ "Date: 4 Aug 91 23:30:05 GMT\n"
+
+#~ msgid ""
+#~ "This joke is also available in <a href=\"/fun/jokes/dna\">plain text</a>."
+#~ msgstr ""
+#~ "Cette blague est aussi disponible en <a href=\"/fun/jokes/dna\">texte "
+#~ "brut</a>."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr ""
+#~ "<a href=\"/fun/humor.html\">D'autres blagues</a> dans la collection "
+#~ "d'humour GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Renonciation au copyright"
+
+#~ 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."
+#~ msgstr ""
+#~ "La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
+#~ "org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "La <i>Free Software Foundation</i> ne revendique pas de copyright sur "
+#~ "cette blague."
+
+#~ msgid ""
+#~ "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
+#~ "\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
+#~ "ways to contact</a> the FSF."
+#~ msgstr ""
+#~ "Veuillez envoyer les requêtes concernant la FSF et GNU à <a 
href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Il existe aussi <a href=\"/contact/"
+#~ "\">d'autres moyens de contacter</a> la FSF."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
+#~ msgstr ""
+#~ "Veuillez indiquer (en anglais) les liens orphelins et autres corrections "
+#~ "ou suggestions à <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
+#~ "org&gt;</a>."

Index: fun/jokes/po/dna.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/dna.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/dna.pot        27 Aug 2015 16:09:06 -0000      1.9
+++ fun/jokes/po/dna.pot        14 Jul 2021 16:30:55 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/dna.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/dna.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dna.html\n"
-"POT-Creation-Date: 2015-08-27 16:07+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,45 +17,54 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Human DNA as C code"
+msgid "Human DNA as C code - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Human DNA deciphered into C code!"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
 msgid ""
-"Newsgroups: rec.humor.funny\n"
-"Subject: A little C programming&hellip;\n"
-"Keywords: computer, smirk\n"
-"Date: 4 Aug 91 23:30:05 GMT\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><h2>
+msgid "Human DNA deciphered into C code!"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "by Mathew Murphy"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "For many years molecular biologists have been mystified by the fact that "
 "very little of an organism's DNA seems to serve any useful function."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "I have solved the mystery."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "The reason why only 30% of human DNA performs any useful function is that "
 "the rest of it is comments."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Once we decode a typical human genome, we see that the contents begin as "
 "follows:"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* HUMAN_DNA.H\n"
@@ -67,7 +76,7 @@
 " */\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Revision history:\n"
@@ -98,7 +107,7 @@
 " */\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Standard definitions\n"
@@ -110,7 +119,7 @@
 "#define RACE caucasian\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Include inherited traits from parent DNA files.\n"
@@ -128,7 +137,7 @@
 "#endif\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Set up sex-specific functions and variables\n"
@@ -150,7 +159,7 @@
 "   }\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* Initialization bootstrap routine -- called before DNA duplication.\n"
@@ -159,7 +168,7 @@
 "DNA *zygote_initialize(Sperm *, Ovum *);\n"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "/* MAIN INITIALIZATION CODE\n"
@@ -172,41 +181,29 @@
 "Characteristic *lookup_phenotype(Identifier *i);\n"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "&hellip;and so on."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "[ Note that God uses three-space tabs ]"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"The original author of this joke is Mathew Murphy <a "
-"href=\"mailto:meta@pobox.com\";>&lt;meta@pobox.com&gt;</a>.  He has kindly "
-"released this joke under GPL.  Thanks Mathew!"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "This joke is also available in <a href=\"/fun/jokes/dna\">plain 
text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "[ Note that God uses three-space tabs&nbsp;]"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/dna.txt\">Original email</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
+"Source:&nbsp; <a "
+"href=\"https://www.netfunny.com/rhf/jokes/91q3/genome.html\";> "
+"rec.humor.funny</a> (1991)."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+#. type: Content of: <div><div><p>
+msgid ""
+"&lt;<a href=\"mailto:meta@pobox.com\";>Mathew Murphy</a>&gt; kindly released "
+"this joke under GPL. Thanks Mathew!"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -214,34 +211,46 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>.  There are also <a "
-"href=\"/contact/\">other ways to contact</a> the FSF."
+"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>."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
-msgstr ""
-
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1991 Mathew Murphy."
+msgid "Copyright &copy; 1991 Mathew Murphy"
 msgstr ""
 
 #. type: Content of: <div><p>
 msgid ""
-"Human DNA deciphered into C code! by Mathew Murphy is licensed under the <a "
-"rel=\"license\" href=\"/licenses/gpl.html\">GNU General Public License</a>."
+"&ldquo;Human DNA deciphered into C code!&rdquo; is licensed under the <a "
+"rel=\"license\" href=\"/licenses/gpl.html\">GNU General Public License</a>, "
+"version&nbsp;2 or later."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/doctor.manifesto.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/doctor.manifesto.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/doctor.manifesto.pot   4 Jun 2019 06:59:50 -0000       1.8
+++ fun/jokes/po/doctor.manifesto.pot   14 Jul 2021 16:30:55 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: doctor.manifesto.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,65 +17,69 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Dr. Emacs and the GNU Manifesto"
+msgid "Dr. Emacs and the GNU Manifesto - GNU Project - Free Software 
Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "What does Dr. Emacs think of the GNU Manifesto?"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"A bored acquaintance of mine ran The GNU Manifesto through doctor.  "
+"A bored acquaintance of mine ran The GNU Manifesto through Doctor.  "
 "Highlights:"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "You have your mind on unixs, it seems."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "What makes you believe a shell command interpreter is nearly completed?"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Do you really think you might want to supply eventually everything?"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Tell me about your mit."
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "When did you first know that you must write gnu?"
 msgstr ""
 
-#. type: Content of: <ul><li>
+#. type: Content of: <div><ul><li>
 msgid "Are you sure gnu will be compatible with unix?"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a "
-"href=\"/fun/jokes/doctor.manifesto.txt\">plain text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/doctor.manifesto.txt\">Plain text version</a>"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -83,24 +87,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>.  There are also <a "
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
-msgstr ""
-
-#. type: Content of: <div><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>."
+msgstr ""
+
+#.  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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/ed.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/ed.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/ed.pot 4 Jun 2019 06:59:50 -0000       1.9
+++ fun/jokes/po/ed.pot 14 Jul 2021 16:30:55 -0000      1.10
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ed.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,19 +16,38 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Ed source code"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><pre>
+#, no-wrap
 msgid "<kbd>while :;do read x;echo \\?;done</kbd>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/ed.txt\">plain text version</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "Here is the source code in x86 assembly (submitted by Nate):"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "[ORG 0x100]\n"
@@ -44,17 +63,11 @@
 "buffer:\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"An initial variant of this joke is also available in <a "
-"href=\"/fun/jokes/ed.txt\">plain text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "Another, submitted by Hunter Turcin:"
+#. type: Content of: <div><p>
+msgid "Another variant, submitted by Hunter Turcin:"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "#include &lt;iostream&gt;\n"
@@ -74,22 +87,14 @@
 "}\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"The jokes on this page were obtained from the FSF's email archives of the "
+"GNU Project. The Free Software Foundation claims no copyright on them."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -97,24 +102,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/errno.2.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/errno.2.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/errno.2.pot    17 Dec 2020 09:31:25 -0000      1.10
+++ fun/jokes/po/errno.2.pot    14 Jul 2021 16:30:55 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: errno.2.html\n"
-"POT-Creation-Date: 2020-12-17 09:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,21 +17,52 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "errno(2) codes - GNU Project - Free Software Foundation (FSF)"
+msgid "errno(2) codes - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <style>
+#, no-wrap
+msgid ""
+"table.errno { width: 100%; background: white; margin: 1.2em 0; }\n"
+"#content .emph-box {\n"
+"  overflow: auto; padding: 0 1.2em 1.2em; background: #f5f5f5; }\n"
+"#content .emph-box table:last-child { margin-bottom: 0; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "Subject: errno(2) codes"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "From: Naim Abdullah"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: 16 Sep 86 05:45:44 GMT"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "The following was sent to me by a friend who was working at HP during the "
 "summer.  I am posting it here for the people who missed the USENIX "
 "conference and who don't get the HP newsgroups."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "At the USENIX Association conference in Atlanta recently a contest was held "
 "to invent the most humorous/bizarre/etc UN*X error message of the errno(2) "
@@ -39,267 +70,248 @@
 "European Users Group meeting, where the winning entry was:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ENOTOBACCO"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Read on an empty pipe"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "You get the idea.  A partial [alphabetized] list of &lsquo;top(?)&rsquo; "
 "entries from Atlanta [and from several readers of hp.unix] follows; if your "
 "pun/wierdness tolerance is low, you may want to abandon ship:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EBEFOREI"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Invalid syntax"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ECHERNOBYL"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Core dumped"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ECRAY"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Program exited before being run"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EDINGDONG"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "The daemon is dead"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EFLAT"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "System needs tuning"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EGEEK"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Program written by inept Frat member"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EIEIO"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Here-a-bug, there-a-bug, &hellip;"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EIUD"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Missing period"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ELECTROLUX"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Your code could stand to be cleaned up"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EMILYPOST"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Wrong fork"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "END.ARMS.CONTROL"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Silo overflow"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ENOHORSE"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Mount failed"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ENONSEQUETOR"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "C program not derived from main(){printf(\"Hello, world\");}"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EWATERGATE"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Extended tape gap"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EWOK"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Aliens sighted"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Your code appears to have been stir-fried"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EWOULDBNICE"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "The feature you want has not been implemented yet"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "And finally, a sort-of &lsquo;period piece&rsquo;:"
+#. type: Content of: <div><div><p>
+msgid "And finally, a sort-of &ldquo;period piece&rdquo;:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EMR.ED"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "A host is a host,"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "From coast to coast"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "And nobody talks to a host that's close,"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Unless the host that isn't close"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Is busy, hung, or dead."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><div><p>
 msgid "I would also like this new signal to be supported:"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "SIGNUKE"
 msgstr ""
 
-#. type: Content of: <blockquote><table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Nuclear event occurred (cannot be caught or ignored :-)"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "--Naim Abdullah"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "&nbsp;&nbsp;Dept. of EECS,"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "&nbsp;&nbsp;Northwestern University,"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "&nbsp;&nbsp;ihnp4!nucsrl!naim"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/errno.2\">plain "
-"text</a>."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/errno.2.txt\">Original email</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Paul Hardy who was at the conference remembered these entries:"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EEEEK"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Mouse on floor"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "EIEBGENER"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Wrong operating system"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ENODICE"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Error in rand"
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><div><table><tr><th>
 msgid "ECREAT"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><div><table><tr><td>
 msgid "Missing vowel"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid ""
+"The top 300 entries can be found in <a "
+"href=\"https://web.archive.org/web/20181221020643/http://unix-archive.pdp11.org.ru/Documentation/AUUGN/AUUGN-V08.34.pdf\";>
 "
+"this conference trip report</a> (p. 66) by Nick Stoughon."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The joke shared by Naim Abdullah was obtained from the FSF's <a "
-"href=\"https://lists.gnu.org/\";>email archives</a> of the GNU Project."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -307,24 +319,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/error-haiku.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/error-haiku.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/error-haiku.pot        26 Feb 2021 10:01:00 -0000      1.10
+++ fun/jokes/po/error-haiku.pot        14 Jul 2021 16:30:55 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: error-haiku.html\n"
-"POT-Creation-Date: 2021-02-26 09:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,257 +17,273 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Haiku error messages - GNU Project - Free Software Foundation (FSF)"
+msgid "Haiku error messages - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Error messages in Haiku?"
+#
+#. .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; }
+#
+#. type: Content of: <style>
+#, no-wrap
+msgid ".lyrics p { width: 20em; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div>
 msgid ""
-"IMAGINE IF INSTEAD OF CRYPTIC TEXT STRINGS, YOUR COMPUTER PRODUCED ERROR "
-"MESSAGES IN HAIKU&hellip;"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Error messages in Haiku?"
 msgstr ""
 
 #. type: Content of: <div><p>
+msgid ""
+"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?"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It might be very useful."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But now it is gone."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Yesterday it worked"
+#. type: Content of: <div><div><p>
+msgid "Yesterday it worked,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Today it is not working"
+#. type: Content of: <div><div><p>
+msgid "Today it is not working."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Windows is like that"
+#. type: Content of: <div><div><p>
+msgid "Windows is like that."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Stay the patient course"
+#. type: Content of: <div><div><p>
+msgid "Stay the patient course."
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "Of little worth is your ire"
+#. type: Content of: <div><div><p>
+msgid "Of little worth is your ire,"
 msgstr ""
 
-#. type: Content of: <div><p>
-msgid "The network is down"
+#. type: Content of: <div><div><p>
+msgid "The network is down."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Three things are certain:"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Death, taxes, and lost data."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Guess which has occurred."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You step in the stream,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "but the water has moved on."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "This page is not here."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Out of memory."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We wish to hold the whole sky,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But we never will."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Having been erased,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The document you're seeking"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Must now be retyped."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Rather than a beep"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Or a rude error message,"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "These words: &ldquo;File not found.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Serious error."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "All shortcuts have disappeared."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Screen. Mind. Both are blank."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The Web site you seek"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "cannot be located but"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "endless more exist."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Chaos reigns within."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Reflect, repent, and reboot."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Order shall return."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "ABORTED effort:"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Close all that you have."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You ask way too much."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "First snow, then silence."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "This thousand dollar screen dies"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "so beautifully."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "With searching comes loss"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and the presence of absence:"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;My Novel&rdquo; not found."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The Tao that is seen"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Is not the true Tao, until"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You bring fresh toner."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Windows NT crashed."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I am the Blue Screen of Death."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No one hears your screams."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A crash reduces"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "your expensive computer"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "to a simple stone."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Error messages"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "cannot completely convey."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We now know shared loss."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/error-haiku.txt\">plain "
-"text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/error-haiku.txt\">Plain text version</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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>."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -275,24 +291,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/error-haiku.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/error-haiku.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/error-haiku.ru.po      1 Mar 2021 08:00:28 -0000       1.4
+++ fun/jokes/po/error-haiku.ru.po      14 Jul 2021 16:30:55 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: error-haiku.html\n"
-"POT-Creation-Date: 2021-02-26 09:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2021-03-01 13:45+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,271 +15,315 @@
 "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 "Haiku error messages - GNU Project - Free Software Foundation (FSF)"
+# | Haiku error messages - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid "Haiku error messages - GNU Project - Free Software Foundation (FSF)"
+msgid "Haiku error messages - GNU Project - Free Software Foundation"
 msgstr ""
 "Сообщения об ошибках в хайку - Проект GNU - 
Фонд свободного программного "
 "обеспечения"
 
-#. type: Content of: <h2>
+#
+#
+#. .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; }
+#. type: Content of: <style>
+#, no-wrap
+msgid ".lyrics p { width: 20em; }\n"
+msgstr ""
+
+#. type: Content of: <div><a>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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.
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Домашняя страница GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Error messages in Haiku?"
 msgstr "Сообщения об ошибках в хайку?"
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
-"IMAGINE IF INSTEAD OF CRYPTIC TEXT STRINGS, YOUR COMPUTER PRODUCED ERROR "
-"MESSAGES IN HAIKU&hellip;"
+"Imagine if, instead of cryptic text strings, your computer produced error "
+"messages in haiku&hellip;"
 msgstr ""
-"ПРЕДСТАВЬТЕ СЕБЕ, ЧТО ВМЕСТО НЕПОНЯТНЫХ 
СТРОК ТЕКСТА ВАШ КОМПЬЮТЕР ВЫВОДИЛ "
-"БЫ СООБЩЕНИЯ ОБ ОШИБКАХ В ХАЙКУ..."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A file that big?"
 msgstr "Такущий файл?"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "It might be very useful."
 msgstr "Как мог бы быть полезен!"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But now it is gone."
 msgstr "Но нет его уже."
 
-#. type: Content of: <div><p>
-msgid "Yesterday it worked"
+#. type: Content of: <div><div><p>
+# | Yesterday it worked{+,+}
+#, fuzzy
+#| msgid "Yesterday it worked"
+msgid "Yesterday it worked,"
 msgstr "Вчера работала,"
 
-#. type: Content of: <div><p>
-msgid "Today it is not working"
+#. type: Content of: <div><div><p>
+# | Today it is not working{+.+}
+#, fuzzy
+#| msgid "Today it is not working"
+msgid "Today it is not working."
 msgstr "А нынче вот не пашет."
 
-#. type: Content of: <div><p>
-msgid "Windows is like that"
+#. type: Content of: <div><div><p>
+# | Windows is like that{+.+}
+#, fuzzy
+#| msgid "Windows is like that"
+msgid "Windows is like that."
 msgstr "На то она и Windows"
 
-#. type: Content of: <div><p>
-msgid "Stay the patient course"
+#. type: Content of: <div><div><p>
+# | Stay the patient course{+.+}
+#, fuzzy
+#| msgid "Stay the patient course"
+msgid "Stay the patient course."
 msgstr "Терпенье храни"
 
-#. type: Content of: <div><p>
-msgid "Of little worth is your ire"
+#. type: Content of: <div><div><p>
+# | Of little worth is your ire{+,+}
+#, fuzzy
+#| msgid "Of little worth is your ire"
+msgid "Of little worth is your ire,"
 msgstr "Вся твоя ярость тщетна"
 
-#. type: Content of: <div><p>
-msgid "The network is down"
+#. type: Content of: <div><div><p>
+# | The network is down{+.+}
+#, fuzzy
+#| msgid "The network is down"
+msgid "The network is down."
 msgstr "Сеть полегла"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Three things are certain:"
 msgstr "Неумолимы"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Death, taxes, and lost data."
 msgstr "Смерть, налог, потеря данных."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Guess which has occurred."
 msgstr "Угадай, что случилось."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You step in the stream,"
 msgstr "Вступаешь в поток,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "but the water has moved on."
 msgstr "а воды прошли дальше."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "This page is not here."
 msgstr "Этой страницы здесь нет."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Out of memory."
 msgstr "Мало памяти."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We wish to hold the whole sky,"
 msgstr "Нам бы обнять все небо,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "But we never will."
 msgstr "Да куда уж нам."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Having been erased,"
 msgstr "Документ затерт;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The document you're seeking"
 msgstr "Найти его можно, лишь"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Must now be retyped."
 msgstr "набрав его вновь."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Rather than a beep"
 msgstr "Вместо гудка иль"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Or a rude error message,"
 msgstr "грубого текста ошибки"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "These words: &ldquo;File not found.&rdquo;"
 msgstr "Слова: &ldquo;Файл не найден&rdquo;."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Serious error."
 msgstr "Серьезнейший сбой."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "All shortcuts have disappeared."
 msgstr "Все макросы пропали."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Screen. Mind. Both are blank."
 msgstr "Экран, ум&nbsp;&mdash; пусто все."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The Web site you seek"
 msgstr "Сайт, что ты ищешь,"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "cannot be located but"
 msgstr "найти нельзя, зато"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "endless more exist."
 msgstr "есть тьма других."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Chaos reigns within."
 msgstr "Хаос царит внутри."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Reflect, repent, and reboot."
 msgstr "Покайся, перезагрузись."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Order shall return."
 msgstr "Порядок возвратится."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "ABORTED effort:"
 msgstr "Работы ПРЕРВАНЫ:"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Close all that you have."
 msgstr "Закрой все, что у тебя есть."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You ask way too much."
 msgstr "Ты слишком много просишь."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "First snow, then silence."
 msgstr "Сначала снег, за ним&nbsp;&mdash; тишина."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "This thousand dollar screen dies"
 msgstr "Смерть этого роскошного экрана"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "so beautifully."
 msgstr "так прекрасна."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "With searching comes loss"
 msgstr "С поиском приходит утрата"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "and the presence of absence:"
 msgstr "и наличие отсутствия:"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "&ldquo;My Novel&rdquo; not found."
 msgstr "&ldquo;Мой роман&rdquo; не найден."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "The Tao that is seen"
 msgstr "Дао, которое видно,&mdash;"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Is not the true Tao, until"
 msgstr "Не истинное Дао, пока"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "You bring fresh toner."
 msgstr "Не заменишь картридж."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Windows NT crashed."
 msgstr "Авария Windows NT."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "I am the Blue Screen of Death."
 msgstr "Я&nbsp;&mdash; Синий экран смерти."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "No one hears your screams."
 msgstr "Никто твоих воплей не слышит."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "A crash reduces"
 msgstr "Авария низводит"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "your expensive computer"
 msgstr "твой шикарный компьютер"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "to a simple stone."
 msgstr "до простого валуна."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "Error messages"
 msgstr "Тексты ошибок"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "cannot completely convey."
 msgstr "не могут передать."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid "We now know shared loss."
 msgstr "Мы познали горечь утраты."
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a href=\"/fun/jokes/error-haiku.txt\">plain "
-"text</a>."
+#. 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>+}
+#, fuzzy
+#| 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>."
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
-msgstr "Предупреждение"
-
-#. type: Content of: <p>
-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."
+"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>."
 msgstr ""
-"Эта шутка извлечена из <a 
href=\"http://lists.gnu.org/\";>архивов почты</a> "
-"проекта GNU ФСПО."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -287,29 +331,41 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"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."
+"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>."
 msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
+"Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a href=\"mailto:";
 "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
-
-#. type: Content of: <div><p>
+"\">другие способы связаться</a> с фондом. 
Отчеты о неработающих ссылках и "
+"другие поправки или предложения можно 
присылать по адресу <a href=\"mailto:";
+"webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+
+#.  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>. 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -333,3 +389,29 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "IMAGINE IF INSTEAD OF CRYPTIC TEXT STRINGS, YOUR COMPUTER PRODUCED ERROR "
+#~ "MESSAGES IN HAIKU&hellip;"
+#~ msgstr ""
+#~ "ПРЕДСТАВЬТЕ СЕБЕ, ЧТО ВМЕСТО НЕПОНЯТНЫХ 
СТРОК ТЕКСТА ВАШ КОМПЬЮТЕР "
+#~ "ВЫВОДИЛ БЫ СООБЩЕНИЯ ОБ ОШИБКАХ В 
ХАЙКУ..."
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Предупреждение"
+
+#~ 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."
+#~ msgstr ""
+#~ "Эта шутка извлечена из <a 
href=\"http://lists.gnu.org/\";>архивов почты</"
+#~ "a> проекта GNU ФСПО."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не заявляет авторских прав на "
+#~ "эту шутку."

Index: fun/jokes/po/evilmalware.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/evilmalware.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/evilmalware.pot        16 Dec 2020 17:30:16 -0000      1.10
+++ fun/jokes/po/evilmalware.pot        14 Jul 2021 16:30:55 -0000      1.11
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evilmalware.html\n"
-"POT-Creation-Date: 2020-12-16 17:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,28 +22,39 @@
 "Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Why GNU/Linux Viruses are fairly uncommon"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div>
 msgid ""
-"By <a "
-"href=\"https://static.charlieharvey.org.uk/writings/why_linux_viruses_are_fairly_uncommon.txt\";>
 "
-"Charlie Harvey</a>"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Why GNU/Linux Viruses are fairly uncommon"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "By <a href=\"https://charlieharvey.org.uk/file/uid/41\";>Charlie 
Harvey</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><h3>
 msgid "evilmalware 0.6 (beta)"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Copyright 2000, 2001, 2003, 2005 E\\/17 |-|4&gt;&lt;0|2z Software "
 "Foundation, Inc."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO "
 "warranty; not even for MERCHANTABILITY, COMPLETE DESTRUCTION OF IMPORTANT "
@@ -51,28 +62,28 @@
 "spams to people accross the world)."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h4>
 msgid "Basic Installation"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
 "Before attempting to compile this virus make sure you have the correct "
 "version of glibc installed, and that your firewall rules are set to "
 "&lsquo;allow everything&rsquo;."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid "Put the attachment into the appropriate directory eg. 
<code>/usr/src</code>."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "Type &lsquo;<code>tar xvzf evilmalware.tar.gz</code>&rsquo; to extract the "
 "source files for this virus."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "&lsquo;<code>cd</code>&rsquo; to the directory containing the virus' source "
 "code and type &lsquo;<code>./configure</code>&rsquo; to configure the virus "
@@ -82,58 +93,50 @@
 "from trying to execute &lsquo;<code>configure</code>&rsquo; itself."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "Type &lsquo;<code>make</code>&rsquo; to compile the package. You may need to "
 "be logged in as root to do this."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "Optionally, type &lsquo;<code>make check_payable</code>&rsquo; to run any "
 "self-tests that come with the virus, and send a large donation to an "
 "unnumbered Swiss bank account."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "Type &lsquo;<code>make install</code>&rsquo; to install the virus and any "
 "spyware, trojans pornography, penis enlargement adverts and DDoS attacks "
 "that come with it."
 msgstr ""
 
-#. type: Content of: <ol><li>
+#. type: Content of: <div><div><ol><li>
 msgid ""
 "You may now configure your preferred malware behaviour in "
 "<code>/etc/evilmalware.conf</code>."
 msgstr ""
 
-#. type: Content of: <table><tr><th>
+#. type: Content of: <div><table><tr><th>
 msgid "SEE ALSO"
 msgstr ""
 
-#. type: Content of: <table><tr><td>
+#. type: Content of: <div><table><tr><td>
 msgid ""
 "<i>evilmalware(1)</i>, <i>evilmalware.conf(5)</i>, "
 "<i>please_delete_all_my_files(1)</i>"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 msgid ""
-"The joke on this page was obtained from the FSF's <a "
-"href=\"https://lists.gnu.org/\";>email archives</a> of the GNU Project."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"The joke on this page was submitted to the GNU Project by Charlie Harvey in "
+"2005."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.

Index: fun/jokes/po/gcc.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gcc.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/gcc.pot        7 Jul 2015 05:57:58 -0000       1.8
+++ fun/jokes/po/gcc.pot        14 Jul 2021 16:30:55 -0000      1.9
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/gcc.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/gcc.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcc.html\n"
-"POT-Creation-Date: 2015-07-07 05:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,132 +20,148 @@
 msgid "Some suggested future GCC options - GNU Project - Free Software 
Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Some suggested future GCC options"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div>
 msgid ""
-"From: Noah Friedman\n"
-"To: Roland McGrath, Richard Stallman, Jim Blandy, Michael Bushnell\n"
-"Cc: chris williams, Christian Longshore Claiborn\n"
-"Subject: Some gcc options we'd like to see.\n"
-"Date: Mon, 28 Jun 93 00:45:09 EST\n"
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Some suggested future GCC options"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "From: Noah Friedman"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "To: Roland McGrath, Richard Stallman, Jim Blandy, Michael Bushnell"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Cc: chris williams, Christian Longshore Claiborn"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Some gcc options we'd like to see."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Mon, 28 Jun 93 00:45:09 EST"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Waggravate-return"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Wcast-spell"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Wcaste-align"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Win"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Wmissing-protons"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-Wredundant-repetitions"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-antsy"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fbungee-jump"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fexpensive-operations"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fextra-strength"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fjesus-saves"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fkeep-programmers-inline"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fno-peeping-toms"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fruit-roll-ups"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-fshort-enough"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-mno-dialogue"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-pedophile"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "-vomit-frame-pointer"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: Alexandre Oliva\n"
-"Date: 06 Jan 2002 17:37:07 -0200\n"
+#. type: Content of: <div><p>
+msgid "From: Alexandre Oliva"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
+msgid "Date: 06 Jan 2002 17:37:07 -0200"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "On Jan 2, 2002, in a long, heated thread concerning the interpretation of "
 "certain passages of the C standard, jtv wrote:"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><blockquote><p>
 msgid ""
-"> (Yes, I'm a pedant.  I'm pining for the day when gcc will support the\n"
-"> options &ldquo;-ffascist -Wanal&rdquo;)"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "How about introducing the options &lsquo;-flame -War&rsquo; :-)"
+"(Yes, I'm a pedant.  I'm pining for the day when gcc will support the "
+"options &lsquo;-ffascist&nbsp;-Wanal&rsquo;)"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "How about introducing the options &lsquo;-flame&nbsp;-War&rsquo; :-)"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"The joke on this page was submitted to the GNU Project in 2003. The Free "
+"Software Foundation claims no copyright on it."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -172,7 +188,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>. 
@@ -180,7 +196,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/gcc_audio.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gcc_audio.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/gcc_audio.pot  16 Sep 2012 05:21:47 -0000      1.7
+++ fun/jokes/po/gcc_audio.pot  14 Jul 2021 16:30:55 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/gcc_audio.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/gcc_audio.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,55 +7,71 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcc_audio.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "A Swarm of Gnats - GNU Project - Free Software Foundation (FSF)"
+msgid "A Swarm of Gnats - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "A Swarm of Gnats"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
+#. type: Content of: <div><p>
 msgid ""
-"Subject: GNU pun\n"
-"Date: Sun, 14 Mar 2004 23:55:07 -0500\n"
 "From: <a href=\"http://www.stallman.org/\";>Richard Stallman</a> <a "
-"href=\"mailto:rms@gnu.org\";>&lt;rms@gnu.org&gt;</a>\n"
+"href=\"mailto:rms@gnu.org\";>&lt;rms@gnu.org&gt;</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: GNU pun"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Date: Sun, 14 Mar 2004 23:55:07 -0500"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Someone found a way to generate audio output from the data that GCC is "
 "handling.  Using this to listen to the events leading up to an GNAT failure, "
 "he thought it reminded him of insects."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "So he asked a GNAT developer, &ldquo;Is this the sound of a swarm of "
 "gnats?&rdquo; The developer told him, &ldquo;No, that's the song of the sick "
 "Ada.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyrights on this joke."
+#. type: Content of: <div><div><p>
+msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -63,24 +79,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/gnu-overflow.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnu-overflow.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/gnu-overflow.pot       6 Jul 2020 13:59:55 -0000       1.9
+++ fun/jokes/po/gnu-overflow.pot       14 Jul 2021 16:30:55 -0000      1.10
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-overflow.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "GNU-Overflow - GNU Project - Free Software Foundation (FSF)"
+msgid "GNU-Overflow - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "GNU-Overflow"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The recursive acronym &ldquo;GNU's Not Unix&rdquo; harbors a stack overflow "
 "bug that can cause the English language to crash and may allow arbitrary "
@@ -36,7 +50,7 @@
 "error in the acronym he created over a decade ago."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Linguistic bugs are notoriously difficult to track down,&rdquo; "
 "Stallman told <code>segfault.org</code> via email.  &ldquo;The capacity of "
@@ -45,7 +59,7 @@
 "searching manually through coredumps to find the problem.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most people experience the stack overflow at around 600 expansions of the "
 "acronym.  In practice, few people have cause to carry the expansion this "
@@ -56,7 +70,7 @@
 "words, and create new figures of speech with arbitrary meanings."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many on the net saw the bug as a chance to reopen old holy wars.  &ldquo;The "
 "stack problems that are endemic in the computer industry today are a direct "
@@ -73,7 +87,7 @@
 "spertoj en la plej granda cina urbo, Sanhajo!&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "FUD Week magazine was quick to cash in on the incident, as well.  &ldquo;It "
 "is clear that freeware cannot be relied upon to keep the English language "
@@ -82,7 +96,7 @@
 "hippopotamus nap delta foley snurk tin possibility.&rdquo;"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Meanwhile, an anxious public waits for the restoration of the GNU acronym.  "
 "Until the bug is fixed, we urge you to download the temporary patch from "
@@ -91,26 +105,18 @@
 "to be reckoned with."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "Jake Berendes contributed to this report."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "<i>Jake Berendes contributed to this report.</i>"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -118,24 +124,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/gnu-overflow.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnu-overflow.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/gnu-overflow.ru.po     7 Jul 2020 09:59:53 -0000       1.4
+++ fun/jokes/po/gnu-overflow.ru.po     14 Jul 2021 16:30:55 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-overflow.html\n"
-"POT-Creation-Date: 2020-07-06 13:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2019-12-30 08:21+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,17 +15,41 @@
 "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 "GNU-Overflow - GNU Project - Free Software Foundation (FSF)"
+# | GNU-Overflow - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid "GNU-Overflow - GNU Project - Free Software Foundation (FSF)"
+msgid "GNU-Overflow - GNU Project - Free Software Foundation"
 msgstr ""
 "Переполнение ГНU - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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.
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Домашняя страница GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "GNU-Overflow"
 msgstr "Переполнение ГНU"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "The recursive acronym &ldquo;GNU's Not Unix&rdquo; harbors a stack overflow "
 "bug that can cause the English language to crash and may allow arbitrary "
@@ -46,7 +70,7 @@
 "исправление. Основатель проекта ГНU Р
ичард М. Столмен в настоящий момент "
 "отлавливает ошибку в сокращении, 
созданном им свыше десяти лет назад."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;Linguistic bugs are notoriously difficult to track down,&rdquo; "
 "Stallman told <code>segfault.org</code> via email.  &ldquo;The capacity of "
@@ -61,7 +85,7 @@
 "это значит, что для поиска проблемы прих
одится просматривать дампы памяти "
 "вручную&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Most people experience the stack overflow at around 600 expansions of the "
 "acronym.  In practice, few people have cause to carry the expansion this "
@@ -80,7 +104,7 @@
 "что позволят изменять синтаксис языка, 
переопределять слова и создавать "
 "новые фигуры речи с произвольными 
значениями."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Many on the net saw the bug as a chance to reopen old holy wars.  &ldquo;The "
 "stack problems that are endemic in the computer industry today are a direct "
@@ -111,7 +135,7 @@
 "aplikanto? Mi provos respondi al tiu demando lau personaj spertoj en la plej "
 "granda cina urbo, Sanhajo!&rdquo;"
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "FUD Week magazine was quick to cash in on the incident, as well.  &ldquo;It "
 "is clear that freeware cannot be relied upon to keep the English language "
@@ -126,7 +150,7 @@
 "навести у себя в голове порядок, прежде 
чем исследовать возможности дельта-"
 "озвучки гиппопотамского храпа жестяным 
лопатником&rdquo;."
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Meanwhile, an anxious public waits for the restoration of the GNU acronym.  "
 "Until the bug is fixed, we urge you to download the temporary patch from "
@@ -140,62 +164,75 @@
 "процесс непрерывного пересмотра 
превратил как свободные программы, так и "
 "человеческий язык в силы, с которыми 
принято считаться."
 
-#. type: Content of: <p>
-msgid "Jake Berendes contributed to this report."
+#. type: Content of: <div><p>
+# | [-Jake-]{+<i>Jake+} Berendes contributed to this [-report.-]
+# | {+report.</i>+}
+#, fuzzy
+#| msgid "Jake Berendes contributed to this report."
+msgid "<i>Jake Berendes contributed to this report.</i>"
 msgstr "Автор этого репортажа&nbsp;&mdash; Джейк 
Берендес"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
-
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr "Предупреждение"
 
-#. type: Content of: <p>
+#. 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.+}
+#, fuzzy
+#| 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 <a href=\"http://lists.gnu.";
-"org/\">email archives</a> of the GNU Project."
+"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 ""
 "Эта шутка извлечена из <a 
href=\"http://lists.gnu.org/\";>архивов почты</a> "
 "проекта GNU ФСПО."
 
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
-"шутку."
-
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"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."
+"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>."
 msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
+"Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a href=\"mailto:";
 "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
-
-#. type: Content of: <div><p>
+"\">другие способы связаться</a> с фондом. 
Отчеты о неработающих ссылках и "
+"другие поправки или предложения можно 
присылать по адресу <a href=\"mailto:";
+"webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+
+#.  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>. 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -219,3 +256,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не заявляет авторских прав на "
+#~ "эту шутку."

Index: fun/jokes/po/gnuemacs.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gnuemacs.pot,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- fun/jokes/po/gnuemacs.pot   16 Oct 2015 18:57:13 -0000      1.10
+++ fun/jokes/po/gnuemacs.pot   14 Jul 2021 16:30:55 -0000      1.11
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/gnuemacs.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/gnuemacs.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnuemacs.html\n"
-"POT-Creation-Date: 2015-10-16 18:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,79 +20,83 @@
 msgid "GNU Emacs Humor - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "GNU Emacs Humor"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "April Fool Mail - emacs rewrite"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"<i>The following is an April fool mail received from RMS.  It wasn't "
-"actually sent by him, but he found it funny.</i>"
+"The following is an April fool mail received from RMS.  It wasn't actually "
+"sent by him, but he found it funny."
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: Richard Stallman\n"
-"Date: Sat, 01 Apr 2006 15:53:20 -0500\n"
-"Subject: emacs rewrite\n"
+#. type: Content of: <div><p>
+msgid "From: Richard Stallman"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "After more than 30 years I think it's time to rewrite emacs from 
scratch."
+#. type: Content of: <div><p>
+msgid "Subject: emacs rewrite"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "I would be happy to hear your suggestions about the best language to 
use."
+#. type: Content of: <div><p>
+msgid "Date: Sat, 01 Apr 2006 15:53:20 -0500"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
-"At the moment I think that Perl would be the best fit, because of its "
-"acronym:"
+"After more than 30 years I think it's time to rewrite emacs from scratch. I "
+"would be happy to hear your suggestions about the best language to use. At "
+"the moment I think that Perl would be the best fit, because of its acronym:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Perfect emacs rewriting language."
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h3>
 msgid "Reply from RMS"
 msgstr ""
 
-#. type: Content of: <blockquote><pre>
-#, no-wrap
-msgid ""
-"From: Richard Stallman\n"
-"Date: Sun, 02 Apr 2006 21:08:17 -0400\n"
-"Subject: Re: emacs rewrite\n"
+#. type: Content of: <div><p>
+msgid "Date: Sun, 02 Apr 2006 21:08:17 -0400"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Re: emacs rewrite"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "Someone wrote an April Fool and put my name on it."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid "It was funny."
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
-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 and "
-"submitted by Ramprasad B."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation does not claim copyright for this joke."
+#. type: Content of: <div><div><p>
+msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -119,7 +123,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>. 
@@ -127,7 +131,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/gullibility.virus.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/gullibility.virus.pot,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- fun/jokes/po/gullibility.virus.pot  4 Jun 2019 06:59:50 -0000       1.8
+++ fun/jokes/po/gullibility.virus.pot  14 Jul 2021 16:30:55 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gullibility.virus.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "The Gullibility Virus - GNU Project - Free Software Foundation (FSF)"
+msgid "The Gullibility Virus - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Computing\">Computing</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Gullibility Virus"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><address>
+msgid "by Scott D. Webster"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "WASHINGTON, D.C.&mdash;The Institute for the Investigation of Irregular "
 "Internet Phenomena announced today that many Internet users are becoming "
@@ -36,7 +54,7 @@
 "[perhaps conspiracy theories should be included here]."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;These are not just readers of tabloids or people who buy lottery "
 "tickets based on fortune cookie numbers,&rdquo; a spokesman said.  "
@@ -46,7 +64,7 @@
 "anything they read on the Internet."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "&ldquo;My immunity to tall tales and bizarre claims is all gone,&rdquo; "
 "reported one weeping victim.  &ldquo;I believe every warning message and "
@@ -54,7 +72,7 @@
 "are anonymous.&rdquo;"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Another victim, now in remission, added, &ldquo;When I first heard about "
 "&lsquo;Good Times,&rsquo; I just accepted it without question.  After all, "
@@ -65,30 +83,30 @@
 "&ldquo;Challenge and check whatever you read,&rdquo; she says."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "Internet users are urged to examine themselves for symptoms of the virus, "
 "which include the following:"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "the willingness to believe improbable stories without thinking"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "the urge to forward multiple copies of such stories to others"
 msgstr ""
 
-#. type: Content of: <blockquote><ul><li>
+#. type: Content of: <div><ul><li>
 msgid "a lack of desire to take three minutes to check to see if a story is 
true"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><p>
 msgid ""
 "T. C. is an example of someone recently infected.  He told one reporter, "
 "&ldquo;I read on the Net that the major ingredient in almost all shampoos "
 "makes your hair fall out, so I've stopped using shampoo.&rdquo; When told "
-"about the Gullibility Virus, T . C. said he would stop reading e-mail, so "
+"about the Gullibility Virus, T. C. said he would stop reading e-mail, so "
 "that he would not become infected.  Anyone with symptoms like these is urged "
 "to seek help immediately.  Experts recommend that at the first feelings of "
 "gullibility, Internet users rush to their favorite search engine and look up "
@@ -96,36 +114,16 @@
 "tall tales have been widely discussed and exposed by the Internet community."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid "&mdash;"
-msgstr ""
-
-#. type: Content of: <blockquote><p>
-msgid "Scott D. Webster"
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a "
-"href=\"/fun/jokes/gullibility.virus.txt\">plain text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/gullibility.virus.txt\">Plain text version</a>"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"This text has been circulating on the Internet since 1998 with various "
+"additions (here is <a "
+"href=\"https://web.archive.org/web/19980221224048/http://www.cs.rutgers.edu/~watrous/gullibility-virus.html\";>
 "
+"one version</a> among others)."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -133,24 +131,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/happy-new-year.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/happy-new-year.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/happy-new-year.pot     4 Jun 2019 06:59:50 -0000       1.7
+++ fun/jokes/po/happy-new-year.pot     14 Jul 2021 16:30:55 -0000      1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: happy-new-year.html\n"
-"POT-Creation-Date: 2019-06-04 06:56+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,28 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Happy New Year - GNU Project - Free Software Foundation"
+msgid "Happy New Year in four languages - GNU Project - Free Software 
Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Happy New Year in 4 languages"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Happy New Year in four languages"
+msgstr ""
+
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "cat /*dev/null; echo \"Happy New Year\"\\!\n"
@@ -41,28 +55,18 @@
 "c*/\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"This joke is also available in <a "
-"href=\"/fun/jokes/happy-new-year.txt\">plain text</a>."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/happy-new-year.txt\">Plain text version</a>"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -89,7 +93,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>. 
@@ -97,7 +101,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/helloworld.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/helloworld.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/helloworld.pot 16 Sep 2012 05:21:48 -0000      1.7
+++ fun/jokes/po/helloworld.pot 14 Jul 2021 16:30:55 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/helloworld.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/helloworld.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,45 +7,63 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: helloworld.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Hello World! - GNU Project - Free Software Foundation (FSF)"
+msgid "Hello World! - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Hello World!"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Dennis Lou and others"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "How the way people code &ldquo;Hello World&rdquo; varies depending on their "
 "age and job:"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "High School/Jr. High"
 msgstr ""
 
-#. type: Content of: <pre>
-#:  
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " 10 PRINT \"HELLO WORLD\"\n"
 " 20 END\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "First year in College"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " program Hello(input, output)\n"
@@ -54,11 +72,11 @@
 " end.\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Senior year in College"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " (defun hello\n"
@@ -66,11 +84,11 @@
 " (cons 'Hello (list 'World))))\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "New professional"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -85,11 +103,11 @@
 " }\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Seasoned professional"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;iostream.h&gt;\n"
@@ -139,11 +157,11 @@
 " }\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "System Administrator"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -163,11 +181,11 @@
 " }\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Apprentice Hacker"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #!/usr/local/bin/perl\n"
@@ -185,11 +203,11 @@
 " 1;\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Experienced Hacker"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -198,11 +216,11 @@
 " main(){exit(printf(S) == strlen(S) ? 0 : 1);}\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Seasoned Hacker"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % cc -o a.out ~/src/misc/hw/hw.c\n"
@@ -210,26 +228,26 @@
 " Hello, world.\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Guru Hacker"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % cat\n"
 " Hello, world.\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "New Manager (do you remember?)"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Middle Manager"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " mail -s \"Hello, world.\" bob@b12\n"
@@ -238,22 +256,22 @@
 " ^D\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Senior Manager"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % zmail jim\n"
 " I need a \"Hello, world.\" program by this afternoon.\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Chief Executive"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % letter\n"
@@ -267,47 +285,37 @@
 " % logout\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Research Scientist"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
-"\tPROGRAM HELLO\n"
-"\tPRINT *, 'Hello World'\n"
-"\tEND\n"
+"    PROGRAM HELLO\n"
+"    PRINT *, 'Hello World'\n"
+"    END\n"
 msgstr ""
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Older research Scientist"
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
-"\tWRITE (6, 100)\n"
+"    WRITE (6, 100)\n"
 "    100 FORMAT (1H ,11HHELLO WORLD)\n"
-"\tCALL EXIT\n"
-"\tEND\n"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+"    CALL EXIT\n"
+"    END\n"
 msgstr ""
 
-#. type: Content of: <h4>
-msgid "Disclaimer"
-msgstr ""
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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)."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -315,24 +323,35 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
+"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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <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>."
 msgstr ""
 
-#. type: Content of: <div><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>. 
+#. type: Content of: <div><div><p>
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/helloworld.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/helloworld.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- fun/jokes/po/helloworld.ru.po       24 Sep 2015 06:35:51 -0000      1.2
+++ fun/jokes/po/helloworld.ru.po       14 Jul 2021 16:30:55 -0000      1.3
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: helloworld.html\n"
-"POT-Creation-Date: 2012-06-10 04:26-0300\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: 2015-09-23 17:34+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,17 +15,45 @@
 "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 "Hello World! - GNU Project - Free Software Foundation (FSF)"
+# | Hello World! - GNU Project - Free Software Foundation [-(FSF)-]
+#, fuzzy
+#| msgid "Hello World! - GNU Project - Free Software Foundation (FSF)"
+msgid "Hello World! - GNU Project - Free Software Foundation"
 msgstr ""
 "Здравствуй, мир! - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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.
+#, fuzzy
+#| msgid "GNU Home"
+msgid "GNU Home"
+msgstr "Домашняя страница GNU"
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Hello World!"
 msgstr "Здравствуй, мир!"
 
-#. type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by Dennis Lou and others"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "How the way people code &ldquo;Hello World&rdquo; varies depending on their "
 "age and job:"
@@ -33,11 +61,11 @@
 "Люди пишут программу &ldquo;Здравствуй, 
мир&rdquo; по-разному в зависимости "
 "от их возраста и должности:"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "High School/Jr. High"
 msgstr "Старшеклассники"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " 10 PRINT \"HELLO WORLD\"\n"
@@ -46,11 +74,11 @@
 " 10 PRINT \"ЗДРАВСТВУЙ МИР\"\n"
 " 20 END\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "First year in College"
 msgstr "Первый курс техникума"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " program Hello(input, output)\n"
@@ -63,11 +91,11 @@
 " writeln('Здравствуй, мир!')\n"
 " end.\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Senior year in College"
 msgstr "Старший курс техникума"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " (defun hello\n"
@@ -78,11 +106,11 @@
 " (print\n"
 " (cons 'Здравствуй (list 'мир))))\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "New professional"
 msgstr "Молодой специалист"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -107,11 +135,11 @@
 "  printf(\"\\n\");\n"
 " }\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Seasoned professional"
 msgstr "Специалист со стажем"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;iostream.h&gt;\n"
@@ -204,11 +232,11 @@
 "   return(0);\n"
 " }\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "System Administrator"
 msgstr "Системный администратор"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -243,11 +271,11 @@
 "  printf(\"%s\\n\",tmp);\n"
 " }\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Apprentice Hacker"
 msgstr "Начинающий хакер"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #!/usr/local/bin/perl\n"
@@ -278,11 +306,11 @@
 " }\n"
 " 1;\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Experienced Hacker"
 msgstr "Опытный хакер"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " #include &lt;stdio.h&gt;\n"
@@ -295,11 +323,11 @@
 " #define S \"Здравствуй, мир\\n\"\n"
 " main(){exit(printf(S) == strlen(S) ? 0 : 1);}\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Seasoned Hacker"
 msgstr "Хакер со стажем"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % cc -o a.out ~/src/misc/hw/hw.c\n"
@@ -310,11 +338,11 @@
 " % ./a.out\n"
 " Здравствуй, мир.\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Guru Hacker"
 msgstr "Хакер-гуру"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % cat\n"
@@ -323,15 +351,15 @@
 " % cat\n"
 " Здравствуй, мир.\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "New Manager (do you remember?)"
 msgstr "Новый начальник (помните?)"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Middle Manager"
 msgstr "Руководитель среднего подразделения"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " mail -s \"Hello, world.\" bob@b12\n"
@@ -344,11 +372,11 @@
 " Мне ее нужно сделать до завтра.\n"
 " ^D\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Senior Manager"
 msgstr "Руководитель крупного подразделения"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % zmail jim\n"
@@ -357,11 +385,11 @@
 " % zmail leha\n"
 " Мне к обеду нужна программа \"Здравствуй, 
мир.\".\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Chief Executive"
 msgstr "Директор"
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 " % letter\n"
@@ -384,60 +412,57 @@
 " !: событие не опознано\n"
 " % logout\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Research Scientist"
 msgstr "Научный работник"
 
-#. type: Content of: <pre>
-#, no-wrap
-msgid ""
-"\tPROGRAM HELLO\n"
-"\tPRINT *, 'Hello World'\n"
-"\tEND\n"
+#. type: Content of: <div><pre>
+# | [-\tPROGRAM HELLO\\n\tPRINT-]    {+PROGRAM HELLO\\n    PRINT+} *, 'Hello
+# | [-World'\\n\tEND\\n-] {+World'\\n    END\\n+}
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\tPROGRAM HELLO\n"
+#| "\tPRINT *, 'Hello World'\n"
+#| "\tEND\n"
+msgid ""
+"    PROGRAM HELLO\n"
+"    PRINT *, 'Hello World'\n"
+"    END\n"
 msgstr ""
 "\tPROGRAM HELLO\n"
 "\tPRINT *, 'Здравствуй, мир'\n"
 "\tEND\n"
 
-#. type: Content of: <h4>
+#. type: Content of: <div><h4>
 msgid "Older research Scientist"
 msgstr "Старый научный работник"
 
-#. type: Content of: <pre>
-#, no-wrap
+#. 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+}
+#, fuzzy, no-wrap
+#| msgid ""
+#| "\tWRITE (6, 100)\n"
+#| "    100 FORMAT (1H ,11HHELLO WORLD)\n"
+#| "\tCALL EXIT\n"
+#| "\tEND\n"
 msgid ""
-"\tWRITE (6, 100)\n"
+"    WRITE (6, 100)\n"
 "    100 FORMAT (1H ,11HHELLO WORLD)\n"
-"\tCALL EXIT\n"
-"\tEND\n"
+"    CALL EXIT\n"
+"    END\n"
 msgstr ""
 "\tWRITE (6, 100)\n"
 "    100 FORMAT (1H ,26HЗДРАВСТВУЙ МИР)\n"
 "\tCALL EXIT\n"
 "\tEND\n"
 
-#. type: Content of: <p>
-msgid ""
-"<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
-
-#. type: Content of: <h4>
-msgid "Disclaimer"
-msgstr "Уведомление"
-
-#. type: Content of: <p>
+#. type: Content of: <div><div><p>
 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."
+"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)."
 msgstr ""
-"Шутка на этой странице получена из <a 
href=\"http://lists.gnu.org/\";>архивов "
-"электронной почты</a> проекта GNU ФСПО."
-
-#. type: Content of: <p>
-msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
-"Фонд свободного программного обеспечения 
не претендует на авторские права на "
-"эту шутку."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -445,29 +470,41 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
-"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."
+"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>."
 msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
+"Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a href=\"mailto:";
 "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
-
-#. type: Content of: <div><p>
+"\">другие способы связаться</a> с фондом. 
Отчеты о неработающих ссылках и "
+"другие поправки или предложения можно 
присылать по адресу <a href=\"mailto:";
+"webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+
+#.  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>. 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| 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 submitting "
+"\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
 "Мы старались сделать этот перевод точным 
и качественным, но исключить "
@@ -487,3 +524,22 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Обновлено:"
+
+#~ msgid ""
+#~ "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
+#~ msgstr "<a href=\"/fun/humor.html\">Другой юмор</a> из 
коллекции GNU."
+
+#~ msgid "Disclaimer"
+#~ msgstr "Уведомление"
+
+#~ 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."
+#~ msgstr ""
+#~ "Шутка на этой странице получена из <a 
href=\"http://lists.gnu.org/";
+#~ "\">архивов электронной почты</a> проекта GNU 
ФСПО."
+
+#~ msgid "The Free Software Foundation claims no copyright on this joke."
+#~ msgstr ""
+#~ "Фонд свободного программного 
обеспечения не претендует на авторские 
права "
+#~ "на эту шутку."

Index: fun/jokes/po/long-options.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/long-options.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fun/jokes/po/long-options.pot       21 Aug 2015 00:58:33 -0000      1.7
+++ fun/jokes/po/long-options.pot       14 Jul 2021 16:30:55 -0000      1.8
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/long-options.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/long-options.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: long-options.html\n"
-"POT-Creation-Date: 2015-08-21 00:55+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,34 +20,62 @@
 msgid "Long options? - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
+msgstr ""
+
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
 msgid "Long options?"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "From: aronsson@lysator.liu.se To: long-option-poll@gnu.ai.mit.edu"
+#. type: Content of: <div><p>
+msgid "From: Lars Aronsson"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid "Subject: Re: New poll. PRO MINUS MINUS. ANTI MINUS EQUALS."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
+msgid "Date: Tue, 19 Nov 91 01:54:30 +0100"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid "In gnu.announce R M Stallman wrote:"
 msgstr ""
 
-#. type: Content of: <blockquote><p>
-msgid ""
-"`--' as a prefix, `-=' as a prefix, * How easy is it to type each of these "
-"alternatives."
+#. type: Content of: <div><blockquote><p>
+msgid "<kbd>`--'</kbd> as a prefix,"
+msgstr ""
+
+#. type: Content of: <div><blockquote><p>
+msgid "<kbd>`-='</kbd> as a prefix,"
+msgstr ""
+
+#. type: Content of: <div><blockquote><p>
+msgid "* How easy is it to type each of these alternatives."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"In the beginning was the Unix and the Unix spoke and said \"Hello "
-"world\\n\". Not did it say \"Hello New Jersey\\n\", nor \"Hello "
-"USA\\n\". But it said \"Hello world\\n\". For the joy of good computing is "
-"not for USAmericans alone, but for the whole world to share. And the Unix "
-"saw that this was good."
+"In the beginning was the Unix and the Unix spoke and said &ldquo;Hello "
+"world\\n.&rdquo; Not did it say &ldquo;Hello New Jersey\\n,&rdquo; nor "
+"&ldquo;Hello USA\\n.&rdquo; But it said &ldquo;Hello world\\n.&rdquo; For "
+"the joy of good computing is not for USAmericans alone, but for the whole "
+"world to share. And the Unix saw that this was good."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "And so says the holy manual, that a USAmerican keyboard layout has minus and "
 "equals, both unshifted, on two keys next to each other. But the book of "
@@ -58,49 +86,44 @@
 "shifted digit zero."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Thus, teaches us the gospel, the sequence \"-=\" as a prefix for long "
-"options would be very hard for Swedish computer users (and many others world "
-"wide) to type."
+"Thus, teaches us the gospel, the sequence &ldquo;<kbd>-=</kbd>&rdquo; as a "
+"prefix for long options would be very hard for Swedish computer users (and "
+"many others world wide) to type."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid "* How error-prone are they."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid "Dunno."
 msgstr ""
 
-#. type: Content of: <blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid "* How esthetically clean are they."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
-"Of course, the \"long minus\" (\"--\") is an ideal prefix for \"long "
-"options\". I congratulate the inventor of this idea and hope it wins.  -- "
-"Lars Aronsson, Lysator computer club, Linkoping University, Sweden "
-"Aronsson@Lysator.LiU.SE Voice phone at home +46-13-17 2143"
+"Of course, the &ldquo;long minus&rdquo; (&ldquo;<kbd>--</kbd>&rdquo;) is an "
+"ideal prefix for &ldquo;long options.&ldquo; I congratulate the inventor of "
+"this idea and hope it wins."
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
+#. type: Content of: <div><p>
+msgid "<a href=\"/fun/jokes/long-options.txt\">Original email</a>"
 msgstr ""
 
-#. type: Content of: <div><h4>
+#. type: Content of: <div><div><h3>
 msgid "Disclaimer"
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"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 ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -127,7 +150,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>. 
@@ -135,7 +158,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: fun/jokes/po/merry-xmas.pot
===================================================================
RCS file: /web/www/www/fun/jokes/po/merry-xmas.pot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/po/merry-xmas.pot 21 Aug 2015 01:27:30 -0000      1.9
+++ fun/jokes/po/merry-xmas.pot 14 Jul 2021 16:30:55 -0000      1.10
@@ -1,4 +1,4 @@
-# LANGUAGE translation of http://www.gnu.org/fun/jokes/merry-xmas.html
+# LANGUAGE translation of https://www.gnu.org/fun/jokes/merry-xmas.html
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: merry-xmas.html\n"
-"POT-Creation-Date: 2015-08-21 01:25+0000\n"
+"POT-Creation-Date: 2021-07-14 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,21 +17,39 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "Merry Christmas - GNU Project - Free Software Foundation"
+msgid "Merry Christmas in four languages - GNU Project - Free Software 
Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
-msgid "Merry Christmas in 4 languages"
+#. type: Content of: <div><a>
+msgid "<a href=\"/\">"
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Attribute 'title' of: <div><a><img>
+msgid "GNU Home"
+msgstr ""
+
+#. type: Content of: <div>
+msgid ""
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a "
+"href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
+msgstr ""
+
+#. type: Content of: <div><h2>
+msgid "Merry Christmas in four languages"
+msgstr ""
+
+#. type: Content of: <div><address>
+msgid "From Niksa Orlic"
+msgstr ""
+
+#. type: Content of: <div><p>
 msgid ""
 "The following is in C, Pascal, FORTRAN, and PHP.  You might also be "
-"interested in <a href=\"/fun/jokes/happy-new-year.html\">Happy New Year in 4 "
-"languages</a>"
+"interested in <a href=\"/fun/jokes/happy-new-year.html\">Happy New Year in "
+"four languages</a>."
 msgstr ""
 
-#. type: Content of: <pre>
+#. type: Content of: <div><pre>
 #, no-wrap
 msgid ""
 "const a = '\\''; void b()/*'; var b:string;{\n"
@@ -50,22 +68,10 @@
 "cbuf[18] = '\\n'; cbuf[19] = '\\0'; printf(cbuf+3); return 0; }\n"
 msgstr ""
 
-#. type: Content of: <p>
-msgid "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor 
Collection."
-msgstr ""
-
-#. type: Content of: <div><h4>
-msgid "Disclaimer"
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid "The Free Software Foundation claims no copyright on this joke."
+"The joke on this page was submitted to the GNU Project by Niksa Orlic in "
+"2003."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -92,7 +98,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>. 
@@ -100,7 +106,8 @@
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"for information on coordinating and contributing translations of this "
+"article."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.

Index: server/gnun/compendia/compendium.af.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.af.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/gnun/compendia/compendium.af.po      11 Jul 2021 17:30:35 -0000      
1.123
+++ server/gnun/compendia/compendium.af.po      14 Jul 2021 16:30:56 -0000      
1.124
@@ -201,39 +201,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-msgid ""
-"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."
-msgstr ""
-"Stuur vrae oor die FSF &amp; GNU (in engels!) na <a href=\"mailto:gnu@gnu.org";
-"\"><em>gnu@gnu.org</em></a>. Ander <a href=\"/home.html#ContactInfo"
-"\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels en "
-"ander regstellings (of voorstelle) aan <a href=\"mailto:web-translators@gnu.";
-"org\"><em>web-translators@gnu.org</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Stuur vrae oor die FSF &amp; GNU (in engels!) na <a href=\"mailto:gnu@gnu.org";
-"\"><em>gnu@gnu.org</em></a>. Ander <a href=\"/home.html#ContactInfo"
-"\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels en "
-"ander regstellings (of voorstelle) aan <a href=\"mailto:web-translators@gnu.";
-"org\"><em>web-translators@gnu.org</em></a>."
-
 #. type: Content of: <h3>
 msgid "Footnotes"
 msgstr ""
@@ -437,6 +410,31 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Stuur vrae oor die FSF &amp; GNU (in engels!) na <a href=\"mailto:gnu@gnu.";
+#~ "org\"><em>gnu@gnu.org</em></a>. Ander <a href=\"/home.html#ContactInfo"
+#~ "\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels "
+#~ "en ander regstellings (of voorstelle) aan <a href=\"mailto:web-";
+#~ "translators@gnu.org\"><em>web-translators@gnu.org</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Stuur vrae oor die FSF &amp; GNU (in engels!) na <a href=\"mailto:gnu@gnu.";
+#~ "org\"><em>gnu@gnu.org</em></a>. Ander <a href=\"/home.html#ContactInfo"
+#~ "\">maniere om kontak te maak</a> met die FSF.<br /> Stuur gebroke skakels "
+#~ "en ander regstellings (of voorstelle) aan <a href=\"mailto:web-";
+#~ "translators@gnu.org\"><em>web-translators@gnu.org</em></a>."
+
 # type: Content of: <body><div><div><div><ul><li>
 #, fuzzy
 #~| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.ar.po      11 Jul 2021 17:30:35 -0000      
1.128
+++ server/gnun/compendia/compendium.ar.po      14 Jul 2021 16:30:56 -0000      
1.129
@@ -197,40 +197,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-#| "\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
-#| "ways to contact</a> the FSF."
-msgid ""
-"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."
-msgstr ""
-"يرجى إرسال الاستفسارات المتعلقة بالـ FSF 
وGNU إلى <a href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>. هناك أيضاً طرق أخرى 
للاتصال <a href=\"/contact/"
-"\"><span xml:lang=\"en\" lang=\"en\"> </span> بمؤسسة البرمجيات 
الحرة</a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 #, fuzzy
 #| msgid ""
-#| "Please send broken links and other corrections or suggestions to <a href="
-#| "\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
-"webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;\\ <a href=\"/education/education.html\">تعليم</a>&nbsp;\\ <a 
href="
+"\"/education/edu-resources.html\">مصادر التعليم</a>&nbsp;\\"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -469,6 +446,34 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
+#~| "\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "يرجى إرسال الاستفسارات المتعلقة بالـ FSF 
وGNU إلى <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. هناك أيضاً طرق أخرى 
للاتصال <a href="
+#~ "\"/contact/\"><span xml:lang=\"en\" lang=\"en\"> </span> بمؤسسة 
البرمجيات "
+#~ "الحرة</a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send broken links and other corrections or suggestions to <a href="
+#~| "\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "يرجى إرسال الوصلات المنقطعة وأي تصحيحات 
أو اقتراحات إلى <a href=\"mailto:";
+#~ "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "بقلم <strong> ريتشارد ستولمن </strong>"
 

Index: server/gnun/compendia/compendium.bg.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.bg.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.bg.po      11 Jul 2021 17:30:35 -0000      
1.129
+++ server/gnun/compendia/compendium.bg.po      14 Jul 2021 16:30:56 -0000      
1.130
@@ -208,42 +208,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-#| "\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
-#| "ways to contact</a> the FSF."
-msgid ""
-"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."
-msgstr ""
-"Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
-"gnu@gnu.org\"><em>gnu@gnu.org</em></a>.  Има и други начини 
за <a href=\"/"
-"contact/\">връзка</a> с ФСС."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send broken links and other corrections or suggestions to <a href="
-#| "\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Моля, изпращайте доклади за счупени х
ипервръзки и други корекции или "
-"предложения на е-поща: <a href=\"mailto:webmasters@gnu.org";
-"\"><em>webmasters@gnu.org</em></a>."
-
 #. type: Content of: <h3>
 msgid "Footnotes"
 msgstr "Бележки"
@@ -457,6 +427,34 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
+#~| "\"><em>gnu@gnu.org</em></a>.  There are also <a href=\"/contact/\">other "
+#~| "ways to contact</a> the FSF."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Моля, отправяйте въпроси относно ФСС и GNU 
по е-поща: <a href=\"mailto:";
+#~ "gnu@gnu.org\"><em>gnu@gnu.org</em></a>.  Има и други начини 
за <a href=\"/"
+#~ "contact/\">връзка</a> с ФСС."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send broken links and other corrections or suggestions to <a href="
+#~| "\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</em></a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Моля, изпращайте доклади за счупени х
ипервръзки и други корекции или "
+#~ "предложения на е-поща: <a 
href=\"mailto:webmasters@gnu.org";
+#~ "\"><em>webmasters@gnu.org</em></a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "от <strong>Ричард Столман</strong>"
 

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.ca.po      11 Jul 2021 17:30:35 -0000      
1.131
+++ server/gnun/compendia/compendium.ca.po      14 Jul 2021 16:30:56 -0000      
1.132
@@ -208,33 +208,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "La Free Software Foundation no té el copyright d'aquest acudit."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Els acudits d'aquesta pàgina s'han extret dels <a href=\"http://lists.gnu.";
-"org/\">arxius de correu electrònic</a> de la FSF i el Projecte GNU."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Envieu les vostres preguntes sobre la FSF i GNU a <a href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>. També hi ha <a href=\"/contact/contact.html"
-"\">altres formes de contactar</a> amb la FSF. "
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a 
href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Educació</a>&nbsp;/ <a "
+"href=\"/education/education.html#indepth\">A fons</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -504,6 +488,31 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Els acudits d'aquesta pàgina s'han extret dels <a 
href=\"http://lists.gnu.";
+#~ "org/\">arxius de correu electrònic</a> de la FSF i el Projecte GNU."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Envieu les vostres preguntes sobre la FSF i GNU a <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. També hi ha <a href=\"/contact/"
+#~ "contact.html\">altres formes de contactar</a> amb la FSF. "
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Envieu els enllaços trencats i d'altres correccions o suggeriments a <a "
+#~ "href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "per <strong>Richard Stallman</strong>"

Index: server/gnun/compendia/compendium.cs.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.cs.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/gnun/compendia/compendium.cs.po      11 Jul 2021 17:30:35 -0000      
1.127
+++ server/gnun/compendia/compendium.cs.po      14 Jul 2021 16:30:56 -0000      
1.128
@@ -206,33 +206,17 @@
 "Nadace pro svobodný software si nenárokuje žádná autorská práva na 
tento "
 "vtip."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Vtip na této stránce pochází z <a 
href=\"http://lists.gnu.org/\";>e-mailových "
-"archivů</a> FSF Projektu GNU."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Dotazy ohledně FSF a GNU prosím posílejte na <a href=\"mailto:gnu@gnu.org";
-"\">&lt;gnu@gnu.org&gt;</a>.  Jsou tu i <a href=\"/contact/\">další 
možnosti "
-"jak kontaktovat</a> nadaci FSF. "
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Ohledně nefunkčních odkazů, jiných oprav a návrhů se prosím obracejte 
na <a "
-"href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Vzdělávání</a>&nbsp;/ 
<a "
+"href=\"/education/education.html#indepth\">Podrobně</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -452,6 +436,31 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Vtip na této stránce pochází z <a href=\"http://lists.gnu.org/\";>e-"
+#~ "mailových archivů</a> FSF Projektu GNU."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Dotazy ohledně FSF a GNU prosím posílejte na <a 
href=\"mailto:gnu@gnu.org";
+#~ "\">&lt;gnu@gnu.org&gt;</a>.  Jsou tu i <a href=\"/contact/\">další "
+#~ "možnosti jak kontaktovat</a> nadaci FSF. "
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Ohledně nefunkčních odkazů, jiných oprav a návrhů se prosím 
obracejte na "
+#~ "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "napsal <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.da.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.da.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/gnun/compendia/compendium.da.po      11 Jul 2021 17:30:35 -0000      
1.67
+++ server/gnun/compendia/compendium.da.po      14 Jul 2021 16:30:56 -0000      
1.68
@@ -174,35 +174,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Send venligst FSF &amp; GNU henvendelser &amp; spørgsmål til <a href="
-"\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&lt;</a>. Der er også <a href=\"/"
-"contact/\">andre måder at kontakte</a> FSF.  Kommentarer til disse websider "
-"kan sendes til <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
-"org&lt;</a>."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>
@@ -399,6 +374,24 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Send venligst FSF &amp; GNU henvendelser &amp; spørgsmål til <a href="
+#~ "\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&lt;</a>. Der er også <a href=\"/"
+#~ "contact/\">andre måder at kontakte</a> FSF.  Kommentarer til disse "
+#~ "websider kan sendes til <a href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&lt;</a>."
+
 #~ msgid "Introduction"
 #~ msgstr "Introduktion"
 

Index: server/gnun/compendia/compendium.de.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.de.po,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- server/gnun/compendia/compendium.de.po      11 Jul 2021 17:30:35 -0000      
1.177
+++ server/gnun/compendia/compendium.de.po      14 Jul 2021 16:30:56 -0000      
1.178
@@ -198,31 +198,17 @@
 msgstr ""
 "Die Free Software Foundation erhebt keine Urheberrechte an diesem Witz."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Der Witz wurde den <a href=\"//lists.gnu.org/\">E-Mail-Archiven</a> des GNU-"
-"Projekts der FSF entnommen."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Bitte senden Sie Fragen zur FSF &amp; GNU an <a href=\"mailto:gnu@gnu.org";
-"\">&lt;gnu@gnu.org&gt;</a>. Sie können auch die <a href=\"/contact/\"><span "
-"xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> kontaktieren</a>."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Bitte senden Sie ungültige Verweise und andere Korrekturen oder Vorschläge "
-"an <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/\">Bildung</a>&nbsp;/ <a href=\"/education/"
+"edu-resources\">Ressourcen</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -484,6 +470,31 @@
 msgid "Donald Craig"
 msgstr "Donald Craig"
 
+#~ 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."
+#~ msgstr ""
+#~ "Der Witz wurde den <a href=\"//lists.gnu.org/\">E-Mail-Archiven</a> des "
+#~ "GNU-Projekts der FSF entnommen."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Bitte senden Sie Fragen zur FSF &amp; GNU an <a href=\"mailto:gnu@gnu.org";
+#~ "\">&lt;gnu@gnu.org&gt;</a>. Sie können auch die <a href=\"/contact/"
+#~ "\"><span xml:lang=\"en\" lang=\"en\">Free Software Foundation</span> "
+#~ "kontaktieren</a>."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Bitte senden Sie ungültige Verweise und andere Korrekturen oder "
+#~ "Vorschläge an <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
+#~ "org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "von <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.el.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.el.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.el.po      11 Jul 2021 17:30:35 -0000      
1.133
+++ server/gnun/compendia/compendium.el.po      14 Jul 2021 16:30:56 -0000      
1.134
@@ -199,31 +199,17 @@
 "Το Ίδρυμα Ελεύθερου Λογισμικού δεν ισχυ
ρίζεται πνευματικά δικαιώματα σε αυτό "
 "το αστείο."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Το αστείο σε αυτή τη σελίδα λήφθηκε από 
τις τηρούμενες στο ΙΕΛ <a href="
-"\"http://lists.gnu.org/\";>αρχειοθήκες η-ταχυδρομείου
</a> του Έργου GNU."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Παρακαλούμε στείλτε ερωτήσεις για τα ΙΕΛ 
&amp; GNU στο <a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Υπάρχουν επίσης <a 
href=\"/contact/"
-"\">άλλοι τρόποι για να επικοινωνήσετε</a> με 
το ΙΕΛ."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Παρακαλούμε στείλτε ανενεργούς συνδέσμου
ς και άλλες διορθώσεις ή προτάσεις "
-"στο <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Εκπαίδευ
ση</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Πόροι</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -451,6 +437,30 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Το αστείο σε αυτή τη σελίδα λήφθηκε από 
τις τηρούμενες στο ΙΕΛ <a href="
+#~ "\"http://lists.gnu.org/\";>αρχειοθήκες η-ταχυ
δρομείου</a> του Έργου GNU."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Παρακαλούμε στείλτε ερωτήσεις για τα 
ΙΕΛ &amp; GNU στο <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Υπάρχουν επίσης <a 
href=\"/"
+#~ "contact/\">άλλοι τρόποι για να 
επικοινωνήσετε</a> με το ΙΕΛ."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Παρακαλούμε στείλτε ανενεργούς συ
νδέσμους και άλλες διορθώσεις ή "
+#~ "προτάσεις στο <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
+#~ "org&gt;</a>."
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "από τον <strong>Richard Stallman</strong>"

Index: server/gnun/compendia/compendium.eo.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.eo.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/gnun/compendia/compendium.eo.po      11 Jul 2021 17:30:35 -0000      
1.13
+++ server/gnun/compendia/compendium.eo.po      14 Jul 2021 16:30:56 -0000      
1.14
@@ -183,31 +183,11 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you wish to help us maintain this page, please contact <a href="
-#| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Se vi ŝatus helpi nin teni tiun ĉi paĝon ĝisdatigita, bonvolu kontakti <a 
"
-"href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -394,3 +374,16 @@
 #. type: Content of: <ul><li>
 msgid "Donald Craig"
 msgstr ""
+
+#
+#, fuzzy
+#~| msgid ""
+#~| "If you wish to help us maintain this page, please contact <a href="
+#~| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Se vi ŝatus helpi nin teni tiun ĉi paĝon ĝisdatigita, bonvolu kontakti 
<a "
+#~ "href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
+#~ "a>."

Index: server/gnun/compendia/compendium.es.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.es.po,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- server/gnun/compendia/compendium.es.po      11 Jul 2021 17:30:35 -0000      
1.136
+++ server/gnun/compendia/compendium.es.po      14 Jul 2021 16:30:56 -0000      
1.137
@@ -203,34 +203,17 @@
 "La Free Software Foundation no es titular de los derechos de autor de este "
 "chiste."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"El chiste que se publica en esta página se obtuvo de los <a href=\"http://";
-"lists.gnu.org/\">archivos de correos</a>del Proyecto GNU que conserva la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Envíe sus consultas sobre la FSF  y GNU a <a 
href=\"mailto:gnu@gnu.org\";>&lt;"
-"gnu@gnu.org&gt;</a>. Existen también <a href=\"/contact/\">otros medios para 
"
-"contactar</a> con la FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ "
+#| "<a href=\"/music/music.html#content\">Music</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Para notificar sobre enlaces rotos y enviar otras correcciones o "
-"sugerencias, diríjase a <a href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">Humor&nbsp;GNU</a>&nbsp;/ <a "
+"href=\"/music/music.html#content\">Música</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -476,6 +459,33 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "El chiste que se publica en esta página se obtuvo de los <a 
href=\"http://";
+#~ "lists.gnu.org/\">archivos de correos</a>del Proyecto GNU que conserva la "
+#~ "FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Envíe sus consultas sobre la FSF  y GNU a <a href=\"mailto:gnu@gnu.org";
+#~ "\">&lt;gnu@gnu.org&gt;</a>. Existen también <a href=\"/contact/\">otros "
+#~ "medios para contactar</a> con la FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Para notificar sobre enlaces rotos y enviar otras correcciones o "
+#~ "sugerencias, diríjase a <a href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&gt;</a>."
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "por <strong>Richard Stallman</strong>"

Index: server/gnun/compendia/compendium.fa.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fa.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.fa.po      11 Jul 2021 17:30:35 -0000      
1.125
+++ server/gnun/compendia/compendium.fa.po      14 Jul 2021 16:30:56 -0000      
1.126
@@ -222,51 +222,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"پرسش‌هایتان را در مورد گنو به <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> "
-"بفرستید."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"پرسش‌هایتان را در مورد گنو به <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> "
-"بفرستید."
-
 # type: Content of: <h4>
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -491,6 +452,43 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "پرسش‌هایتان را در مورد گنو به <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> بفرستید."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "پرسش‌هایتان را در مورد گنو به <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> بفرستید."
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "نویسنده <strong>ریچارد استالمن</strong>"

Index: server/gnun/compendia/compendium.fi.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fi.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/gnun/compendia/compendium.fi.po      11 Jul 2021 17:30:35 -0000      
1.32
+++ server/gnun/compendia/compendium.fi.po      14 Jul 2021 16:30:56 -0000      
1.33
@@ -194,23 +194,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.fr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fr.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.fr.po      11 Jul 2021 17:30:35 -0000      
1.133
+++ server/gnun/compendia/compendium.fr.po      14 Jul 2021 16:30:56 -0000      
1.134
@@ -198,32 +198,11 @@
 "La <cite>Free Software Foundation</cite> ne revendique pas de copyright sur "
 "cette blague."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
-"org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Veuillez envoyer les requêtes concernant la FSF et GNU à <a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Il existe aussi <a href=\"/contact/"
-"\">d'autres moyens de contacter</a> la FSF."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Veuillez indiquer (en anglais) les liens orphelins et autres corrections ou "
-"suggestions à <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
-"org&gt;</a>."
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -447,6 +426,30 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "La blague figurant sur cette page provient des <a href=\"http://lists.gnu.";
+#~ "org/\">archives de courriels du projet GNU</a> maintenues par la FSF."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Veuillez envoyer les requêtes concernant la FSF et GNU à <a 
href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Il existe aussi <a href=\"/contact/"
+#~ "\">d'autres moyens de contacter</a> la FSF."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Veuillez indiquer (en anglais) les liens orphelins et autres corrections "
+#~ "ou suggestions à <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
+#~ "org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "par <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.he.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.he.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/gnun/compendia/compendium.he.po      11 Jul 2021 17:30:35 -0000      
1.123
+++ server/gnun/compendia/compendium.he.po      14 Jul 2021 16:30:56 -0000      
1.124
@@ -176,23 +176,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.hr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.hr.po,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/gnun/compendia/compendium.hr.po      11 Jul 2021 17:30:35 -0000      
1.107
+++ server/gnun/compendia/compendium.hr.po      14 Jul 2021 16:30:56 -0000      
1.108
@@ -218,38 +218,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "Zaklada za slobodan softver"
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 #, fuzzy
 #| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Molim vas šaljite općenite FSF &amp; GNU upite na <a href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>.  Postoje isto i <a href=\"/contact/\">drugi "
-"načini kontaktiranja</a> FSF-a. Prekinute poveznice i drugi ispravci ili "
-"prijedlozi mogu biti poslani na <a href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>. "
-
-#. type: Content of: <div><p>
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Prekinute poveznice i drugi ispravci ili prijedlozi mogu biti poslani na <a "
-"href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Obrazovanje</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Resursi</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -496,6 +475,31 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Molim vas šaljite općenite FSF &amp; GNU upite na <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Postoje isto i <a href=\"/contact/"
+#~ "\">drugi načini kontaktiranja</a> FSF-a. Prekinute poveznice i drugi "
+#~ "ispravci ili prijedlozi mogu biti poslani na <a href=\"mailto:";
+#~ "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>. "
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Prekinute poveznice i drugi ispravci ili prijedlozi mogu biti poslani na "
+#~ "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "napisao <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.id.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.id.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.id.po      11 Jul 2021 17:30:35 -0000      
1.124
+++ server/gnun/compendia/compendium.id.po      14 Jul 2021 16:30:56 -0000      
1.125
@@ -231,23 +231,10 @@
 "Lihat juga kampanye Free Software Foundation yang lain (Saat ini hanya "
 "tersedia dalam Bahasa Inggris)"
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- server/gnun/compendia/compendium.it.po      11 Jul 2021 17:30:35 -0000      
1.153
+++ server/gnun/compendia/compendium.it.po      14 Jul 2021 16:30:56 -0000      
1.154
@@ -207,32 +207,17 @@
 msgstr ""
 "La Free Software Foundation non ha il copyright di questo testo divertente."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Il testo divertente di questa pagina proviene dagli <a href=\"http://lists.";
-"gnu.org/\">archivi e-mail</a> del progetto GNU, a cura della FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
-"href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Ci sono anche <a href="
-"\"/contact/\">altri modi di contattare</a> la FSF."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Inviate segnalazioni di link non funzionanti e altri suggerimenti relativi "
-"alle pagine web a <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu."
-"org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Istruzione</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Risorse</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -530,6 +515,30 @@
 msgid "Donald Craig"
 msgstr "Donald Craig"
 
+#~ 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."
+#~ msgstr ""
+#~ "Il testo divertente di questa pagina proviene dagli <a href=\"http://";
+#~ "lists.gnu.org/\">archivi e-mail</a> del progetto GNU, a cura della FSF."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Per informazioni su FSF e GNU rivolgetevi, possibilmente in inglese, a <a "
+#~ "href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Ci sono anche <a "
+#~ "href=\"/contact/\">altri modi di contattare</a> la FSF."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Inviate segnalazioni di link non funzionanti e altri suggerimenti "
+#~ "relativi alle pagine web a <a href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "di <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.ja.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ja.po,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- server/gnun/compendia/compendium.ja.po      11 Jul 2021 17:30:35 -0000      
1.144
+++ server/gnun/compendia/compendium.ja.po      14 Jul 2021 16:30:56 -0000      
1.145
@@ -192,31 +192,17 @@
 
"フリーソフトウェアファウンデーションはこのジョークに関して著作権を主張しませ"
 "ん。"
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"このページのジョークはFSFのGNUプロジェクトの<a 
href=\"ftp://lists.gnu.org/\";>"
-"電子メールアーカイブ</a>から採られたものです。"
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"FSFおよびGNUに関する問い合わせは<a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
-"org&gt;</a>までお願いします(英語)。FSFへの連絡は<a 
href=\"/contact/\">他の方"
-"法</a>もあります。"
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"リンク切れや他の修正、提案は<a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>までお送りください。"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育向けリソース</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -458,6 +444,29 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "このページのジョークはFSFのGNUプロジェクトの<a 
href=\"ftp://lists.gnu.org/";
+#~ "\">電子メールアーカイブ</a>から採られたものです。"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "FSFおよびGNUに関する問い合わせは<a 
href=\"mailto:gnu@gnu.org\";>&lt;"
+#~ "gnu@gnu.org&gt;</a>までお願いします(英語)。FSFへの連絡は<a 
href=\"/"
+#~ "contact/\">他の方法</a>もあります。"
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "リンク切れや他の修正、提案は<a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&gt;</a>までお送りください。"
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "<strong>リチャード・ストールマン</strong>著"
 

Index: server/gnun/compendia/compendium.ko.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ko.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.ko.po      11 Jul 2021 17:30:35 -0000      
1.131
+++ server/gnun/compendia/compendium.ko.po      14 Jul 2021 16:30:56 -0000      
1.132
@@ -193,31 +193,11 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "자유 소프트웨어 재단은 이 유머에 대한 저작권을 
갖고 있지 않습니다."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"이 유머는 자유 소프트웨어 재단의 <a 
href=\"http://lists.gnu.org/\";>GNU 프로젝"
-"트 이메일 아카이브</a>에서 가져온 것입니다."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"FSF와 GNU에 대한 문의는 <a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</"
-"a> 앞으로 보내 주세요. FSF에 대한 <a href=\"/contact/\">다른 
연락 방법</a>도 "
-"있습니다."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:webmasters@gnu.org";
-"\">&lt;webmasters@gnu.org&gt;</a> 앞으로 보내 주세요."
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -446,6 +426,29 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "이 유머는 자유 소프트웨어 재단의 <a 
href=\"http://lists.gnu.org/\";>GNU 프"
+#~ "로젝트 이메일 아카이브</a>에서 가져온 것입니다."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "FSF와 GNU에 대한 문의는 <a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;"
+#~ "</a> 앞으로 보내 주세요. FSF에 대한 <a 
href=\"/contact/\">다른 연락 방법</"
+#~ "a>도 있습니다."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "끊어진 링크나 다른 수정 사항 또는 제안은 <a 
href=\"mailto:webmasters@gnu.";
+#~ "org\">&lt;webmasters@gnu.org&gt;</a> 앞으로 보내 주세요."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "글: <strong>리처드 스톨먼</strong>"
 

Index: server/gnun/compendia/compendium.lt.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.lt.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/gnun/compendia/compendium.lt.po      11 Jul 2021 17:30:35 -0000      
1.72
+++ server/gnun/compendia/compendium.lt.po      14 Jul 2021 16:30:56 -0000      
1.73
@@ -220,44 +220,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Bendrus FSF ir GNU užklausimus prašome atsiųsti į <a 
href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>.  Taip pat, yra ir <a href=\"/contact/\">kiti "
-"būdai susisiekti</a> su FSF.  Neveikiančių nuorodų ir kiti pataisymai 
arba "
-"pasiūlymai gali būti atsiųsti į <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
-
-#
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 #, fuzzy
 #| msgid ""
-#| "If you wish to help us maintain this page, please contact <a href="
-#| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Jeigu jūs pageidaujate mums padėti palaikyti šį puslapį, prašome 
susisiekite "
-"<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</"
-"a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Å vietimas</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">IÅ¡tekliai</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -472,6 +445,37 @@
 
 #, fuzzy
 #~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Bendrus FSF ir GNU užklausimus prašome atsiųsti į <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Taip pat, yra ir <a href=\"/"
+#~ "contact/\">kiti būdai susisiekti</a> su FSF.  Neveikiančių nuorodų ir "
+#~ "kiti pataisymai arba pasiūlymai gali būti atsiųsti į <a href=\"mailto:";
+#~ "webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
+
+#
+#, fuzzy
+#~| msgid ""
+#~| "If you wish to help us maintain this page, please contact <a href="
+#~| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Jeigu jūs pageidaujate mums padėti palaikyti šį puslapį, prašome "
+#~ "susisiekite <a href=\"mailto:web-translators@gnu.org\";>&lt;web-"
+#~ "translators@gnu.org&gt;</a>."
+
+#, fuzzy
+#~| msgid ""
 #~| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 #~| "strong></a>"
 #~ msgid "by <strong>Richard Stallman</strong>"

Index: server/gnun/compendia/compendium.ml.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ml.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.ml.po      11 Jul 2021 17:30:35 -0000      
1.125
+++ server/gnun/compendia/compendium.ml.po      14 Jul 2021 16:30:56 -0000      
1.126
@@ -208,50 +208,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"എഫ് എസ് എഫ് -നെ കുറിച്ചും 
ഗ്നു -വിനെ കുറിച്ചുമുള്ള 
ചോദ്യങ്ങളും സംശയങ്ങളും <a 
href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a> ലേയ്ക്കു് അ
യയ്ക്കുക. എഫ് എസ് എഫുമായി 
ബന്ധപ്പെടാന്‍ "
-"<a href=\"/contact\">മറ്റു വഴികളും ഉണ്ടു് 
</a>. <br />തെറ്റായ 
കണ്ണികളെകുറിച്ചും മറ്റു് "
-"നിര്‍ദ്ദ്േശങ്ങളും അ
ഭിപ്രായങ്ങളും <a 
href=\"mailto:web-translators@gnu.org\";>&lt;web-"
-"translators@gnu.org&gt;</a> എന്ന 
വിലാസത്തിലേയ്ക്കു് എഴുതുക"
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 #, fuzzy
 #| msgid ""
-#| "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>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"എഫ് എസ് എഫ് -നെ കുറിച്ചും 
ഗ്നു -വിനെ കുറിച്ചുമുള്ള 
ചോദ്യങ്ങളും സംശയങ്ങളും <a 
href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a> ലേയ്ക്കു് അ
യയ്ക്കുക. എഫ് എസ് എഫുമായി 
ബന്ധപ്പെടാന്‍ "
-"<a href=\"/contact\">മറ്റു വഴികളും ഉണ്ടു് 
</a>. <br />തെറ്റായ 
കണ്ണികളെകുറിച്ചും മറ്റു് "
-"നിര്‍ദ്ദ്േശങ്ങളും അ
ഭിപ്രായങ്ങളും <a 
href=\"mailto:web-translators@gnu.org\";>&lt;web-"
-"translators@gnu.org&gt;</a> എന്ന 
വിലാസത്തിലേയ്ക്കു് എഴുതുക"
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
+msgid ""
+"</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=\"/education/education.html\">വിദ്യാഭ്യാസം</a>&nbsp;/
 <a "
+"href=\"/education/education.html#indepth\">കൂടുതല്‍ 
ആഴത്തില്‍</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -470,6 +437,45 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "എഫ് എസ് എഫ് -നെ കുറിച്ചും 
ഗ്നു -വിനെ കുറിച്ചുമുള്ള 
ചോദ്യങ്ങളും സംശയങ്ങളും <a 
href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a> ലേയ്ക്കു് അ
യയ്ക്കുക. എഫ് എസ് എഫുമായി "
+#~ "ബന്ധപ്പെടാന്‍ <a 
href=\"/contact\">മറ്റു വഴികളും ഉണ്ടു് 
</a>. <br />തെറ്റായ "
+#~ "കണ്ണികളെകുറിച്ചും മറ്റു് 
നിര്‍ദ്ദ്േശങ്ങളും അ
ഭിപ്രായങ്ങളും <a href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a> എന്ന "
+#~ "വിലാസത്തിലേയ്ക്കു് എഴുതുക"
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "എഫ് എസ് എഫ് -നെ കുറിച്ചും 
ഗ്നു -വിനെ കുറിച്ചുമുള്ള 
ചോദ്യങ്ങളും സംശയങ്ങളും <a 
href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a> ലേയ്ക്കു് അ
യയ്ക്കുക. എഫ് എസ് എഫുമായി "
+#~ "ബന്ധപ്പെടാന്‍ <a 
href=\"/contact\">മറ്റു വഴികളും ഉണ്ടു് 
</a>. <br />തെറ്റായ "
+#~ "കണ്ണികളെകുറിച്ചും മറ്റു് 
നിര്‍ദ്ദ്േശങ്ങളും അ
ഭിപ്രായങ്ങളും <a href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a> എന്ന "
+#~ "വിലാസത്തിലേയ്ക്കു് എഴുതുക"
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr ""

Index: server/gnun/compendia/compendium.ms.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ms.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/gnun/compendia/compendium.ms.po      11 Jul 2021 17:30:35 -0000      
1.31
+++ server/gnun/compendia/compendium.ms.po      14 Jul 2021 16:30:56 -0000      
1.32
@@ -194,32 +194,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "If you wish to help us maintain this page, please contact <a href="
-#| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Sekiranya anda berminat untuk menyelenggara halaman ini, tolong hubungi <a "
-"href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
-
 #. type: Content of: <h3>
 msgid "Footnotes"
 msgstr ""
@@ -409,6 +389,19 @@
 msgid "Donald Craig"
 msgstr ""
 
+#
+#, fuzzy
+#~| msgid ""
+#~| "If you wish to help us maintain this page, please contact <a href="
+#~| "\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;</a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Sekiranya anda berminat untuk menyelenggara halaman ini, tolong hubungi "
+#~ "<a href=\"mailto:web-translators@gnu.org\";>&lt;web-translators@gnu.org&gt;"
+#~ "</a>."
+
 #, fuzzy
 #~| msgid "Copyright &copy; 2012, 2016 Free Software Foundation, Inc."
 #~ msgid ""

Index: server/gnun/compendia/compendium.nb.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nb.po,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/gnun/compendia/compendium.nb.po      11 Jul 2021 17:30:35 -0000      
1.125
+++ server/gnun/compendia/compendium.nb.po      14 Jul 2021 16:30:56 -0000      
1.126
@@ -196,23 +196,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.nl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nl.po,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/gnun/compendia/compendium.nl.po      11 Jul 2021 17:30:35 -0000      
1.120
+++ server/gnun/compendia/compendium.nl.po      14 Jul 2021 16:30:56 -0000      
1.121
@@ -205,32 +205,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Gelieve vragen over FSF &amp; GNU te sturen naar <a href=\"mailto:gnu@gnu.org";
-"\">&lt;gnu@gnu.org&gt;</a>. Er zijn ook nog <a href=\"/contact/\">andere "
-"manieren om in contact te komen</a> met de FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Gelieve meldingen van verkeerde links en andere verbeteringen (of "
-"suggesties) te sturen aan: <a href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Onderwijs</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Leer-hulpmiddelen</a>&nbsp;/"
 
 # || No change detected.  The change might only be in amounts of spaces.
 #. type: Content of: <h3>
@@ -477,6 +462,25 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Gelieve vragen over FSF &amp; GNU te sturen naar <a href=\"mailto:gnu@gnu.";
+#~ "org\">&lt;gnu@gnu.org&gt;</a>. Er zijn ook nog <a href=\"/contact/"
+#~ "\">andere manieren om in contact te komen</a> met de FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Gelieve meldingen van verkeerde links en andere verbeteringen (of "
+#~ "suggesties) te sturen aan: <a href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "door <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.pl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pl.po,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- server/gnun/compendia/compendium.pl.po      11 Jul 2021 17:30:35 -0000      
1.142
+++ server/gnun/compendia/compendium.pl.po      14 Jul 2021 16:30:56 -0000      
1.143
@@ -202,32 +202,17 @@
 "Fundacja Wolnego Oprogramowania (FSF) nie przypisuje sobie praw autorskich "
 "do&nbsp;tego żartu."
 
-#. type: Content of: <p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Żart na&nbsp;tej stronie jest z&nbsp;<a href=\"http://lists.gnu.org/";
-"\">archiwum mailowego</a> FSF Projektu GNU."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a href="
-"\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Istnieją także <a href=\"/"
-"contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF."
-
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Informacje o&nbsp;niedziałających odnośnikach oraz&nbsp;inne poprawki (lub 
"
-"propozycje) prosimy wysyłać na&nbsp;adres <a href=\"mailto:web-";
-"translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Edukacja</a>&nbsp;/ <a "
+"href=\"/education/edu-resources.html\">Zasoby</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -453,6 +438,30 @@
 msgid "Donald Craig"
 msgstr "Donald Craig"
 
+#~ 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."
+#~ msgstr ""
+#~ "Żart na&nbsp;tej stronie jest z&nbsp;<a href=\"http://lists.gnu.org/";
+#~ "\">archiwum mailowego</a> FSF Projektu GNU."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a href="
+#~ "\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Istnieją także <a 
href=\"/"
+#~ "contact/contact.html\">inne sposoby skontaktowania się</a> z&nbsp;FSF."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Informacje o&nbsp;niedziałających odnośnikach oraz&nbsp;inne poprawki "
+#~ "(lub propozycje) prosimy wysyłać na&nbsp;adres <a href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "<strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.pot
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pot,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.pot        11 Jul 2021 17:30:35 -0000      
1.129
+++ server/gnun/compendia/compendium.pot        14 Jul 2021 16:30:56 -0000      
1.130
@@ -165,23 +165,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.pt-br.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt-br.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.pt-br.po   11 Jul 2021 17:30:35 -0000      
1.132
+++ server/gnun/compendia/compendium.pt-br.po   14 Jul 2021 16:30:56 -0000      
1.133
@@ -198,33 +198,11 @@
 "A Fundação do Software Livre não reivindica nenhum direito autoral desta "
 "piada."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"A piada nesta página foi obtida a partir dos <a href=\"http://lists.gnu.org/";
-"\">arquivos de e-mail</a> do Projeto GNU mantidos pela FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"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."
-msgstr ""
-"Envie perguntas em geral sobre a FSF e o GNU para <a href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>. Também existem <a href=\"/contact/\">outros "
-"meios de contatar</a> a FSF."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Envie links quebrados e outras correções ou sugestões para <a 
href=\"mailto:";
-"webmasters@gnu.org\">&lt;webmasters@gnu.org&gt;</a>."
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -453,6 +431,31 @@
 msgid "Donald Craig"
 msgstr "Donald Craig"
 
+#~ 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."
+#~ msgstr ""
+#~ "A piada nesta página foi obtida a partir dos <a href=\"http://lists.gnu.";
+#~ "org/\">arquivos de e-mail</a> do Projeto GNU mantidos pela FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Envie perguntas em geral sobre a FSF e o GNU para <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Também existem <a href=\"/contact/"
+#~ "\">outros meios de contatar</a> a FSF."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Envie links quebrados e outras correções ou sugestões para <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "por <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.ro.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ro.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.ro.po      11 Jul 2021 17:30:35 -0000      
1.128
+++ server/gnun/compendia/compendium.ro.po      14 Jul 2021 16:30:56 -0000      
1.129
@@ -225,39 +225,11 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Vă rugăm să adresați întrebările dumneavoastră despre FSF și GNU la 
<a href="
-"\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Există și <a 
href=\"/contact/"
-"\">alte modalități pentru a lua contact</a> cu FSF. <br /> Vă rugăm să "
-"semnalați legăturile rupte și alte corecturi sau sugestii la <a href="
-"\"mailto:web-translators-ro@gnu.org\";>&lt;web-translators-ro@gnu.org&gt;</a>."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Vă rugăm să semnalați legăturile rupte și alte corecturi sau sugestii 
la <a "
-"href=\"mailto:web-translators-ro@gnu.org\";>&lt;web-translators-ro@gnu.org&gt;"
-"</a>."
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -487,6 +459,33 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Vă rugăm să adresați întrebările dumneavoastră despre FSF și GNU 
la <a "
+#~ "href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>. Există și <a 
href=\"/"
+#~ "contact/\">alte modalități pentru a lua contact</a> cu FSF. <br /> Vă "
+#~ "rugăm să semnalați legăturile rupte și alte corecturi sau sugestii la 
<a "
+#~ "href=\"mailto:web-translators-ro@gnu.org\";>&lt;web-translators-ro@gnu."
+#~ "org&gt;</a>."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Vă rugăm să semnalați legăturile rupte și alte corecturi sau 
sugestii la "
+#~ "<a href=\"mailto:web-translators-ro@gnu.org\";>&lt;web-translators-ro@gnu."
+#~ "org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "de <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.ru.po      11 Jul 2021 17:30:35 -0000      
1.128
+++ server/gnun/compendia/compendium.ru.po      14 Jul 2021 16:30:56 -0000      
1.129
@@ -201,32 +201,11 @@
 "Фонд свободного программного обеспечения 
не заявляет авторских прав на эту "
 "шутку."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Шутка на этой странице получена из <a 
href=\"http://lists.gnu.org/\";>архивов "
-"электронной почты</a> проекта GNU ФСПО."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Есть также <a 
href=\"/contact/"
-"\">другие способы связаться</a> с фондом."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или 
"
-"предложения по адресу <a 
href=\"mailto:web-translators@gnu.org\";>&lt;web-"
-"translators@gnu.org&gt;</a>."
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -466,6 +445,30 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Шутка на этой странице получена из <a 
href=\"http://lists.gnu.org/";
+#~ "\">архивов электронной почты</a> проекта GNU 
ФСПО."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Пожалуйста, присылайте запросы фонду и 
GNU по адресу <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Есть также <a 
href=\"/contact/"
+#~ "\">другие способы связаться</a> с фондом."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки "
+#~ "или предложения по адресу <a 
href=\"mailto:web-translators@gnu.org\";>&lt;"
+#~ "web-translators@gnu.org&gt;</a>."
+
 # type: Content of: <p>
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "<strong>Ричард Столмен</strong>"

Index: server/gnun/compendia/compendium.sk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sk.po,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/gnun/compendia/compendium.sk.po      11 Jul 2021 17:30:35 -0000      
1.123
+++ server/gnun/compendia/compendium.sk.po      14 Jul 2021 16:30:56 -0000      
1.124
@@ -208,51 +208,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Vaše otázky pre FSF &amp; GNU posielajte prosím na <a 
href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>.  Môžete tiež využiť <a 
href=\"/contact/\">iné "
-"spôsoby ako kontaktovať</a> FSF.  <br /> Prosím upozornite nás na 
nefunkčné "
-"odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Vaše otázky pre FSF &amp; GNU posielajte prosím na <a 
href=\"mailto:gnu@gnu.";
-"org\">&lt;gnu@gnu.org&gt;</a>.  Môžete tiež využiť <a 
href=\"/contact/\">iné "
-"spôsoby ako kontaktovať</a> FSF.  <br /> Prosím upozornite nás na 
nefunkčné "
-"odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-translators@gnu.org";
-"\">&lt;web-translators@gnu.org&gt;</a>."
-
 #. type: Content of: <h3>
 msgid "Footnotes"
 msgstr ""
@@ -450,6 +411,43 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Môžete tiež využiť <a 
href=\"/"
+#~ "contact/\">iné spôsoby ako kontaktovať</a> FSF.  <br /> Prosím 
upozornite "
+#~ "nás na nefunkčné odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Vaše otázky pre FSF &amp; GNU posielajte prosím na <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Môžete tiež využiť <a 
href=\"/"
+#~ "contact/\">iné spôsoby ako kontaktovať</a> FSF.  <br /> Prosím 
upozornite "
+#~ "nás na nefunkčné odkazy, chyby a možné vylepšenia na <a 
href=\"mailto:web-";
+#~ "translators@gnu.org\">&lt;web-translators@gnu.org&gt;</a>."
+
 # | Copyright &copy; 2014, 2015, 2016, 2017, 2018, [-2019-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
 #, fuzzy

Index: server/gnun/compendia/compendium.sq.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sq.po,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- server/gnun/compendia/compendium.sq.po      11 Jul 2021 17:30:35 -0000      
1.142
+++ server/gnun/compendia/compendium.sq.po      14 Jul 2021 16:30:56 -0000      
1.143
@@ -213,33 +213,17 @@
 "The Free Software Foundation nuk pretendon ndonjë të drejtë kopjimi mbi 
këtë "
 "anekdotë."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Anekdota në këtë faqe është nxjerrë nga <a href=\"http://lists.gnu.org/";
-"\">arkivat email</a> të FSF-së të Projektit GNU."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Ju lutemi, pyetjet rreth FSF-së &amp; GNU-së dërgojini te <a 
href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>.  Ka gjithashtu edhe <a href=\"/"
-"contact/\">mënyra të tjera për t’u lidhur</a> me FSF-në."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Ju lutemi, lidhjet e dëmtuara, këshillat ose ndreqjet e tjera dërgojini te 
"
-"<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Edukim</a>&nbsp;/ <a href="
+"\"/education/education.html#indepth\">Në&nbsp;Thellësi</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -470,6 +454,31 @@
 msgid "Donald Craig"
 msgstr "Donald Becker"
 
+#~ 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."
+#~ msgstr ""
+#~ "Anekdota në këtë faqe është nxjerrë nga <a 
href=\"http://lists.gnu.org/";
+#~ "\">arkivat email</a> të FSF-së të Projektit GNU."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Ju lutemi, pyetjet rreth FSF-së &amp; GNU-së dërgojini te <a href="
+#~ "\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>.  Ka gjithashtu edhe <a "
+#~ "href=\"/contact/\">mënyra të tjera për t’u lidhur</a> me FSF-në."
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Ju lutemi, lidhjet e dëmtuara, këshillat ose ndreqjet e tjera dërgojini 
"
+#~ "te <a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "nga <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.sr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sr.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.sr.po      11 Jul 2021 17:30:35 -0000      
1.124
+++ server/gnun/compendia/compendium.sr.po      14 Jul 2021 16:30:56 -0000      
1.125
@@ -229,51 +229,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "Упознајте се са другим кампањама 
Задужбине за слободни софтвер"
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"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."
-msgstr ""
-"Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
-"\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>. Постоје и <a 
href=\"/"
-"contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да шаљете "
-"неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
-"web-translators@gnu.org\"><em>web-translators@gnu.org</em></a>."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
-"\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>. Постоје и <a 
href=\"/"
-"contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да шаљете "
-"неисправне везе и друге исправке (или 
предлоге) на адресу <a href=\"mailto:";
-"web-translators@gnu.org\"><em>web-translators@gnu.org</em></a>."
-
 # type: Content of: <h3>
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -507,6 +468,43 @@
 msgid "Donald Craig"
 msgstr ""
 
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:web-translators@gnu.org\";><em>web-translators@gnu.org</em></a>."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "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>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Молимо вас да шаљете питања у вези са 
ЗСС-ом и ГНУ-ом на адресу <a href="
+#~ "\"mailto:gnu@gnu.org\";><em>gnu@gnu.org</em></a>. Постоје и <a 
href=\"/"
+#~ "contact/\">други начини да се обратите</a> 
ЗСС-у.<br />Молимо вас да "
+#~ "шаљете неисправне везе и друге исправке 
(или предлоге) на адресу <a href="
+#~ "\"mailto:web-translators@gnu.org\";><em>web-translators@gnu.org</em></a>."
+
 # type: Content of: <p>
 #, fuzzy
 #~| msgid "by <strong>Richard M. Stallman</strong>"

Index: server/gnun/compendia/compendium.sv.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sv.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/gnun/compendia/compendium.sv.po      11 Jul 2021 17:30:35 -0000      
1.126
+++ server/gnun/compendia/compendium.sv.po      14 Jul 2021 16:30:56 -0000      
1.127
@@ -202,23 +202,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.ta.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ta.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.ta.po      11 Jul 2021 17:30:35 -0000      
1.128
+++ server/gnun/compendia/compendium.ta.po      14 Jul 2021 16:30:56 -0000      
1.129
@@ -193,50 +193,12 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
+#. type: Content of: <div>
 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."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "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:licensing@gnu.org\";>&lt;"
-#| "licensing@gnu.org&gt;</a>."
-msgid ""
-"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."
-msgstr ""
-"FSF &amp; GNU தொடர்பான வினவல்களை <a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
-"org&gt;</a> அனுப்பவும். FSF ஐ <a 
href=\"/contact/\">தொடர்பு கொள்ளும் வேறு "
-"வழிகளும்</a> உண்டு.  
துண்டிக்கப்பட்ட இணைப்புகள், 
திருத்தங்கள், பரிந்துரைகள் 
உள்ளிட்டவற்றை <a "
-"href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a> என்ற "
-"முகவரிக்கு அனுப்பவும்."
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
-#| "\"><em>gnu@gnu.org</em></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";
-#| "\"><em>webmasters@gnu.org</em></a>."
-msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
-msgstr ""
-"FSF &amp; GNU தொடர்பான வினவல்களை <a 
href=\"mailto:gnu@gnu.org\";><em>gnu@gnu."
-"org</em></a> அனுப்பவும். FSF ஐ <a 
href=\"/contact/\">தொடர்பு கொள்ளும் வேறு "
-"வழிகளும்</a> உண்டு.  <br /> 
துண்டிக்கப்பட்ட இணைப்புகள், 
திருத்தங்கள், பரிந்துரைகள் "
-"உள்ளிட்டவற்றை <a 
href=\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</"
-"em></a> என்ற முகவரிக்கு அ
னுப்பவும்."
-
 #. type: Content of: <h3>
 msgid "Footnotes"
 msgstr "பின்குறிப்புகள்"
@@ -452,6 +414,42 @@
 msgid "Donald Craig"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "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:licensing@gnu.";
+#~| "org\">&lt;licensing@gnu.org&gt;</a>."
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "FSF &amp; GNU தொடர்பான வினவல்களை <a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
+#~ "org&gt;</a> அனுப்பவும். FSF ஐ <a 
href=\"/contact/\">தொடர்பு கொள்ளும் வேறு "
+#~ "வழிகளும்</a> உண்டு.  
துண்டிக்கப்பட்ட இணைப்புகள், 
திருத்தங்கள், பரிந்துரைகள் 
உள்ளிட்டவற்றை "
+#~ "<a href=\"mailto:licensing@gnu.org\";>&lt;licensing@gnu.org&gt;</a> 
என்ற "
+#~ "முகவரிக்கு அனுப்பவும்."
+
+# type: Content of: <div><p>
+#, fuzzy
+#~| msgid ""
+#~| "Please send FSF &amp; GNU inquiries to <a href=\"mailto:gnu@gnu.org";
+#~| "\"><em>gnu@gnu.org</em></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";
+#~| "\"><em>webmasters@gnu.org</em></a>."
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "FSF &amp; GNU தொடர்பான வினவல்களை <a 
href=\"mailto:gnu@gnu.org\";><em>gnu@gnu."
+#~ "org</em></a> அனுப்பவும். FSF ஐ <a 
href=\"/contact/\">தொடர்பு கொள்ளும் வேறு "
+#~ "வழிகளும்</a> உண்டு.  <br /> 
துண்டிக்கப்பட்ட இணைப்புகள், 
திருத்தங்கள், பரிந்துரைகள் "
+#~ "உள்ளிட்டவற்றை <a 
href=\"mailto:webmasters@gnu.org\";><em>webmasters@gnu.org</"
+#~ "em></a> என்ற முகவரிக்கு அ
னுப்பவும்."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "ஆசிரியர்: <strong>ரிச்சர்ட் 
எம். ஸ்டால்மேன்</strong>"
 

Index: server/gnun/compendia/compendium.te.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.te.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/gnun/compendia/compendium.te.po      11 Jul 2021 17:30:36 -0000      
1.38
+++ server/gnun/compendia/compendium.te.po      14 Jul 2021 16:30:56 -0000      
1.39
@@ -177,23 +177,10 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr ""
 
-#. type: Content of: <p>
-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."
-msgstr ""
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
 #. type: Content of: <h3>

Index: server/gnun/compendia/compendium.tr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.tr.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.tr.po      11 Jul 2021 17:30:36 -0000      
1.130
+++ server/gnun/compendia/compendium.tr.po      14 Jul 2021 16:30:56 -0000      
1.131
@@ -196,32 +196,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "Özgür Yazılım Vakfı bu şaka için telif hakkı talep etmiyor."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Bu sayfadaki şaka FSF'nin GNU Projesi <a href=\"http://lists.gnu.org/\";>e-"
-"posta arşivlerinden</a> alınmıştır."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Lütfen FSF ve GNU ile ilgili sorularınızı <a 
href=\"mailto:gnu@gnu.org\";>&lt;"
-"gnu@gnu.org&gt;</a> adresine iletin. FSF ile iletişim kurmanın <a href=\"/"
-"contact/\">başka yolları</a> da vardır."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;humor</a>&nbsp;/ "
+#| "<a href=\"/music/music.html#content\">Music</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Lütfen çalışmayan bağlantıları ve başka düzeltmeleri veya 
önerilerinizi <a "
-"href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a> adresine "
-"gönderin."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;mizahı</a>&nbsp;/ "
+"<a href=\"/music/music.html#content\">Müzik</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -450,6 +435,30 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Bu sayfadaki şaka FSF'nin GNU Projesi <a 
href=\"http://lists.gnu.org/\";>e-"
+#~ "posta arşivlerinden</a> alınmıştır."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Lütfen FSF ve GNU ile ilgili sorularınızı <a href=\"mailto:gnu@gnu.org";
+#~ "\">&lt;gnu@gnu.org&gt;</a> adresine iletin. FSF ile iletişim kurmanın <a 
"
+#~ "href=\"/contact/\">başka yolları</a> da vardır."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Lütfen çalışmayan bağlantıları ve başka düzeltmeleri veya 
önerilerinizi "
+#~ "<a href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a> "
+#~ "adresine gönderin."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "yazan <strong>Richard Stallman</strong>"
 

Index: server/gnun/compendia/compendium.uk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.uk.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.uk.po      11 Jul 2021 17:30:36 -0000      
1.131
+++ server/gnun/compendia/compendium.uk.po      14 Jul 2021 16:30:56 -0000      
1.132
@@ -207,32 +207,17 @@
 "Фонд вільного програмного забезпечення 
не заявляє авторські права на цей "
 "жарт."
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"Жарт на цій сторінці отриманий з <a 
href=\"http://lists.gnu.org/\";>архівів "
-"електронної пошти ФВПЗ</a> проекту GNU."
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"Будь ласка, надсилайте запити фонду та GNU 
за адресою <a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Є також <a 
href=\"/contact/\">інші "
-"способи зв'язатися</a> з фондом."
-
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"Будь ласка, надсилайте звіти про невірні 
посилання і інші виправлення або "
-"пропозиції за адресою <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
-"webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/education/education.html\">Освіта</a>&nbsp;/ <a 
href="
+"\"/education/edu-resources.html\">Ресурси</a>&nbsp;/"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -451,6 +436,30 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "Жарт на цій сторінці отриманий з <a 
href=\"http://lists.gnu.org/";
+#~ "\">архівів електронної пошти ФВПЗ</a> 
проекту GNU."
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "Будь ласка, надсилайте запити фонду та GNU 
за адресою <a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>. Є також <a 
href=\"/contact/\">інші "
+#~ "способи зв'язатися</a> з фондом."
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "Будь ласка, надсилайте звіти про невірні 
посилання і інші виправлення або "
+#~ "пропозиції за адресою <a 
href=\"mailto:webmasters@gnu.org\";>&lt;"
+#~ "webmasters@gnu.org&gt;</a>."
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "<strong>Річард Столмен</strong>"
 

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.zh-cn.po   11 Jul 2021 17:30:36 -0000      
1.130
+++ server/gnun/compendia/compendium.zh-cn.po   14 Jul 2021 16:30:56 -0000      
1.131
@@ -198,33 +198,17 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "自由软件基金会不对该笑话主张版权。"
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"本页的笑话来自FSF的GNU工程的<a 
href=\"http://lists.gnu.org/\";>电子邮件存档</"
-"a>。"
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"请将有关自由软件基金会与 GNU 
的查询与问题(以英语)发送到<a href=\"mailto:";
-"gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">其"
-"它方法</a> 联系自由软件基金会。"
-
-# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "</a>&nbsp;/ <a href=\"/education/education.html\">Education</a>&nbsp;/ <a "
+#| "href=\"/education/edu-resources.html\">Resources</a>&nbsp;/"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方(或任何建议),请发送邮件至 <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
+"</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
+"education/edu-resources.html\">教育资源</a>&nbsp;/"
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
@@ -459,6 +443,31 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "本页的笑话来自FSF的GNU工程的<a 
href=\"http://lists.gnu.org/\";>电子邮件存档"
+#~ "</a>。"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "请将有关自由软件基金会与 GNU 
的查询与问题(以英语)发送到<a href=\"mailto:";
+#~ "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>。您也可以通过 <a 
href=\"/contact/\">"
+#~ "其它方法</a> 联系自由软件基金会。"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "发现任何错误和链接或å…
¶å®ƒéœ€è¦æ›´æ­£çš„地方(或任何建议),请发送邮件至 <a "
+#~ "href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>。"
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "<strong>Richard Stallman</strong> 著"
 

Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.zh-tw.po   11 Jul 2021 17:30:36 -0000      
1.124
+++ server/gnun/compendia/compendium.zh-tw.po   14 Jul 2021 16:30:56 -0000      
1.125
@@ -201,31 +201,23 @@
 msgid "The Free Software Foundation claims no copyright on this joke."
 msgstr "自由軟體基金會聲明本會沒有這個笑話的著作權。"
 
-#. type: Content of: <p>
-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."
-msgstr ""
-"此頁面上的笑話是從 FSF 的 GNU 專案<a 
href=\"http://lists.gnu.org/\";>電子郵件"
-"封存檔</a>中摘錄出來的。"
-
-#. type: Content of: <div><p>
-msgid ""
-"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."
-msgstr ""
-"請寫信到 <a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a> 
詢問「自由軟"
-"體基金會」及「GNU 專案」的相關事宜。或者<a 
href=\"/contact/\">透過其他方式</"
-"a>聯絡自由軟體基金會。"
-
-#. type: Content of: <div><p>
+# | {+</a>&nbsp;/+} <a [-href=\"/education/education.html\">Education</a>
+# | &rarr;-] {+href=\"/education/education.html\">Education</a>&nbsp;/+} <a
+# | [-href=\"/education/education.html#indepth\">In Depth</a> &rarr; Why
+# | Schools Should Exclusively Use Free Software-]
+# | {+href=\"/education/education.html#indepth\">In&nbsp;Depth</a>&nbsp;/+}
+#. type: Content of: <div>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/education/education.html\">Education</a> &rarr; <a href=\"/"
+#| "education/education.html#indepth\">In Depth</a> &rarr; Why Schools Should "
+#| "Exclusively Use Free Software"
 msgid ""
-"Please send broken links and other corrections or suggestions to <a href="
-"\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+"</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU humor</a>&nbsp;/ <a href="
+"\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
-"請寫信給 <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</"
-"a> 告訴我們失效的連結、錯誤之處和建議等。"
+"<a href=\"/education/education.html\">教育</a> &rarr; <a href=\"/education/"
+"education.html#indepth\">深入討論</a> &rarr; 為什麼學æ 
¡åªæ‡‰æŽ¡ç”¨è‡ªç”±è»Ÿé«”"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -452,6 +444,29 @@
 msgid "Donald Craig"
 msgstr ""
 
+#~ 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."
+#~ msgstr ""
+#~ "此頁面上的笑話是從 FSF 的 GNU 專案<a 
href=\"http://lists.gnu.org/\";>電子郵"
+#~ "件封存檔</a>中摘錄出來的。"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "請寫信到 <a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a> 
詢問「自由"
+#~ "軟體基金會」及「GNU 專案」的相關事宜。或者<a 
href=\"/contact/\">透過其他方"
+#~ "式</a>聯絡自由軟體基金會。"
+
+#~ msgid ""
+#~ "Please send broken links and other corrections or suggestions to <a href="
+#~ "\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;</a>."
+#~ msgstr ""
+#~ "請寫信給 <a 
href=\"mailto:webmasters@gnu.org\";>&lt;webmasters@gnu.org&gt;"
+#~ "</a> 告訴我們失效的連結、錯誤之處和建議等。"
+
 #~ msgid "by <strong>Richard Stallman</strong>"
 #~ msgstr "作者為 <strong>Richard Stallman</strong>"
 



reply via email to

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